Skip to content

Commit fee8787

Browse files
abhishekmsinghabhishekmsingh
committed
Dashboards fixed
1 parent 8a86edd commit fee8787

File tree

2 files changed

+77
-29
lines changed

2 files changed

+77
-29
lines changed

‎DigiKaksha/app/User.php

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,62 @@ public function evaluationNo($course){
7373
foreach($this->submissions as $submission) if($submission->announcement->course_id==$course->id) if($submission->grade!=NULL)$i+=1;
7474
return $i;
7575
}
76+
public function getTotalCourses(){
77+
$i=0;
78+
if($this->user_level==1){
79+
foreach($this->groups as $group){
80+
$i+=count($group->courses);
81+
}
82+
}
83+
elseif($this->user_level==2) $i = count($this->courses);
84+
else $i = count(\App\Course::all());
85+
return $i;
86+
}
87+
public function averageMarks(){
88+
$i=0;
89+
$j=0;
90+
foreach($this->groups as $group){
91+
foreach($group->courses as $course){
92+
$max = $this->getMaxScore($course);
93+
if($max!=0){
94+
$i+=$this->getScore($course)/$max;
95+
$j++;
96+
}
97+
}
98+
}
99+
$r = $i*100/$j;
100+
return $r;
101+
}
102+
public function getTotalClasses()
103+
{
104+
$i=0;
105+
if($this->user_level==1){
106+
$i = count($this->groups);
107+
}
108+
elseif($this->user_level==2){
109+
foreach($this->courses as $course){
110+
$i+=count($course->groups);
111+
}
112+
}
113+
else $i = count(\App\Group::all());
114+
return $i;
115+
}
116+
public function getTotalStudents()
117+
{
118+
$i=0;
119+
$users = \App\User::all();
120+
foreach($users as $user){
121+
if($user->user_level==1) $i++;
122+
}
123+
return $i;
124+
}
125+
public function getTotalInstructors()
126+
{
127+
$i=0;
128+
$users = \App\User::all();
129+
foreach($users as $user){
130+
if($user->user_level==2) $i++;
131+
}
132+
return $i;
133+
}
76134
}

‎DigiKaksha/resources/views/home.blade.php

Lines changed: 19 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,7 @@
350350
<nav aria-label="breadcrumb" class="d-none d-md-inline-block ml-md-4">
351351
<ol class="breadcrumb breadcrumb-links breadcrumb-dark">
352352
<li class="breadcrumb-item"><a href="#"><i class="fas fa-home"></i></a></li>
353-
<li class="breadcrumb-item"><a href="#">Dashboards</a></li>
354-
<li class="breadcrumb-item active" aria-current="page">Default</li>
353+
<li class="breadcrumb-item"><a href="#">Dashboard</a></li>
355354
</ol>
356355
</nav>
357356
</div>
@@ -374,19 +373,20 @@
374373
<div class="card-body">
375374
<div class="row">
376375
<div class="col">
377-
<h5 class="card-title text-uppercase text-muted mb-0">Total traffic</h5>
378-
<span class="h2 font-weight-bold mb-0">350,897</span>
376+
@if(Auth::user()->user_level<3)
377+
<h5 class="card-title text-uppercase text-muted mb-0">Your ID</h5>
378+
<span class="h2 font-weight-bold mb-0">{{Auth::user()->roll_no}}</span>
379+
@else
380+
<h5 class="card-title text-uppercase text-muted mb-0">Instructors</h5>
381+
<span class="h2 font-weight-bold mb-0">{{Auth::user()->getTotalInstructors()}}</span>
382+
@endif
379383
</div>
380384
<div class="col-auto">
381385
<div class="icon icon-shape bg-gradient-red text-white rounded-circle shadow">
382386
<i class="ni ni-active-40"></i>
383387
</div>
384388
</div>
385389
</div>
386-
<p class="mt-3 mb-0 text-sm">
387-
<span class="text-success mr-2"><i class="fa fa-arrow-up"></i> 3.48%</span>
388-
<span class="text-nowrap">Since last month</span>
389-
</p>
390390
</div>
391391
</div>
392392
</div>
@@ -396,19 +396,20 @@
396396
<div class="card-body">
397397
<div class="row">
398398
<div class="col">
399-
<h5 class="card-title text-uppercase text-muted mb-0">New users</h5>
400-
<span class="h2 font-weight-bold mb-0">2,356</span>
399+
@if(Auth::user()->user_level==1)
400+
<h5 class="card-title text-uppercase text-muted mb-0">Average Marks</h5>
401+
<span class="h2 font-weight-bold mb-0">{{Auth::user()->averageMarks()}}%</span>
402+
@else
403+
<h5 class="card-title text-uppercase text-muted mb-0">Students</h5>
404+
<span class="h2 font-weight-bold mb-0">{{Auth::user()->getTotalStudents()}}</span>
405+
@endif
401406
</div>
402407
<div class="col-auto">
403408
<div class="icon icon-shape bg-gradient-orange text-white rounded-circle shadow">
404409
<i class="ni ni-chart-pie-35"></i>
405410
</div>
406411
</div>
407412
</div>
408-
<p class="mt-3 mb-0 text-sm">
409-
<span class="text-success mr-2"><i class="fa fa-arrow-up"></i> 3.48%</span>
410-
<span class="text-nowrap">Since last month</span>
411-
</p>
412413
</div>
413414
</div>
414415
</div>
@@ -418,19 +419,15 @@
418419
<div class="card-body">
419420
<div class="row">
420421
<div class="col">
421-
<h5 class="card-title text-uppercase text-muted mb-0">Sales</h5>
422-
<span class="h2 font-weight-bold mb-0">924</span>
422+
<h5 class="card-title text-uppercase text-muted mb-0">Courses</h5>
423+
<span class="h2 font-weight-bold mb-0">{{Auth::user()->getTotalCourses()}}</span>
423424
</div>
424425
<div class="col-auto">
425426
<div class="icon icon-shape bg-gradient-green text-white rounded-circle shadow">
426427
<i class="ni ni-money-coins"></i>
427428
</div>
428429
</div>
429430
</div>
430-
<p class="mt-3 mb-0 text-sm">
431-
<span class="text-success mr-2"><i class="fa fa-arrow-up"></i> 3.48%</span>
432-
<span class="text-nowrap">Since last month</span>
433-
</p>
434431
</div>
435432
</div>
436433
</div>
@@ -440,19 +437,15 @@
440437
<div class="card-body">
441438
<div class="row">
442439
<div class="col">
443-
<h5 class="card-title text-uppercase text-muted mb-0">Performance</h5>
444-
<span class="h2 font-weight-bold mb-0">49,65%</span>
440+
<h5 class="card-title text-uppercase text-muted mb-0">Classes</h5>
441+
<span class="h2 font-weight-bold mb-0">{{Auth::user()->getTotalClasses()}}</span>
445442
</div>
446443
<div class="col-auto">
447444
<div class="icon icon-shape bg-gradient-info text-white rounded-circle shadow">
448445
<i class="ni ni-chart-bar-32"></i>
449446
</div>
450447
</div>
451448
</div>
452-
<p class="mt-3 mb-0 text-sm">
453-
<span class="text-success mr-2"><i class="fa fa-arrow-up"></i> 3.48%</span>
454-
<span class="text-nowrap">Since last month</span>
455-
</p>
456449
</div>
457450
</div>
458451
</div>
@@ -492,9 +485,6 @@
492485
<span class="text-success">●</span>
493486
<small>Online</small>
494487
</div>
495-
<div class="col-auto">
496-
<button type="button" class="btn btn-sm btn-primary">Add</button>
497-
</div>
498488
</div>
499489
</li>
500490
@endforeach

0 commit comments

Comments
 (0)