report on active domains only

dbarzin · Sep 13, 2023 · 52ae9aa · 52ae9aa
1 parent e596db8
commit 52ae9aa
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/app/Http/Controllers/ControlController.php b/app/Http/Controllers/ControlController.php
@@ -376,6 +376,7 @@ public function domains(Request $request)
             ->select(DB::raw('distinct domains.id, domains.title'))
             ->join('controls', 'domains.id', '=', 'controls.domain_id')
             ->whereNull("realisation_date")
+            ->orderBy("domains.title")
             ->get();
 
         // get all scopes
@@ -443,8 +444,13 @@ public function domains(Request $request)
 
     public function measures(Request $request)
     {
-        // Get all domains
-        $domains = Domain::All();
+        // get all active domains
+        $domains = DB::table('domains')
+            ->select(DB::raw('distinct domains.id, domains.title, domains.description'))
+            ->join('controls', 'domains.id', '=', 'controls.domain_id')
+            ->whereNull("realisation_date")
+            ->orderBy("domains.title")
+            ->get();
 
         // get all scopes
         $scopes = DB::table('controls')