Changed some layout

zalsader · Sep 11, 2015 · ab29328 · ab29328
1 parent 617e5e2
commit ab29328
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/app/Question.php b/app/Question.php
@@ -24,7 +24,8 @@ public function scopeActivated($q) {
             ->whereExists(function ($query) {
                 $query->select(\DB::raw(1))
                       ->from('levels')
-                      ->whereRaw('levels.id = questions.level_id');
+                      ->whereRaw('levels.id = questions.level_id')
+                      ->where('levels.active', '=', true);
             });
     }
 }
diff --git a/config/app.php b/config/app.php
@@ -39,7 +39,7 @@
     |
     */
 
-    'timezone' => 'Asia/Gaza',
+    'timezone' => 'Asia/Hebron',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -30,6 +30,7 @@
             <a href="{{url('logout')}}" class="btn btn-danger">log out</a>
         </div>
         </div>
+        <hr class="clear">
         @yield('content')
 
         <script type="text/javascript" src="{{asset('js/jquery.min.js')}}"></script>

diff --git a/resources/views/profile.blade.php b/resources/views/profile.blade.php
@@ -22,7 +22,9 @@
                       <tr>
                           <td><a href="{{url('question', [$question->id])}}">{{$question->name}}</a></td>
                           <td>{{round($level->mark,1)}}</td>
-                          <?php $lastSub = $question->submissions->last(); ?>
+                          <?php $lastSub = $question->submissions()
+                            ->where('user_id', '=', Auth::user()->id)
+                            ->orderBy('created_at', 'desc')->first(); ?>
                           @if (!empty($lastSub))
                           <td>{{\Carbon\Carbon::parse($lastSub->created_at)->toDayDateTimeString()}}</td>
                           @else

diff --git a/resources/views/questions/show.blade.php b/resources/views/questions/show.blade.php
@@ -2,6 +2,17 @@
 
 @section('content')
 <div class="container">
+    <div class="row">
+        <div id="successfulSubmission" class="alert alert-success fade in hidden">
+            <a href="#" class="close" data-dismiss="alert">&times;</a>
+            Your work has been submitted successfully! Please wait while we grade it.
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-2">
+            <a class="btn btn-default" href="{{url('profile')}}">&#8592; Go back</a>
+        </div>
+    </div>
     <div class="row">
         <div class="col-md-6" >
             <h1>{{ $question->name}}</h1>
@@ -22,12 +33,6 @@
             <button id="submit" class="btn btn-danger btn-block">Submit</button>
         </div>
     </div>
-    <div class="row">
-        <div id="successfulSubmission" class="alert alert-success fade in hidden">
-            <a href="#" class="close" data-dismiss="alert">&times;</a>
-            <strong>Success!</strong> Your work has been submitted successfully.
-        </div>
-    </div>
 </div>
 
 <iframe class="game" src="{{url('/game/apps/turtle/index.html')}}" width="95%" height="655" sandbox="allow-same-origin allow-scripts"></iframe>
@@ -84,7 +89,7 @@ class="{{empty($question->hint_image)? 'hidden': ''}}">
     
     $(function(){
         $('#submit').popover({
-            content:'You must run your program first',
+            content:'Please run your program first',
             placement:'bottom',
             container:'body',
             trigger:'manual'
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,7 +39,7 @@ @@
         |
         */
-        'timezone' => 'Asia/Gaza',
+        'timezone' => 'Asia/Hebron',
         /*
         |--------------------------------------------------------------------------
@@ Expand Down @@