Skip to content

Commit ce84cec

Browse files
abhishekmsinghabhishekmsingh
committed
Fixed formatting
1 parent ab99b90 commit ce84cec

File tree

2 files changed

+185
-169
lines changed

2 files changed

+185
-169
lines changed

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

Lines changed: 163 additions & 155 deletions
Original file line numberDiff line numberDiff line change
@@ -2,164 +2,172 @@
22

33
@section('content')
44
<div class="container">
5-
<div class="row justify-content-center">
6-
<div class="col-md-12">
7-
<div class="card">
8-
<div class="card-header"><h5 class="display-3 mb-0">{{ $announcement->title }}</h5>
9-
<small class="text-muted inintialism">By {{$announcement->user->name}} at {{$announcement->created_at}} in
10-
<a href="/courses/{{$announcement->course->id}}">{{$announcement->course->name}}</a>
11-
</small>
12-
</div>
5+
<div class="row justify-content-center">
6+
<div class="col-md-12">
7+
<div class="card">
8+
<div class="card-header">
9+
<h5 class="display-3 mb-0">{{ $announcement->title }}</h5>
10+
<small class="text-muted inintialism">By {{$announcement->user->name}} at {{$announcement->created_at}} in
11+
<a href="/courses/{{$announcement->course->id}}">{{$announcement->course->name}}</a>
12+
</small>
13+
</div>
1314

14-
<div class="card-body">
15-
@if (session('status'))
16-
<div class="alert alert-success">
17-
{{ session('status') }}
18-
</div>
19-
@endif
20-
<p>{{$announcement->body}}</p>
21-
</div>
22-
</div>
23-
@if($announcement->graded==1)
24-
<div class="card">
25-
@if(Auth::user()->user_level==1)
26-
<div class="card-header">
27-
@if(Auth::user()->hasSubmission($announcement))
28-
@foreach(Auth::user()->submissions as $submission)
29-
@if($submission->announcement_id==$announcement->id)
15+
<div class="card-body">
16+
@if (session('status'))
17+
<div class="alert alert-success">
18+
{{ session('status') }}
19+
</div>
20+
@endif
21+
<p>{{$announcement->body}}</p>
22+
</div>
23+
</div>
24+
@if($announcement->graded==1)
25+
<div class="card">
26+
@if(Auth::user()->user_level==1)
27+
<div class="card-header">
28+
@if(Auth::user()->hasSubmission($announcement))
29+
@foreach(Auth::user()->submissions as $submission)
30+
@if($submission->announcement_id==$announcement->id)
3031

31-
<p><strong>Submission:</strong> <small>{{$submission->body}}</small></p>
32-
<p class="strong"><strong>Grade:</strong>
33-
@if($submission->grade)
34-
{{$submission->grade}} out of {{$announcement->max_grade}}
35-
@else
36-
<small> No grade awarded yet</small>
37-
@endif
38-
</p>
39-
<p class="strong"><strong>Auto Grade:</strong>
40-
@if($submission->auto_grade)
41-
{{$submission->auto_grade}} out of {{$announcement->max_grade}}
42-
@else
43-
<small> Some problem in auto grading</small>
44-
@endif
45-
</p>
46-
<p class="strong"><strong>Comments:</strong>
47-
@if($submission->comment)
48-
{{$submission->comment}}
49-
@else
50-
<small>No commments</small>
51-
@endif
52-
</p>
53-
@break
54-
@endif
55-
@endforeach
56-
@else
57-
@foreach(Auth::user()->groups as $group)
58-
@foreach($group->courses as $course)
59-
@if($course->id==$announcement->course->id)
60-
<a href="/submissions/create?announcement={{$announcement->id}}" class="btn btn-sm btn-primary">Add Submission</a>
61-
@break
62-
@endif
63-
@endforeach
64-
@endforeach
65-
@endif
66-
</div>
67-
@elseif(Auth::user()->user_level==3)
68-
<div class="card-header">
69-
Submissions
70-
</div>
71-
<div class="card-body">
72-
<div class="table-responsive">
73-
<table class="table align-items-center table-flush">
74-
<thead class="thead-light">
75-
<tr>
76-
<th scope="col" class="sort" data-sort="name">Roll No</th>
77-
<th scope="col" class="sort" data-sort="budget">Name</th>
78-
<th scope="col" class="sort" data-sort="budget">Current Grade</th>
79-
<th scope="col" class="sort" data-sort="completion"></th>
80-
</tr>
81-
</thead>
82-
<tbody class="list">
83-
@foreach($announcement->submissions as $submission)
84-
<tr>
85-
<th scope="row">
86-
<div class="media align-items-center">
87-
<div class="media-body">
88-
<span class="name mb-0 text-sm"><a>{{$submission->user->roll_no}}</a></span>
89-
</div>
90-
</div>
91-
</th>
92-
<td class="budget">
93-
{{$submission->user->name}}
94-
</td>
95-
<td class="budget">
96-
{{$submission->grade}}
97-
</td>
98-
<td>
99-
<div class="d-flex align-items-center">
100-
<a href="/submissions/{{$submission->id}}/edit" class="btn btn-sm btn-primary">View Submission</a>
101-
</div>
102-
</td>
103-
</tr>
104-
@endforeach
105-
</tbody>
106-
</table>
107-
</div>
108-
</div>
109-
@else
110-
@foreach(Auth::user()->courses as $course)
111-
@if($course->id==$announcement->course->id)
112-
<div class="card-header">
113-
Submissions
114-
</div>
115-
<div class="card-body">
116-
<div class="table-responsive">
117-
<table class="table align-items-center table-flush">
118-
<thead class="thead-light">
119-
<tr>
120-
<th scope="col" class="sort" data-sort="name">Roll No</th>
121-
<th scope="col" class="sort" data-sort="budget">Name</th>
122-
<th scope="col" class="sort" data-sort="budget">Current Grade</th>
123-
<th scope="col" class="sort" data-sort="completion"></th>
124-
</tr>
125-
</thead>
126-
<tbody class="list">
127-
@foreach($announcement->submissions as $submission)
128-
<tr>
129-
<th scope="row">
130-
<div class="media align-items-center">
131-
<div class="media-body">
132-
<span class="name mb-0 text-sm"><a>{{$submission->user->roll_no}}</a></span>
133-
</div>
134-
</div>
135-
</th>
136-
<td class="budget">
137-
{{$submission->user->name}}
138-
</td>
139-
<td class="budget">
140-
{{$submission->grade}}
141-
</td>
142-
<td>
143-
<div class="d-flex align-items-center">
144-
<a href="/submissions/{{$submission->id}}/edit" class="btn btn-sm btn-primary">View Submission</a>
145-
</div>
146-
</td>
147-
</tr>
148-
@endforeach
149-
</tbody>
150-
</table>
151-
</div>
152-
</div>
153-
</div>
154-
@break
155-
@endif
156-
@endforeach
157-
@endif
32+
<p><strong>Submission:</strong> <small>{{$submission->body}}</small></p>
33+
<p class="strong"><strong>Grade:</strong>
34+
@if($submission->grade)
35+
{{$submission->grade}} out of {{$announcement->max_grade}}
36+
@else
37+
<small> No grade awarded yet</small>
38+
@endif
39+
</p>
40+
<p class="strong"><strong>Auto Grade:</strong>
41+
@if($submission->auto_grade)
42+
{{$submission->auto_grade}} out of {{$announcement->max_grade}}
43+
@else
44+
<small> Some problem in auto grading</small>
45+
@endif
46+
</p>
47+
<p class="strong"><strong>Comments:</strong>
48+
@if($submission->comment)
49+
{{$submission->comment}}
50+
@else
51+
<small>No commments</small>
52+
@endif
53+
</p>
54+
@break
55+
@endif
56+
@endforeach
57+
@else
58+
@foreach(Auth::user()->groups as $group)
59+
@foreach($group->courses as $course)
60+
@if($course->id==$announcement->course->id)
61+
<a href="/submissions/create?announcement={{$announcement->id}}" class="btn btn-sm btn-primary">Add
62+
Submission</a>
63+
@break
64+
@endif
65+
@endforeach
66+
@endforeach
67+
@endif
68+
</div>
69+
@elseif(Auth::user()->user_level==3)
70+
<div class="card-header">
71+
Submissions
72+
</div>
73+
<div class="card-body">
74+
<h3>Answer</h3>
75+
<p>{{$announcement->answer}}</p>
76+
<div class="table-responsive">
77+
<table class="table align-items-center table-flush">
78+
<thead class="thead-light">
79+
<tr>
80+
<th scope="col" class="sort" data-sort="name">Roll No</th>
81+
<th scope="col" class="sort" data-sort="budget">Name</th>
82+
<th scope="col" class="sort" data-sort="budget">Auto Grade</th>
83+
<th scope="col" class="sort" data-sort="budget">Current Grade</th>
84+
<th scope="col" class="sort" data-sort="completion"></th>
85+
</tr>
86+
</thead>
87+
<tbody class="list">
88+
@foreach($announcement->submissions as $submission)
89+
<tr>
90+
<th scope="row">
91+
<div class="media align-items-center">
92+
<div class="media-body">
93+
<span class="name mb-0 text-sm"><a>{{$submission->user->roll_no}}</a></span>
94+
</div>
95+
</div>
96+
</th>
97+
<td class="budget">
98+
{{$submission->user->name}}
99+
</td>
100+
<td class="budget">
101+
{{$submission->auto_grade}}/{{$announcement->max_grade}}
102+
</td>
103+
<td class="budget">
104+
{{$submission->grade}}
105+
</td>
106+
<td>
107+
<div class="d-flex align-items-center">
108+
<a href="/submissions/{{$submission->id}}/edit" class="btn btn-sm btn-primary">View Submission</a>
158109
</div>
159-
@endif
160-
</div>
161-
110+
</td>
111+
</tr>
112+
@endforeach
113+
</tbody>
114+
</table>
115+
</div>
116+
</div>
117+
@else
118+
@foreach(Auth::user()->courses as $course)
119+
@if($course->id==$announcement->course->id)
120+
<div class="card-header">
121+
Submissions
162122
</div>
123+
<div class="card-body">
124+
<div class="table-responsive">
125+
<table class="table align-items-center table-flush">
126+
<thead class="thead-light">
127+
<tr>
128+
<th scope="col" class="sort" data-sort="name">Roll No</th>
129+
<th scope="col" class="sort" data-sort="budget">Name</th>
130+
<th scope="col" class="sort" data-sort="budget">Current Grade</th>
131+
<th scope="col" class="sort" data-sort="completion"></th>
132+
</tr>
133+
</thead>
134+
<tbody class="list">
135+
@foreach($announcement->submissions as $submission)
136+
<tr>
137+
<th scope="row">
138+
<div class="media align-items-center">
139+
<div class="media-body">
140+
<span class="name mb-0 text-sm"><a>{{$submission->user->roll_no}}</a></span>
141+
</div>
142+
</div>
143+
</th>
144+
<td class="budget">
145+
{{$submission->user->name}}
146+
</td>
147+
<td class="budget">
148+
{{$submission->grade}}
149+
</td>
150+
<td>
151+
<div class="d-flex align-items-center">
152+
<a href="/submissions/{{$submission->id}}/edit" class="btn btn-sm btn-primary">View Submission</a>
153+
</div>
154+
</td>
155+
</tr>
156+
@endforeach
157+
</tbody>
158+
</table>
159+
</div>
160+
</div>
161+
</div>
162+
@break
163+
@endif
164+
@endforeach
165+
@endif
163166
</div>
167+
@endif
168+
</div>
169+
170+
</div>
171+
</div>
164172
</div>
165-
@endsection
173+
@endsection

0 commit comments

Comments
 (0)