Skip to content

Commit 6d0ca9a

Browse files
fixed cards, links and favicon
1 parent fee8787 commit 6d0ca9a

File tree

6 files changed

+34
-10
lines changed

6 files changed

+34
-10
lines changed

DigiKaksha/app/Course.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,9 @@ public function announcements()
2020
{
2121
return $this->hasMany('App\Announcement')->orderBy('created_at', 'desc');
2222
}
23+
public function evaluationNo(){
24+
$i=0;
25+
foreach($this->announcements as $announcement) if($announcement->graded==1) $i+=1;
26+
return $i;
27+
}
2328
}

DigiKaksha/app/Group.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,20 @@ public function courses()
1818
public function __toString() {
1919
return $this->group_code;
2020
}
21+
public function getAverageMarks(){
22+
$i=0;
23+
$j=0;
24+
foreach($this->users as $user){
25+
$i+=$user->averageMarks();
26+
$j++;
27+
}
28+
return $i/$j;
29+
}
30+
public function getTotalEvaluations(){
31+
$i=0;
32+
foreach($this->courses as $course){
33+
$i+=$course->evaluationNo();
34+
}
35+
return $i;
36+
}
2137
}

DigiKaksha/app/User.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,11 @@ public function averageMarks(){
9696
}
9797
}
9898
}
99-
$r = $i*100/$j;
100-
return $r;
99+
if($j!=0){
100+
$r = $i*100/$j;
101+
return $r;
102+
}
103+
else return 100;
101104
}
102105
public function getTotalClasses()
103106
{
28.5 KB
Loading
17.3 KB
Loading

DigiKaksha/resources/views/groups/show.blade.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@
425425
</a>
426426
</div>
427427
<div class="col">
428-
<h5>{{$course->name}}</h5>
428+
<h5><a href="/courses/{{$course->id}}">{{$course->name}}</a></h5>
429429
</div>
430430
</div>
431431
</li>
@@ -442,8 +442,8 @@
442442
<div class="card-body">
443443
<div class="row">
444444
<div class="col">
445-
<h5 class="card-title text-uppercase text-muted mb-0 text-white">Total traffic</h5>
446-
<span class="h2 font-weight-bold mb-0 text-white">350,897</span>
445+
<h5 class="card-title text-uppercase text-muted mb-0 text-white">Total Evaluations</h5>
446+
<span class="h2 font-weight-bold mb-0 text-white">{{$group->getTotalEvaluations()}}</span>
447447
</div>
448448
<div class="col-auto">
449449
<div class="icon icon-shape bg-white text-dark rounded-circle shadow">
@@ -452,8 +452,8 @@
452452
</div>
453453
</div>
454454
<p class="mt-3 mb-0 text-sm">
455-
<span class="text-white mr-2"><i class="fa fa-arrow-up"></i> 3.48%</span>
456-
<span class="text-nowrap text-light">Since last month</span>
455+
<span class="text-white mr-2"><i class="fa fa-arrow-up"></i></span>
456+
<span class="text-nowrap text-light">In All Courses</span>
457457
</p>
458458
</div>
459459
</div>
@@ -465,7 +465,7 @@
465465
<div class="row">
466466
<div class="col">
467467
<h5 class="card-title text-uppercase text-muted mb-0 text-white">Performance</h5>
468-
<span class="h2 font-weight-bold mb-0 text-white">49,65%</span>
468+
<span class="h2 font-weight-bold mb-0 text-white">{{$group->getAverageMarks()}}</span>
469469
</div>
470470
<div class="col-auto">
471471
<div class="icon icon-shape bg-white text-dark rounded-circle shadow">
@@ -474,8 +474,8 @@
474474
</div>
475475
</div>
476476
<p class="mt-3 mb-0 text-sm">
477-
<span class="text-white mr-2"><i class="fa fa-arrow-up"></i> 3.48%</span>
478-
<span class="text-nowrap text-light">Since last month</span>
477+
<span class="text-white mr-2"><i class="fa fa-arrow-up"></i></span>
478+
<span class="text-nowrap text-light">Class Average Marks</span>
479479
</p>
480480
</div>
481481
</div>

0 commit comments

Comments
 (0)