Merge pull request #296 from dbarzin/dev

Dev

Author: dbarzin

app/Http/Controllers/ControlController.php

@@ -50,7 +50,7 @@ public function index(Request $request)
         $attributes = array_unique($attributes);
         */
         // get all clauses
-        $clauses = DB::table('measures')->select('clause')->get()->pluck("clause")->toArray();
+        $clauses = DB::table('measures')->select('clause')->get()->pluck('clause')->toArray();
 
         // get domain base on his title
         $domain_title = $request->get('domain_title');
@@ -104,7 +104,7 @@ public function index(Request $request)
         if ($clause !== null) {
             if ($clause === 'none') {
                 $request->session()->forget('clause');
-                $clause=null;
+                $clause = null;
             } else {
                 $request->session()->put('clause', $clause);
             }
@@ -126,6 +126,7 @@ public function index(Request $request)
         }
 
         // Attribute filter
+        /*
         $attribute = $request->get('attribute');
         if ($attribute !== null) {
             if ($attribute === 'none') {
@@ -137,6 +138,7 @@ public function index(Request $request)
         } else {
             $attribute = $request->session()->get('attribute');
         }
+        */
 
         // Period filter
         $period = $request->get('period');
@@ -203,7 +205,7 @@ public function index(Request $request)
 
         // Filter on clause
         if ($clause !== null) {
-            $controls = $controls->where('clause','=', $clause);
+            $controls = $controls->where('clause', '=', $clause);
         }
 
         // Filter on scope
@@ -212,13 +214,15 @@ public function index(Request $request)
         }
 
         // filter on measure
+        /*
         if ($request->measure !== null) {
             $controls = $controls->where(
                 'control_measure.measure_id',
                 '=',
                 $request->measure
             );
         }
+        */
 
         // Filter on period
         if ($period !== null && $period !== 99) {

resources/views/measures/index.blade.php

@@ -77,7 +77,7 @@
 					<td>{{ $measure->name }}</td>
 					<td id="{{ $measure->control_count }}">
 						@if ($measure->control_count>0)
-						<a href="/bob/index?period=99&domain=0&scope=none&status=2&measure={{ $measure->id }}">
+                        <a href="/bob/index?period=99&domain=0&scope=none&status=2&clause={{ htmlentities($measure->clause) }}">
 							{{ $measure->control_count }}
 						</a>
 						@else