stub

zalsader · Sep 11, 2015 · 9ee2415 · 9ee2415
1 parent 2859c32
commit 9ee2415
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/app/Http/Controllers/QuestionController.php b/app/Http/Controllers/QuestionController.php
@@ -50,7 +50,7 @@ public function store(Request $request)
      */
     public function show($id)
     {
-        $question = Question::findOrFail($id);
+        $question = Question::activated()->findOrFail($id);
         $observation = $question->observations()
                             ->where('user_id', '=', \Request::user()->id)
                             ->firstOrCreate(['user_id'=>\Request::user()->id]);

diff --git a/app/Question.php b/app/Question.php
@@ -18,4 +18,13 @@ public function submissions() {
     public function observations() {
         return $this->hasMany('\App\QuestionObservation');
     }
+
+    public function scopeActivated($q) {
+        return $q->where('active', '=', true)
+            ->whereExists(function ($query) {
+                $query->select(\DB::raw(1))
+                      ->from('levels')
+                      ->whereRaw('levels.id = questions.level_id');
+            });
+    }
 }
diff --git a/app/User.php b/app/User.php
@@ -29,7 +29,7 @@ class User extends Model implements AuthenticatableContract,
      * @var array
      */
     protected $fillable = ['name', 'email', 'password'];
-
+    
     /**
      * The attributes excluded from the model's JSON form.
      *

diff --git a/config/app.php b/config/app.php
@@ -39,7 +39,7 @@
     |
     */
 
-    'timezone' => 'UTC',
+    'timezone' => 'UTC+3',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/database/migrations/2015_09_01_124506_create_questions_table.php b/database/migrations/2015_09_01_124506_create_questions_table.php
@@ -23,6 +23,7 @@ public function up()
             $table->text('hint_text')->nullable();
             $table->string('hint_image')->nullable();
             $table->double('hint_penalty', 15, 8)->nullable();
+            $table->boolean('active')->default(1);
             $table->timestamps();
         });
     }

diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php
@@ -14,16 +14,18 @@
         <div class="row">
         <div class="col-md-2" style="margin-left:40px">
             <div  style="margin-top:20px">
-                <a href="https://www.facebook.com/ieeenajah"><img src="{{asset('images/SBLogo.png')}}" width="100px" class=""></a>
+                <a href="https://www.facebook.com/ieeenajah"><img src="{{url('images/SBLogo.png')}}" width="100px" class=""></a>
             </div>
             <div style="margin-top:20px">
-                <a href="https://www.facebook.com/ieeenajah"><img src="{{asset('images/cs.jpg')}}" width="100px"></a>
+                <a href="https://www.facebook.com/ieeenajah"><img src="{{url('images/cs.jpg')}}" width="100px"></a>
             </div>
         </div>
         <div class="col-md-2 col-md-offset-2">
-            <a href="{{url('/')}}"><img src="{{asset('images/TLAP.jpg')}}" width="350px"></a>
+            <a href="{{url('/')}}"><img src="{{url('images/TLAP.jpg')}}" width="350px"></a>
         </div>
         <div class="col-md-2 col-md-offset-3">
+            <br>
+            <br>
             <h4>Welcome {{\Auth::user()->name}}!</h4>
             <a href="{{url('logout')}}" class="btn btn-danger">log out</a>
         </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ class User extends Model implements AuthenticatableContract, @@
          * @var array
          */
         protected $fillable = ['name', 'email', 'password'];
         /**
          * The attributes excluded from the model's JSON form.
          *
@@ Expand Down @@