Fixed showing submissions issue.

Added view submissions in profile
zalsader · Sep 15, 2015 · 43f324d · 43f324d
1 parent 787d58e
commit 43f324d
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 5 deletions.
diff --git a/database/migrations/2015_09_01_131325_create_submissions_table.php b/database/migrations/2015_09_01_131325_create_submissions_table.php
@@ -16,8 +16,8 @@ public function up()
             $table->increments('id');
             $table->integer('user_id')->unsigned();
             $table->integer('question_id')->unsigned();
-            $table->text('blocks');
-            $table->text('image');
+            $table->longText('blocks');
+            $table->longText('image');
             $table->boolean('hint_used')->default(false);
             $table->double('score', 15, 8);
             $table->timestamps();

diff --git a/resources/views/profile.blade.php b/resources/views/profile.blade.php
@@ -14,7 +14,11 @@
                   <tr>
                     <th width="40%">Question Name</th>
                     <th width="20%">Question Score</th>
+                    @can('grade', $level)
+                    <th width="40%">Submissions</th>
+                    @else
                     <th width="40%">Last Submitted</th>
+                    @endcan
                   </tr>
                 </thead>
                 <tbody>
@@ -23,6 +27,9 @@
                       <tr>
                           <td><a href="{{url('question', [$question->id])}}">{{$question->name}}</a></td>
                           <td>{{round($level->mark,1)}}</td>
+                          @can('grade', $level)
+                          <td><a class="btn btn-danger" href="{{route('Submission::index', ['questionId' => $question->id])}}">View Submissions</a></td>
+                          @else
                           <?php $lastSub = $question->submissions()
                             ->where('user_id', '=', Auth::user()->id)
                             ->orderBy('created_at', 'desc')->first(); ?>
@@ -31,6 +38,7 @@
                           @else
                           <td> Never </td>
                           @endif
+                          @endcan
                       </tr>
                     @endif
                     @endforeach

diff --git a/resources/views/submissions/index.blade.php b/resources/views/submissions/index.blade.php
@@ -0,0 +1,42 @@
+@extends('app')
+
+@section('content')
+<div class="container">
+<div class="row">
+    <div class="col-md-8" >
+        <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%">Score</th>
+                    <th width="30%">Last Assessed</th>
+                    <th width="20%">View<th>
+                  </tr>
+                </thead>
+                <tbody>
+                    @foreach($submissions as $submission)
+                      <tr>
+                          <td>{{$submission->user->name}}</td>
+                          <td>{{round($submission->score,3)}}</td>
+                          <?php $lastAssessment = $submission->assessments()
+                            ->orderBy('created_at', 'desc')->first(); ?>
+                          @if (!empty($lastAssessment))
+                          <td>{{\Carbon\Carbon::parse($lastAssessment->created_at)->toDayDateTimeString()}}</td>
+                          @else
+                          <td> Never </td>
+                          @endif
+                          <td><a class="btn btn-danger" href="{{route('Submission::show', ['questionId' => $question->id, 'id' => $submission->id])}}">View Submission<a></td>
+                      </tr>
+                    @endforeach
+                </tbody>
+            </table>
+            </div>
+            <hr>
+        </div>
+    </div>
+</div>
+</div>
+@stop
diff --git a/resources/views/submissions/show.blade.php b/resources/views/submissions/show.blade.php
@@ -41,17 +41,21 @@
     <!-- TODO diff & assess -->
 </div>
 
-<iframe class="game" src="{{'https://thinklikeaprogrammer.appspot.com/static/apps/turtle/index.html?blocks='.$submission->blocks}}" width="95%" height="655" sandbox="allow-same-origin allow-scripts"></iframe>
+<iframe class="game" src="{{url('/game/apps/turtle/index.html')}}" width="95%" height="655" sandbox="allow-same-origin allow-scripts"></iframe>
 
 @stop
 
 @section('scripts')
 <script type="text/javascript">
-    
+    var defaultXml = '<xml>' + decodeURIComponent('{{$submission->blocks}}') + '</xml>';
     $(function(){
         $('.measure').each(function(){
             createMeasurement(this);
-        })
+        });
     });
+    $('.game').on('load', function(){
+        var BlocklyApps  = this.contentWindow.BlocklyApps;
+        BlocklyApps.loadBlocks(defaultXml);
+    })
 </script>
 @stop