Minor bugs

zalsader · Sep 11, 2015 · d412feb · d412feb
1 parent 353d00a
commit d412feb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 24 deletions.
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
@@ -18,7 +18,7 @@ class ProfileController extends Controller
      */
     public function index() {
 
-        $levels = Level::where('active', '=', true)->get();
+        $levels = Level::where('active', '=', true)->with('questions.submissions')->get();
 
         // Maximum obtainable score from the currently available levels
         $maxScore = $levels->reduce(function($carry, $item){

diff --git a/resources/views/profile.blade.php b/resources/views/profile.blade.php
@@ -12,33 +12,26 @@
       <hr>
         <div class="">
             @forelse($levels as $level)
-            <h3>{{ $level->name }}, Question Score: {{$level->mark}}</h3>
+            <h3>{{ $level->name }}</h3>
             <table class="table table-hover">
                 <thead>
                   <tr>
                     <th>Question Name</th>
-                    @if(false)
-                    <th>Your Score</th>
-                    @endif
+                    <th>Question Score</th>
                     <th>Last Submitted</th>
                   </tr>
                 </thead>
                 <tbody>
                     @foreach($level->questions as $question)
-                    <?php
-                      $Qsubmissions = \App\Submission::where('question_id','=',$question->id);
-
-                      $sorted = $collection->sortBy(function ($sth, $key) {
-                          return $sth['create_at'];
-                      });
-
-                    ?>
                       <tr>
                           <td><a href="{{url('question', [$question->id])}}">{{$question->name}}</a></td>
-                          @if(false)
-                          <td>0</td>
+                          <td>{{$level->mark}}</td>
+                          <?php $lastSub = $question->submissions->last(); ?>
+                          @if (!empty($lastSub))
+                          <td>{{$lastSub->created_at}}</td>
+                          @else
+                          <td> Never </td>
                           @endif
-                          <td>{{$sorted[0]}}</td>
                       </tr>
                     @endforeach
                 </tbody>

diff --git a/resources/views/questions/show.blade.php b/resources/views/questions/show.blade.php
@@ -45,16 +45,13 @@
             @if($observation->hint_used)
                 <div>
                     <p id="hintText">{{$question->hint_text}}</p>
-                    @if(!empty($question->hint_image))
-                    <img id="hintImage" src="{{asset('images/hints/'.$question->hint_image)}}" alt="">
-                    @endif
+                    <img id="hintImage" src="{{asset('images/hints/'.$question->hint_image)}}" alt="" 
+                        class="{{empty($question->hint_image)? 'hidden': ''}}">
                 </div>
             @else
                 <div>
                     <p id="hintText"></p>
-                    @if(!empty($question->hint_image))
-                    <img id="hintImage" src="" alt="">
-                    @endif
+                    <img id="hintImage" src="" alt="" class="{{empty($question->hint_image)? 'hidden': ''}}">
                 </div>
             @endif
       </div>
@@ -84,7 +81,7 @@
 
 @section('scripts')
 <script type="text/javascript">
-    var hintUsed = {{$observation->hint_used}};
+    var hintUsed = {{$observation->hint_used? 'true': 'false'}};
     
     $(function(){
         $('#submit').popover({
@@ -140,7 +137,7 @@
             success: function(response) {
                 console.log(response);
                 $('#hintModal').find('#hintText').text(response.data.text);
-                $('#hintModal').find('#hintImage').src('{{asset("image/hints/")}}/' + response.data.image);
+                $('#hintModal').find('#hintImage')[0].src = ('{{asset("image/hints/")}}/' + response.data.image);
                 $('#hintModal').modal('show');
             }
         });