Merge pull request #468 from dbarzin/dev

fix audit log

Author: dbarzin

app/Http/Controllers/AuditLogsController.php

@@ -55,7 +55,7 @@ public function show(int $id)
         return view('logs.show', compact('auditLog'));
     }
 
-    public function history(int $id)
+    public function history(string $type, int $id)
     {
         // Only for admin and users
         abort_if(
@@ -64,10 +64,17 @@ public function history(int $id)
             '403 Forbidden'
         );
 
-        // Get audit Log
-        $auditLog = AuditLog::find($id);
-
-        abort_if($auditLog === null, 400, '400 log not found');
+        // Set the object type
+        if ($type=='bob')
+            $type = 'App\Models\Control';
+        elseif ($type='alice')
+            $type = 'App\Models\Measure';
+        elseif ($type='action')
+            $type = 'App\Models\Action';
+        elseif ($type='user')
+            $type = 'App\Models\User';
+        else
+            abort(404, 'Not found');
 
         // Get the list
         $auditLogs =
@@ -84,8 +91,8 @@ public function history(int $id)
                     'audit_logs.created_at'
                 )
                 ->join('users', 'users.id', '=', 'user_id')
-                ->where('subject_id', $auditLog->subject_id)
-                ->where('subject_type', $auditLog->subject_type)
+                ->where('subject_id', $id)
+                ->where('subject_type', $type)
                 ->orderBy('audit_logs.id')
                 ->get();
 

resources/views/actions/index.blade.php

@@ -132,10 +132,18 @@
                 {{ $action->status }}
                 @endif
             </td>
-            <td>
-                @if ($action->progress!==null)
-                {{ $action->progress }} %
+            <td width="40">
+                <div data-role="donut" data-value="{{ $action->progress }}"
+                {{ $action->progress }}
+                @if ($action->progress<25)
+                    class="donut-red"
+                @elseif ($action->progress<50)
+                    class="donut-orange"
+                @else
+                    class="donut-green"
                 @endif
+                    >
+                </div>
             </td>
             <td >
                 <b>{{ $action->name }}</b>

resources/views/controls/show.blade.php

@@ -294,7 +294,7 @@
 	    		</button>
 			</form>
 		    &nbsp;
-			<a class="button" href="/logs/history/{{ $control->id }}">
+			<a class="button" href="/logs/history/bob/{{ $control->id }}">
                 <span class="mif-log-file"></span>
                 &nbsp;
 				{{ trans("common.history") }}

resources/views/logs/index.blade.php

@@ -91,7 +91,17 @@ class="table striped row-hover cell-border"
                         <a class="button success small" href="/logs/show/{{ $log->id }}">
                             {{ trans('common.show') }}
                         </a>
-                        <a class="button info small" href="/logs/history/{{ $log->id }}">
+                        <a class="button info small"
+                        @if ($log->subject_type=='App\\Models\\Measure')
+                            href="/logs/history/alice/{{ $log->subject_id }}"
+                        @elseif ($log->subject_type=='App\\Models\\Control')
+                            href="/logs/history/bob/{{ $log->subject_id }}"
+                        @elseif ($log->subject_type=='App\\Models\\Action')
+                            href="/logs/history/action/{{ $log->subject_id }}"
+                        @elseif ($log->subject_type=='App\\Models\\User')
+                            href="/logs/history/user/{{ $log->subject_id }}"
+                        @endif
+                        >
                             {{ trans('common.history') }}
                         </a>
                     </td>

resources/views/radar/actions.blade.php

@@ -54,15 +54,6 @@
                         <table
                             id="controls"
                             class="table striped row-hover cell-border"
-                            data-role="table"
-                            data-rows="100"
-                            data-show-activity="true"
-                            data-rownum="false"
-                            data-check="false"
-                            data-check-style="1"
-                            data-show-search="false"
-                            data-show-pagination="false"
-                            data-show-rows-steps="false"
                             >
                             <thead>
                                 <tr>
@@ -78,10 +69,8 @@ class="table striped row-hover cell-border"
                             <td>{{ $action->reference }}</td>
                             <td>{{ $action->scope }}</td>
                             <td>{{ $action->name }}</td>
-                            <td>
-                                <div data-role="donut" data-value="{{ $action->progress }}" class="donut-red"
-                                    data-stroke="#f5f5f5" data-fill="#9C27B0" data-color="#FFFFFF">
-                                </div>
+                            <td style="padding: 0; text-align: center; vertical-align: middle;" width=400 height=110>
+                                <canvas id="progressChart1" width="400" height="100"></canvas>
                             </td>
                         </tr>
                         @endforeach
@@ -92,6 +81,7 @@ class="table striped row-hover cell-border"
             </div>
         </div>
     </div>
+
 </form>
 
 <script>
@@ -119,7 +109,6 @@ class="table striped row-hover cell-border"
         ]
     };
 
-
     const ctx = document.getElementById('actionsChart').getContext('2d');
     const myChart = new Chart(ctx, {
         type: 'bar',
@@ -162,6 +151,48 @@ class="table striped row-hover cell-border"
         });
     });
 
+
+    new Chart(document.getElementById("progressChart1"), {
+        type: 'line',
+        data: {
+            datasets: [{
+                label: 'Progression',
+                data: [
+                    { x: '2025-07-01', y: 10 },
+                    { x: '2025-07-10', y: 35 },
+                    { x: '2025-07-15', y: 50 },
+                    { x: '2025-07-25', y: 80 },
+                    { x: '2025-07-29', y: 100 }
+                ],
+                borderColor: "#2196F3",
+                backgroundColor: "transparent",
+                borderWidth: 2,
+                pointRadius: 3
+            }]
+        },
+        options: {
+            responsive: false,
+            scales: {
+                x: {
+                    type: 'time',
+                    display: false // ⛔️ masque les dates
+                },
+
+                y: {
+                    beginAtZero: true,
+                    max: 100,
+                    display: false
+                }
+            },
+            plugins: {
+                legend: { display: false },
+               datalabels: {
+                    display: false // 👈 Désactive les labels à côté des points
+                },
+            }
+        }
+    });
+
 });
 </script>
 

routes/web.php

@@ -124,7 +124,7 @@
     // Audit Logs
     Route::get('/logs', 'AuditLogsController@index');
     Route::get('/logs/show/{id}', 'AuditLogsController@show');
-    Route::get('/logs/history/{id}', 'AuditLogsController@history');
+    Route::get('/logs/history/{type}/{id}', 'AuditLogsController@history');
 
     /* Exports */
     Route::get('/export/domains', 'DomainController@export');