Merge branch 'master' of https://github.com/zalsader/ThinkLikeAProgra…

…mmer
zalsader · Sep 11, 2015 · 2a09558 · 2a09558
2 parents 6aab90b + 740ddda
commit 2a09558
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 30 deletions.
diff --git a/.env.example b/.env.example
diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php
@@ -17,18 +17,18 @@ class ProfileController extends Controller
      * @return Response
      */
     public function index() {
-        
+
         $levels = Level::where('active', '=', true)->get();
-        
+
         // Maximum obtainable score from the currently available levels
         $maxScore = $levels->reduce(function($carry, $item){
             return $carry + $item->questions->count() * $item->mark;
         }, 1);
-        
+
         // For leaderboard.
         $leaders = User::orderBy('total_score', 'desc')
             ->get();
-        
+
         $myRank = 1 + $leaders->search(function($item, $key){
             return $item->id == \Auth::user()->id;
         });
@@ -65,7 +65,7 @@ public function store(Request $request)
      */
     public function show($id)
     {
-      return 'go inside the $id (sub)';
+      // return 'go inside the $id (sub)';
     }
 
     /**
@@ -76,7 +76,7 @@ public function show($id)
      */
     public function edit($id)
     {
-        return "you're editing $id (sub)";
+        // return "you're editing $id (sub)";
     }
 
     /**
@@ -88,7 +88,7 @@ public function edit($id)
      */
     public function update(Request $request, $id)
     {
-        return "saving the edited $id";
+        // return "saving the edited $id";
     }
 
     /**
@@ -99,7 +99,7 @@ public function update(Request $request, $id)
      */
     public function destroy($id)
     {
-        return "deleting it";
+        // return "deleting it";
     }
 
 }
diff --git a/resources/views/profile.blade.php b/resources/views/profile.blade.php
@@ -3,24 +3,53 @@
 @section('content')
 <hr>
 <div class="row">
+
     <div class="col-lg-8 col-lg-offset-1" >
+      <hr>
+      <p>Welcome {{\Auth::user()->name}}
+      <br>
+      <a href="{{url('logout')}}">log out</a>
+      <hr>
         <div class="">
             @forelse($levels as $level)
             <h3>{{ $level->name }}, Question Score: {{$level->mark}}</h3>
             <table class="table table-hover">
+                <thead>
+                  <tr>
+                    <th>Question Name</th>
+                    @if(false)
+                    <th>Your Score</th>
+                    @endif
+                    <th>Last Submitted</th>
+                  </tr>
+                </thead>
                 <tbody>
-                    <tr>
                     @foreach($level->questions as $question)
-                        <td><a href="{{url('question', [$question->id])}}">{{$question->name}}</a></td>
+                    <?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>
+                          @endif
+                          <td>{{$sorted[0]}}</td>
+                      </tr>
                     @endforeach
-                    </tr>
                 </tbody>
             </table>
+            <hr>
             @empty
             <h1>Competition Has not yet started</h1>
             @endforelse
         </div>
     </div>
+    @if(false)
     <div class=" col-lg-2 col-lg-offset-0 well">
         <div class="row">
             <center><label style="font-size:21px; color:#19a2e4;">Leaderboard</label></center>
@@ -52,5 +81,6 @@
             </div>
         </div>
     </div>
+  @endif
 </div>
 @stop