work on scope

dbarzin · Aug 23, 2023 · dc14013 · dc14013
1 parent 0204a46
commit dc14013
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/Http/Controllers/ControlController.php b/app/Http/Controllers/ControlController.php
@@ -145,6 +145,12 @@ public function index(Request $request)
             $controls = $controls->where('c1.scope', '=', $scope);
         }
 
+        // filter on measure
+        if ($request->measure!=null) {
+            $controls = $controls
+                ->where('c1.measure_id','=',$request->measure);
+        }
+
         // Filter on period
         if (($period !== null) && ($period !== 99)) {
             $controls = $controls

diff --git a/resources/views/measures/index.blade.php b/resources/views/measures/index.blade.php
@@ -74,7 +74,15 @@
 						</a>
 					</td>
 					<td>{{ $measure->name }}</td>
-					<td>{{ $measure->control_count }}</td>
+					<td>
+						@if ($measure->control_count>0)
+						<a href="/controls?period=99&domain=0&scope=none&status=2&measure={{ $measure->id }}"> 
+							{{ $measure->control_count }}
+						</a>
+						@else
+						0
+						@endif
+					</td>
 					<td>
 					    <form action="/measure/plan/{{ $measure->id }}">
 					    	<button class="button info">