Fixed grader views

zalsader · Sep 16, 2015 · 15ba1a1 · 15ba1a1
1 parent 482bcb8
commit 15ba1a1
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 22 deletions.
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
@@ -17,8 +17,13 @@ class ProfileController extends Controller
      * @return Response
      */
     public function index() {
-
-        $levels = Level::where('active', '=', true)->with('questions.submissions')->get();
+
+        if(\Auth::user()->cannot('grade', null)) {
+            $levels = Level::where('active', '=', true)->with('questions.submissions')->get();
+
+        } else {
+            $levels = Level::with('questions.submissions')->get();
+        }
 
         // Maximum obtainable score from the currently available levels
         $maxScore = $levels->reduce(function($carry, $item){

diff --git a/composer.lock b/composer.lock
diff --git a/resources/views/profile.blade.php b/resources/views/profile.blade.php
@@ -23,7 +23,7 @@
                 </thead>
                 <tbody>
                     @foreach($level->questions as $question)
-                    @if($question->active)
+                    @if($question->active || \Auth::user()->can('grade', $question))
                       <tr>
                           <td><a href="{{url('question', [$question->id])}}">{{$question->name}}</a></td>
                           <td>{{round($level->mark,1)}}</td>

diff --git a/resources/views/submissions/index.blade.php b/resources/views/submissions/index.blade.php
@@ -3,23 +3,25 @@
 @section('content')
 <div class="container">
 <div class="row">
-    <div class="col-md-8" >
+    <div class="col-md-10" >
         <div class="">
             <h1>Submissions for Question #{{$question->id}}: {{ $question->name }}</h1>
             <div class="table-responsive">
             <table class="table table-hover">
                 <thead>
                   <tr>
-                    <th width="30%">User</th>
+                    <th width="20%">User</th>
+                    <th width="20%">Email</th>
                     <th width="20%">Score</th>
                     <th width="30%">Last Assessed</th>
-                    <th width="20%">View<th>
+                    <th width="10%">View<th>
                   </tr>
                 </thead>
                 <tbody>
                     @foreach($submissions as $submission)
                       <tr>
                           <td>{{$submission->user->name}}</td>
+                          <td>{{$submission->user->email}}</td>
                           <td>{{round($submission->score,3)}}</td>
                           <?php $lastAssessment = $submission->assessments()
                             ->orderBy('created_at', 'desc')->first(); ?>

diff --git a/resources/views/submissions/show.blade.php b/resources/views/submissions/show.blade.php
@@ -16,7 +16,7 @@
     <div class="row">
         <div class="col-md-6" >
             <h1>{{ $question->name }}</h1>
-            <h3>Submitted by {{$submission->user->name}}</h3>
+            <h3>Submitted by {{$submission->user->name}}, {{$submission->user->email}}</h3>
             <p>{{ $question->description }}</p>
         </div>
     </div>