Minor Enhancements

Author: abhishekmsingh

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

@@ -6,7 +6,9 @@
         <div class="col-md-12">
             <div class="card">
                 <div class="card-header"><h5 class="display-3 mb-0">{{ $announcement->title }}</h5>
-                    <small class="text-muted inintialism">By {{$announcement->user->name}} at {{$announcement->created_at}}</small>
+                    <small class="text-muted inintialism">By {{$announcement->user->name}} at {{$announcement->created_at}} in 
+                        <a href="/courses/{{$announcement->course->id}}">{{$announcement->course->name}}</a>
+                        </small>
                 </div>
 
                 <div class="card-body">
@@ -17,27 +19,29 @@
                     @endif
                     <p>{{$announcement->body}}</p>
                 </div>
-                <div class="card-footer">
-                    @if(Auth::user()->user_level==1)
-                        @foreach(Auth::user()->groups as $group)
-                            @foreach($group->courses as $course)
+                @if($announcement->graded==1)
+                    <div class="card-footer">
+                        @if(Auth::user()->user_level==1)
+                            @foreach(Auth::user()->groups as $group)
+                                @foreach($group->courses as $course)
+                                    @if($course->id==$announcement->course->id)
+                                        <a href="#!" class="btn btn-sm btn-primary">Add Submission</a>
+                                        @break
+                                    @endif
+                                @endforeach
+                            @endforeach
+                        @elseif(Auth::user()->user_level==3)
+                            <a href="#!" class="btn btn-sm btn-primary">View Submissions</a>
+                        @else
+                            @foreach(Auth::user()->courses as $course)
                                 @if($course->id==$announcement->course->id)
-                                    <a href="#!" class="btn btn-sm btn-primary">Add Submission</a>
+                                    <a href="#!" class="btn btn-sm btn-primary">View Submissions</a>
                                     @break
                                 @endif
                             @endforeach
-                        @endforeach
-                    @elseif(Auth::user()->user_level==3)
-                        <a href="#!" class="btn btn-sm btn-primary">View Submissions</a>
-                    @else
-                        @foreach(Auth::user()->courses as $course)
-                            @if($course->id==$announcement->course->id)
-                                <a href="#!" class="btn btn-sm btn-primary">View Submissions</a>
-                                @break
-                            @endif
-                        @endforeach
-                    @endif
-                </div>
+                        @endif
+                    </div>
+                @endif
             </div>
 
         </div>

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

@@ -1014,7 +1014,6 @@
               <th scope="col" class="sort" data-sort="name">Title</th>
               <th scope="col" class="sort" data-sort="budget">Time</th>
               <th scope="col" class="sort" data-sort="completion">Made by</th>
-              <th scope="col"></th>
             </tr>
           </thead>
           <tbody class="list">
@@ -1038,19 +1037,6 @@
                           <span class="completion mr-2">{{$announcement->user->name}}</span>
                         </div>
                       </td>
-                      <td class="text-right">
-                      @if($announcement->graded==1 and Auth::user()->user_level==1)
-                        <div class="dropdown">
-                          <a class="btn btn-sm btn-icon-only text-light" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <i class="fas fa-ellipsis-v"></i>
-                          </a>
-                          
-                              <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
-                                  <a class="dropdown-item" href="">Add Submission</a>
-                              </div>
-                        </div>
-                      @endif
-                      </td>
                     </tr> 
               @endforeach
           </tbody>