fix filter

Author: dbarzin

app/Http/Controllers/ControlController.php

@@ -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');
@@ -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