fix report

dbarzin · Nov 12, 2024 · 3dd2e88 · 3dd2e88
1 parent 5e5cca8
commit 3dd2e88
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
@@ -473,20 +473,20 @@ private function generateActionPlanTable(
         $actions =
             DB::table('actions')
                 ->select([
-                    'id',
-                    'reference',
-                    'type',
-                    'scope',
-                    'name',
-                    'cause',
-                    'remediation',
-                    'due_date',
+                    'actions.id',
+                    'actions.reference',
+                    'actions.type',
+                    'actions.scope',
+                    'actions.name',
+                    'actions.cause',
+                    'actions.remediation',
+                    'actions.due_date',
                 ])
                 ->where('status',0);
         // filter on framework
         if ($framework !== null) {
             $actions = $actions
-                ->join('action_measure', 'actions.id', '=', 'action_measure.measure_id')
+                ->join('action_measure', 'actions.id', '=', 'action_measure.action_id')
                 ->join('measures', 'measures.id', '=', 'action_measure.measure_id')
                 ->join('domains', 'domains.id', '=', 'measures.domain_id')
                 ->where('domains.framework', '=', $framework);