Merge pull request #196 from dbarzin/dev

Dev
dbarzin · Oct 18, 2024 · cd4f5c5 · cd4f5c5
2 parents 7c6829c + 1e3332a
commit cd4f5c5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/app/Http/Controllers/MeasureController.php b/app/Http/Controllers/MeasureController.php
@@ -61,7 +61,7 @@ public function index(Request $request)
                     ->whereIn('controls.status', [0,1])
                     ->orWhere('controls.status', null);
             })
-            ->groupBy('measures.id');
+            ->groupBy('measures.id','domains.title');
 
         if ($domain !== null) {
             $measures->where('measures.domain_id', $domain);

diff --git a/storage/app/models/control_en.docx b/storage/app/models/control_en.docx
diff --git a/storage/app/models/pilotage_en.docx b/storage/app/models/pilotage_en.docx