Skip to content

Commit 5054261

Browse files
abhishekmsinghabhishekmsingh
committed
added submission cards
1 parent c53998e commit 5054261

File tree

6 files changed

+107
-10
lines changed

6 files changed

+107
-10
lines changed

‎DigiKaksha/app/Http/Controllers/AnnouncementsController.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ public function store(Request $request)
4343
$announcement = new Announcement();
4444
$announcement->title = $request->input('title');
4545
$announcement->body = $request->input('body');
46-
if($request->input('graded')) $announcement->graded=1;
46+
if($request->input('graded')) {
47+
$announcement->graded=1;
48+
$announcement->max_grade = $request->input('max_grade');
49+
$announcement->component = $request->input('component');
50+
}
4751
else $announcement->graded=0;
4852
$announcement->user_id = auth()->user()->id;
4953
$announcement->course_id = $course->id;

‎DigiKaksha/app/User.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,19 @@ public function hasSubmission($announcement){
5858
foreach($this->submissions as $submission) if($submission->announcement_id == $announcement->id) return true;
5959
return false;
6060
}
61+
public function getScore($course){
62+
$i=0;
63+
foreach($this->submissions as $submission) if($submission->announcement->course_id==$course->id) $i+=$submission->grade;
64+
return $i;
65+
}
66+
public function getMaxScore($course){
67+
$i=0;
68+
foreach($this->submissions as $submission) if($submission->announcement->course_id==$course->id) $i+=$submission->announcement->max_grade;
69+
return $i;
70+
}
71+
public function evaluationNo($course){
72+
$i=0;
73+
foreach($this->submissions as $submission) if($submission->announcement->course_id==$course->id) if($submission->grade!=NULL)$i+=1;
74+
return $i;
75+
}
6176
}

‎DigiKaksha/resources/views/announcements/create.blade.php

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<label for="body" class="col-md-4 col-form-label text-md-right">{{ __('Body') }}</label>
3535

3636
<div class="col-md-8">
37-
<textarea id="body" style="height:200px" type="text" class="form-control @error('body') is-invalid @enderror" name="body" value="{{ old('body') }}" required autocomplete="body"></textarea>
37+
<textarea id="body" style="height:150px" type="text" class="form-control @error('body') is-invalid @enderror" name="body" value="{{ old('body') }}" required autocomplete="body"></textarea>
3838

3939
@error('body')
4040
<span class="invalid-feedback" role="alert">
@@ -64,7 +64,32 @@
6464
<span class="custom-toggle-slider rounded-circle"></span>
6565
</label>
6666
</div>
67-
67+
<div class="form-group row">
68+
<label for="max_grade" class="col-md-4 col-form-label text-md-right">{{ __('Max Grade(If Graded)') }}</label>
69+
70+
<div class="col-md-8">
71+
<input id="max_grade" type="number" class="form-control @error('max_grade') is-invalid @enderror" name="max_grade" value="{{ old('max_grade') }}" required autocomplete="max_grade" autofocus>
72+
73+
@error('max_grade')
74+
<span class="invalid-feedback" role="alert">
75+
<strong>{{ $message }}</strong>
76+
</span>
77+
@enderror
78+
</div>
79+
</div>
80+
<div class="form-group row">
81+
<label for="component" class="col-md-4 col-form-label text-md-right">{{ __('Component(If Graded)') }}</label>
82+
83+
<div class="col-md-8">
84+
<input id="component" type="text" class="form-control @error('component') is-invalid @enderror" name="component" value="{{ old('component') }}" required autocomplete="component" autofocus>
85+
86+
@error('component')
87+
<span class="invalid-feedback" role="alert">
88+
<strong>{{ $message }}</strong>
89+
</span>
90+
@enderror
91+
</div>
92+
</div>
6893

6994
<div class="form-group row mb-0">
7095
<div class="col-md-6 offset-md-4">

‎DigiKaksha/resources/views/announcements/show.blade.php

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
<tr>
6969
<th scope="col" class="sort" data-sort="name">Roll No</th>
7070
<th scope="col" class="sort" data-sort="budget">Name</th>
71+
<th scope="col" class="sort" data-sort="budget">Current Grade</th>
7172
<th scope="col" class="sort" data-sort="completion"></th>
7273
</tr>
7374
</thead>
@@ -84,6 +85,9 @@
8485
<td class="budget">
8586
{{$submission->user->name}}
8687
</td>
88+
<td class="budget">
89+
{{$submission->grade}}
90+
</td>
8791
<td>
8892
<div class="d-flex align-items-center">
8993
<a href="/submissions/{{$submission->id}}/edit" class="btn btn-sm btn-primary">View Submission</a>
@@ -98,7 +102,48 @@
98102
@else
99103
@foreach(Auth::user()->courses as $course)
100104
@if($course->id==$announcement->course->id)
101-
<a href="#!" class="btn btn-sm btn-primary">View Submissions</a>
105+
<div class="card-header">
106+
Submissions
107+
</div>
108+
<div class="card-body">
109+
<div class="table-responsive">
110+
<table class="table align-items-center table-flush">
111+
<thead class="thead-light">
112+
<tr>
113+
<th scope="col" class="sort" data-sort="name">Roll No</th>
114+
<th scope="col" class="sort" data-sort="budget">Name</th>
115+
<th scope="col" class="sort" data-sort="budget">Current Grade</th>
116+
<th scope="col" class="sort" data-sort="completion"></th>
117+
</tr>
118+
</thead>
119+
<tbody class="list">
120+
@foreach($announcement->submissions as $submission)
121+
<tr>
122+
<th scope="row">
123+
<div class="media align-items-center">
124+
<div class="media-body">
125+
<span class="name mb-0 text-sm"><a>{{$submission->user->roll_no}}</a></span>
126+
</div>
127+
</div>
128+
</th>
129+
<td class="budget">
130+
{{$submission->user->name}}
131+
</td>
132+
<td class="budget">
133+
{{$submission->grade}}
134+
</td>
135+
<td>
136+
<div class="d-flex align-items-center">
137+
<a href="/submissions/{{$submission->id}}/edit" class="btn btn-sm btn-primary">View Submission</a>
138+
</div>
139+
</td>
140+
</tr>
141+
@endforeach
142+
</tbody>
143+
</table>
144+
</div>
145+
</div>
146+
</div>
102147
@break
103148
@endif
104149
@endforeach

‎DigiKaksha/resources/views/courses/show.blade.php

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,11 @@
744744
<div class="row">
745745
<div class="col">
746746
<h5 class="card-title text-uppercase text-muted mb-0 text-white">Attendance</h5>
747-
<span class="h2 font-weight-bold mb-0 text-white">{{$present}}/{{$total}}</span>
747+
<span class="h2 font-weight-bold mb-0 text-white">
748+
749+
{{$present}}/{{$total}}
750+
751+
</span>
748752
</div>
749753
<div class="col-auto">
750754
<div class="icon icon-shape bg-white text-dark rounded-circle shadow">
@@ -753,7 +757,11 @@
753757
</div>
754758
</div>
755759
<p class="mt-3 mb-0 text-sm">
756-
<span class="text-white mr-2">{{$present*100/$total}}%</span>
760+
<span class="text-white mr-2">@if($total==0)
761+
100%
762+
@else
763+
{{$present*100/$total}}%
764+
@endif</span>
757765
<span class="text-nowrap text-light">Required 75%</span>
758766
</p>
759767
</div>
@@ -766,7 +774,7 @@
766774
<div class="row">
767775
<div class="col">
768776
<h5 class="card-title text-uppercase text-muted mb-0 text-white">Grades</h5>
769-
<span class="h2 font-weight-bold mb-0 text-white">8.00/10</span>
777+
<span class="h2 font-weight-bold mb-0 text-white">{{Auth::user()->getScore($course)}}/{{Auth::user()->getMaxScore($course)}}</span>
770778
</div>
771779
<div class="col-auto">
772780
<div class="icon icon-shape bg-white text-dark rounded-circle shadow">
@@ -775,8 +783,8 @@
775783
</div>
776784
</div>
777785
<p class="mt-3 mb-0 text-sm">
778-
<span class="text-white mr-2">Based on 10 tests
779-
<span class="text-nowrap text-light">4.00 minimum required</span>
786+
<span class="text-white mr-2">Based on {{Auth::user()->evaluationNo($course)}} evaluations
787+
<span class="text-nowrap text-light">25% minimum required</span>
780788
</p>
781789
</div>
782790
</div>

‎DigiKaksha/resources/views/submissions/edit.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<label for="comment" class="col-md-2 col-form-label text-md-right">{{ __('Comment') }}</label>
4040

4141
<div class="col-md-8">
42-
<textarea id="comment" style="height:200px" type="text" class="form-control @error('comment') is-invalid @enderror" name="comment" value="{{ $submission->body }}" required autocomplete="comment"></textarea>
42+
<textarea id="comment" style="height:200px" type="text" class="form-control @error('comment') is-invalid @enderror" name="comment" value="" required autocomplete="comment">{{ $submission->comment }}</textarea>
4343

4444
@error('comment')
4545
<span class="invalid-feedback" role="alert">

0 commit comments

Comments
 (0)