From 8765d0c956d8313818f67c5b6c1773cc498983a1 Mon Sep 17 00:00:00 2001
From: didier <dbarzin@gmail.com>
Date: Tue, 4 Feb 2025 11:27:33 +0100
Subject: [PATCH 1/5] improve menu behaviour

---
 resources/views/layout.blade.php | 106 ++++++++++++++++++++-----------
 1 file changed, 70 insertions(+), 36 deletions(-)

diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index 94f6254..00a7ddf 100644
--- a/resources/views/layout.blade.php
+++ b/resources/views/layout.blade.php
@@ -44,7 +44,12 @@
                     </a>
                 </li>
 
-                <li>
+                <li class="{{
+                        request()->is('alice/index') ||
+                        request()->is('alice/show/*') ||
+                        request()->is('alice/*/edit') ||
+                        request()->is('alice/plan/*')
+                        ? 'bg-gray': '' }}">
                     <a href="/alice/index">
                         <span class="icon"><span class="mif-books"></span></span>
                         <span class="caption">{{ trans("menu.measures") }}</span>
@@ -52,7 +57,13 @@
                 </li>
 
 
-                <li>
+                <li class="{{
+                    request()->is('bob/index') ||
+                    request()->is('bob/show/*') ||
+                    request()->is('bob/edit/*') ||
+                    request()->is('bob/plan/*') ||
+                    request()->is('bob/make/*')
+                    ? 'bg-gray': '' }}">
                     <a href="/bob/index">
                         <span class="icon"><span class="mif-paste"></span></span>
                         <span class="caption">{{ trans("menu.controls") }}</span>
@@ -67,14 +78,14 @@
                     </a>
                 </li>
 
-                <li>
+                <li class="{{ request()->is('bob/history*') ? 'bg-gray': '' }}">
                     <a href="/bob/history">
                         <span class="icon"><span class="mif-calendar"></span></span>
                         <span class="caption">{{ trans("menu.planning") }}</span>
                     </a>
                 </li>
 
-                <li>
+                <li class="{{ request()->is('action*') ? 'bg-gray': '' }}">
                     <a href="/actions">
                         <span class="icon"><span class="mif-open-book"></span></span>
                         <span class="caption">{{ trans("menu.action_plan") }}</span>
@@ -86,62 +97,85 @@
                         <span class="icon"><span class="mif-meter"></span></span>
                         <span class="caption">{{ trans("menu.radar") }}</span>
                     </a>
-                    <ul class="navview-menu stay-open" data-role="dropdown" >
-                        <li><a href="/radar/domains">
+                    <ul class="navview-menu stay-open {{ request()->is('radar*') ? 'open' : '' }}" data-role="dropdown" >
+                        <li class="{{ request()->is('radar/domains') ? 'bg-gray': '' }}">
+                            <a href="/radar/domains">
                             <span class="caption">{{ trans("menu.radar_by_domains") }}</span>
-                        </a></li>
-                        <li><a href="/radar/alice">
+                            </a>
+                        </li>
+                        <li class="{{ request()->is('radar/alice') ? 'bg-gray': '' }}">
+                            <a href="/radar/alice">
                             <span class="caption">{{ trans("menu.radar_by_controls") }}</span>
-                        </a></li>
-                        <li><a href="/radar/attributes">
+                            </a>
+                        </li>
+                        <li class="{{ request()->is('radar/attributes') ? 'bg-gray': '' }}">
+                            <a href="/radar/attributes">
                             <span class="caption">{{ trans("menu.radar_by_attributes") }}</span>
                         </a></li>
                     </ul>
                 </li>
 
-                <li><a href="/reports">
-                    <span class="icon"><span class="mif-file-text"></span></span>
-                    <span class="caption">{{ trans("menu.configuration.reports") }}</span>
-                </a></li>
+                <li class="{{ request()->is('reports') ? 'bg-gray': '' }}">
+                    <a href="/reports">
+                        <span class="icon"><span class="mif-file-text"></span></span>
+                        <span class="caption">{{ trans("menu.configuration.reports") }}</span>
+                    </a>
+                </li>
 
                 <li>
                     <a href="#" class="dropdown-toggle">
                         <span class="icon"><span class="mif-cog"></span></span>
                         <span class="caption">{{ trans("menu.configuration.title") }}</span>
                     </a>
-                    <ul class="navview-menu stay-open" data-role="dropdown" >
-
-                    <li>
+                    <ul class="navview-menu stay-open
+                        {{  (
+                            request()->is('attributes*') ||
+                            request()->is('domains*') ||
+                            request()->is('users*') ||
+                            request()->is('alice/import*') ||
+                            request()->is('doc*') ||
+                            request()->is('config*')
+                            )
+                            ? 'open' : '' }}" data-role="dropdown" >
+                    <li class="{{ request()->is('attributes*') ? 'bg-gray': '' }}">
                         <a href="/attributes">
                             <span class="icon"><span class="mif-tags"></span></span>
                             <span class="caption">{{ trans("menu.attributes") }}</span>
                         </a>
                     </li>
 
-                    <li>
+                    <li class="{{ request()->is('domains*') ? 'bg-gray': '' }}">
                         <a href="/domains">
                             <span class="icon"><span class="mif-books"></span></span>
                             <span class="caption">{{ trans("menu.domains") }}</span>
                         </a>
                     </li>
-                        @if (Auth::User()->role==1)
-                        <li><a href="/users">
-                            <span class="icon"><span class="mif-users"></span></span>
-                            <span class="caption">{{ trans("menu.configuration.users") }}</span>
-                        </a></li>
-                        <li><a href="/alice/import">
-                            <span class="icon"><span class="mif-file-excel"></span></span>
-                            <span class="caption">{{ trans("menu.configuration.import") }}</span>
-                        </a></li>
-                        <li><a href="/doc">
-                            <span class="icon"><span class="mif-file-text"></span></span>
-                            <span class="caption">{{ trans("menu.configuration.documents") }}</span>
-                        </a></li>
-                        <li><a href="/config">
-                            <span class="icon"><span class="mif-alarm"></span></span>
-                            <span class="caption">{{ trans("menu.configuration.notifications") }}</span>
-                        </a></li>
-                        @endif
+                    @if (Auth::User()->role==1)
+                    <li class="{{ request()->is('users*') ? 'bg-gray': '' }}">
+                        <a href="/users">
+                        <span class="icon"><span class="mif-users"></span></span>
+                        <span class="caption">{{ trans("menu.configuration.users") }}</span>
+                        </a>
+                    </li>
+                    <li class="{{ request()->is('alice/import*') ? 'bg-gray': '' }}">
+                        <a href="/alice/import">
+                        <span class="icon"><span class="mif-file-excel"></span></span>
+                        <span class="caption">{{ trans("menu.configuration.import") }}</span>
+                        </a>
+                    </li>
+                    <li class="{{ request()->is('doc*') ? 'bg-gray': '' }}">
+                        <a href="/doc">
+                        <span class="icon"><span class="mif-file-text"></span></span>
+                        <span class="caption">{{ trans("menu.configuration.documents") }}</span>
+                        </a>
+                    </li>
+                    <li class="{{ request()->is('config*') ? 'bg-gray': '' }}">
+                        <a href="/config">
+                        <span class="icon"><span class="mif-alarm"></span></span>
+                        <span class="caption">{{ trans("menu.configuration.notifications") }}</span>
+                        </a>
+                    </li>
+                    @endif
                     </ul>
                 </li>
                 @endif

From 69964d875a5ee75a55665d8e1ba20adbc9265546 Mon Sep 17 00:00:00 2001
From: didier <dbarzin@gmail.com>
Date: Wed, 5 Feb 2025 15:26:07 +0100
Subject: [PATCH 2/5] work on logs

---
 app/Http/Controllers/AuditLogsController.php  | 102 ++++++++++++++++++
 app/Models/Action.php                         |   3 +
 app/Models/AuditLog.php                       |  49 +++++++++
 app/Models/Control.php                        |   3 +
 app/Models/Measure.php                        |   4 +
 app/Models/User.php                           |   4 +-
 app/Traits/Auditable.php                      |  36 +++++++
 ...5_02_04_064646_create_audit_logs_table.php |  36 +++++++
 .../migrations/2025_02_05_121035_cleanup.php  |  28 +++++
 resources/lang/en/common.php                  |   2 +
 resources/lang/en/cruds.php                   |  12 +++
 resources/lang/fr/common.php                  |   2 +
 resources/lang/fr/cruds.php                   |  12 +++
 resources/views/layout.blade.php              |   7 ++
 resources/views/users/index.blade.php         |  24 ++---
 routes/web.php                                |   5 +
 16 files changed, 314 insertions(+), 15 deletions(-)
 create mode 100644 app/Http/Controllers/AuditLogsController.php
 create mode 100644 app/Models/AuditLog.php
 create mode 100644 app/Traits/Auditable.php
 create mode 100644 database/migrations/2025_02_04_064646_create_audit_logs_table.php
 create mode 100644 database/migrations/2025_02_05_121035_cleanup.php

diff --git a/app/Http/Controllers/AuditLogsController.php b/app/Http/Controllers/AuditLogsController.php
new file mode 100644
index 0000000..530743a
--- /dev/null
+++ b/app/Http/Controllers/AuditLogsController.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\AuditLog;
+use App\Http\Controllers\Controller;
+use Gate;
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
+
+class AuditLogsController extends Controller
+{
+    public function index(Request $request)
+    {
+        // Only for admin and users
+        abort_if(
+            (Auth::User()->role !== 1) && (Auth::User()->role !== 2),
+            Response::HTTP_FORBIDDEN,
+            '403 Forbidden'
+        );
+
+        $logs = DB::table('audit_logs')
+            ->select(
+                'audit_logs.id',
+                'description',
+                'subject_type',
+                'subject_id',
+                'users.name',
+                'user_id',
+                'host',
+                'audit_logs.created_at'
+            )
+            ->join('users', 'users.id', '=', 'user_id')
+            ->orderBy('audit_logs.id', 'desc')->paginate(100);
+
+        return view('logs.index', ['logs' => $logs]);
+    }
+
+    public function show(int $id)
+    {
+        // Only for admin and users
+        abort_if(
+            (Auth::User()->role !== 1) && (Auth::User()->role !== 2),
+            Response::HTTP_FORBIDDEN,
+            '403 Forbidden'
+        );
+
+        // Get audit Log
+        $auditLog = AuditLog::find($id);
+
+        // Control not found
+        abort_if($auditLog === null, Response::HTTP_NOT_FOUND, '404 Not Found');
+
+        return view('logs.show', compact('auditLog'));
+    }
+
+    public function history(int $id)
+    {
+        // Only for admin and users
+        abort_if(
+            (Auth::User()->role !== 1) && (Auth::User()->role !== 2),
+            Response::HTTP_FORBIDDEN,
+            '403 Forbidden'
+        );
+
+        // Get audit Log
+        $auditLog = AuditLog::find($id);
+
+        abort_if($auditLog === null, 400, '400 log not found');
+
+        // Get the list
+        $auditLogs =
+            DB::table('audit_logs')
+                ->select(
+                    'audit_logs.id',
+                    'description',
+                    'subject_type',
+                    'subject_id',
+                    'users.name',
+                    'user_id',
+                    'host',
+                    'properties',
+                    'audit_logs.created_at'
+                )
+                ->join('users', 'users.id', '=', 'user_id')
+                ->where('subject_id', $auditLog->subject_id)
+                ->where('subject_type', $auditLog->subject_type)
+                ->orderBy('audit_logs.id')
+                ->get();
+
+        abort_if($auditLogs->isEmpty(), 404, 'Not found');
+
+        // JSON decode all properties
+        foreach ($auditLogs as $auditLog) {
+            $auditLog->properties = json_decode(trim(stripslashes($auditLog->properties), '"'));
+        }
+
+        return view('logs.history', compact('auditLogs'));
+    }
+}
diff --git a/app/Models/Action.php b/app/Models/Action.php
index de4d4db..fac9873 100644
--- a/app/Models/Action.php
+++ b/app/Models/Action.php
@@ -2,10 +2,13 @@
 
 namespace App\Models;
 
+use App\Traits\Auditable;
 use Illuminate\Database\Eloquent\Model;
 
 class Action extends Model
 {
+    use Auditable;
+
     public static $searchable = [
         'reference',
         'type',
diff --git a/app/Models/AuditLog.php b/app/Models/AuditLog.php
new file mode 100644
index 0000000..799b3ba
--- /dev/null
+++ b/app/Models/AuditLog.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Models;
+
+use DateTimeInterface;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
+
+/**
+ * App\AuditLog
+ */
+class AuditLog extends Model
+{
+    public $table = 'audit_logs';
+
+    protected $fillable = [
+        'description',
+        'subject_id',
+        'subject_type',
+        'user_id',
+        'properties',
+        'host',
+    ];
+
+    protected $casts = [
+        'properties' => 'collection',
+    ];
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
+    public function subjectURL()
+    {
+        // Trouver la dernière occurrence de "\"
+        $position = strrpos($this->subject_type, "\\");
+
+        // Extraire ce qui suit si "\" est trouvé
+        $resultat = ($position !== false) ? substr($this->subject_type, $position + 1) : $this->subject_type;
+
+        return $resultat;
+    }
+
+    protected function serializeDate(DateTimeInterface $date)
+    {
+        return $date->format('Y-m-d H:i:s');
+    }
+}
diff --git a/app/Models/Control.php b/app/Models/Control.php
index a63f94d..a0cf660 100644
--- a/app/Models/Control.php
+++ b/app/Models/Control.php
@@ -2,10 +2,13 @@
 
 namespace App\Models;
 
+use App\Traits\Auditable;
 use Illuminate\Database\Eloquent\Model;
 
 class Control extends Model
 {
+    use Auditable;
+
     public static $searchable = [
         'name',
         'objective',
diff --git a/app/Models/Measure.php b/app/Models/Measure.php
index e319731..edd8637 100644
--- a/app/Models/Measure.php
+++ b/app/Models/Measure.php
@@ -2,11 +2,15 @@
 
 namespace App\Models;
 
+use App\Traits\Auditable;
+
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\DB;
 
 class Measure extends Model
 {
+    use Auditable;
+
     public static $searchable = [
         'name',
         'clause',
diff --git a/app/Models/User.php b/app/Models/User.php
index 524a995..9583abb 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -2,6 +2,8 @@
 
 namespace App\Models;
 
+use App\Traits\Auditable;
+
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
@@ -9,7 +11,7 @@
 
 class User extends Authenticatable
 {
-    use HasApiTokens, HasFactory, Notifiable;
+    use HasApiTokens, HasFactory, Notifiable, Auditable;
 
     /**
      * The attributes that are mass assignable.
diff --git a/app/Traits/Auditable.php b/app/Traits/Auditable.php
new file mode 100644
index 0000000..3b64f7e
--- /dev/null
+++ b/app/Traits/Auditable.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Traits;
+
+use App\Models\AuditLog;
+use Illuminate\Database\Eloquent\Model;
+
+trait Auditable
+{
+    public static function bootAuditable()
+    {
+        static::created(function (Model $model) {
+            static::audit('created', $model);
+        });
+
+        static::updated(function (Model $model) {
+            static::audit('updated', $model);
+        });
+
+        static::deleted(function (Model $model) {
+            static::audit('deleted', $model);
+        });
+    }
+
+    protected static function audit($description, $model)
+    {
+        AuditLog::create([
+            'description' => $description,
+            'subject_id' => $model->id ?? null,
+            'subject_type' => $model::class ?? null,
+            'user_id' => auth()->id() ?? null,
+            'properties' => substr($model, 0, 65534) ?? null,
+            'host' => request()->ip() ?? null,
+        ]);
+    }
+}
diff --git a/database/migrations/2025_02_04_064646_create_audit_logs_table.php b/database/migrations/2025_02_04_064646_create_audit_logs_table.php
new file mode 100644
index 0000000..f028da1
--- /dev/null
+++ b/database/migrations/2025_02_04_064646_create_audit_logs_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up()
+    {
+        Schema::create('audit_logs', function (Blueprint $table) {
+            $table->increments('id');
+            $table->text('description');
+            $table->unsignedInteger('subject_id')->nullable();
+            $table->string('subject_type')->nullable();
+            $table->unsignedInteger('user_id')->nullable();
+            $table->text('properties')->nullable();
+            $table->string('host', 45)->nullable();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('audit_logs');
+    }
+
+};
diff --git a/database/migrations/2025_02_05_121035_cleanup.php b/database/migrations/2025_02_05_121035_cleanup.php
new file mode 100644
index 0000000..4684f63
--- /dev/null
+++ b/database/migrations/2025_02_05_121035_cleanup.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('controls', function (Blueprint $table) {
+            $table->dropColumn("site");
+            });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('controls', function (Blueprint $table) {
+            $table->string('site')->nullable();
+            });
+    }
+};
diff --git a/resources/lang/en/common.php b/resources/lang/en/common.php
index e7fbb8c..c4159b0 100644
--- a/resources/lang/en/common.php
+++ b/resources/lang/en/common.php
@@ -11,12 +11,14 @@
     'delete' => 'Delete',
     'download' => 'Download',
     'edit' => 'Edit',
+    'history' => 'History',
     'import' => 'Import',
     'make' => 'Make',
     'new' => 'New',
     'plan' => 'Plan',
     'reject' => 'Reject',
     'save' => 'Save',
+    'show' => 'Show',
     'test' => 'Test',
     'unplan' => 'Unplan',
     'validate' => 'Validate',
diff --git a/resources/lang/en/cruds.php b/resources/lang/en/cruds.php
index 434a9c4..6788c79 100644
--- a/resources/lang/en/cruds.php
+++ b/resources/lang/en/cruds.php
@@ -187,6 +187,18 @@
          'index' => 'Import',
          'title' => 'Import security measures',
      ],
+    'log' => [
+        'index' => 'List of logs',
+        'title' => 'Log',
+        'history' => 'Change history',
+        'action' => 'Action',
+        'subject_type' => 'Type',
+        'subject_id' => 'ID',
+        'user' => 'User',
+        'host' => 'Host',
+        'timestamp' => 'Timestamp',
+        'properties' => 'Data'
+    ],
      'login' => [
          'title' => 'Enter a password',
          'identification' => 'Login',
diff --git a/resources/lang/fr/common.php b/resources/lang/fr/common.php
index de1be18..5c3917c 100644
--- a/resources/lang/fr/common.php
+++ b/resources/lang/fr/common.php
@@ -11,12 +11,14 @@
     'delete' => 'Supprimer',
     'download' => 'Télécharger',
     'edit' => 'Modifier',
+    'history' => 'Historique',
     'import' => 'Importer',
     'make' => 'Faire',
     'new' => 'Nouveau',
     'plan' => 'Planifier',
     'reject' => "Rejeter",
     'save' => 'Sauver',
+    'show' => 'Voir',
     'unplan' => 'Déplanifier',
     'validate' => 'Valider',
 
diff --git a/resources/lang/fr/cruds.php b/resources/lang/fr/cruds.php
index 8db48af..c65f2c1 100644
--- a/resources/lang/fr/cruds.php
+++ b/resources/lang/fr/cruds.php
@@ -185,6 +185,18 @@
          'index' => 'Importer',
          'title' => 'Importer des mesures de sécurité',
     ],
+    'log' => [
+        'index' => 'Liste des logs',
+        'title' => 'Log',
+        'history' => 'Historique des changements',
+        'action' => 'Action',
+        'subject_type' => 'Type',
+        'subject_id' => 'ID',
+        'user' => 'Utilisateur',
+        'host' => 'Host',
+        'timestamp' => 'Horodatage',
+        'properties' => 'Données'
+    ],
     'login' => [
         'title' => 'Entrez un mot de passe',
         'identification' => 'Identification',
diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
index 00a7ddf..d365aad 100644
--- a/resources/views/layout.blade.php
+++ b/resources/views/layout.blade.php
@@ -134,6 +134,7 @@
                             request()->is('users*') ||
                             request()->is('alice/import*') ||
                             request()->is('doc*') ||
+                            request()->is('logs*') ||
                             request()->is('config*')
                             )
                             ? 'open' : '' }}" data-role="dropdown" >
@@ -175,6 +176,12 @@
                         <span class="caption">{{ trans("menu.configuration.notifications") }}</span>
                         </a>
                     </li>
+                    <li class="{{ request()->is('logs*') ? 'bg-gray': '' }}">
+                        <a href="/logs">
+                        <span class="icon"><span class="mif-log-file"></span></span>
+                        <span class="caption">Logs</span>
+                        </a>
+                    </li>
                     @endif
                     </ul>
                 </li>
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php
index 7cd3620..3b31e3e 100644
--- a/resources/views/users/index.blade.php
+++ b/resources/views/users/index.blade.php
@@ -11,13 +11,11 @@
 
 				<div class="cell-7" align="right">
 					@if (Auth::User()->role==1)
-					<form action="/users/create">
-						<button class="button primary" onclick="location.href = '/users/create';">
-				            <span class="mif-plus"></span>
-				            &nbsp;
-							{{ trans('common.new') }}
-						</button>
-					</form>
+                    <a class="button primary" href="/users/create">
+			            <span class="mif-plus"></span>
+			            &nbsp;
+						{{ trans('common.new') }}
+                    </a>
 					@endif
 				</div>
 			</div>
@@ -79,13 +77,11 @@
 					<td>{{ $user->email }}</td>
     				@if (Auth::User()->role==1)
                     <td>
-            		    <form>
-            		    	<button class="button primary" onclick='this.form.action="/users/{{ $user->id }}/edit"'>
-            		            <span class="mif-wrench"></span>
-            		            &nbsp;
-            		    		{{ trans('common.edit') }}
-            		    	</button>
-                        </form>
+                        <a class="button primary" href='/users/{{ $user->id }}/edit'>
+        		            <span class="mif-wrench"></span>
+        		            &nbsp;
+        		    		{{ trans('common.edit') }}
+                        </a>
                     </td>
                     @endif
 				</tr>
diff --git a/routes/web.php b/routes/web.php
index 7274cab..79fffa6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -115,6 +115,11 @@
     Route::get('/reports/pilotage', 'ReportController@pilotage');
     Route::get('/reports/soa', 'ReportController@soa');
 
+    // Audit Logs
+    Route::get('/logs', 'AuditLogsController@index');
+    Route::get('/logs/show/{id}', 'AuditLogsController@show');
+    Route::get('/logs/history/{id}', 'AuditLogsController@history');
+
     /* Exports */
     Route::get('/export/domains', 'DomainController@export');
     Route::get('/export/attributes', 'AttributeController@export');

From 70d9a2fa422cd70a707baa5ddd84c4d0d2a7fd36 Mon Sep 17 00:00:00 2001
From: didier <dbarzin@gmail.com>
Date: Wed, 5 Feb 2025 15:39:27 +0100
Subject: [PATCH 3/5] fix invalid link

---
 app/Http/Controllers/ControlController.php |  4 ++++
 app/Models/Control.php                     |  5 +++++
 resources/views/controls/index.blade.php   | 10 ++++++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/ControlController.php b/app/Http/Controllers/ControlController.php
index 1a2bc77..f13cd0b 100644
--- a/app/Http/Controllers/ControlController.php
+++ b/app/Http/Controllers/ControlController.php
@@ -255,6 +255,9 @@ public function index(Request $request)
             );
         }
 
+        // get action plan associated
+        $controls = $controls-> leftjoin("actions","actions.control_id","=","c1.id");
+
         // Query DB
         $controls = $controls
             ->select([
@@ -265,6 +268,7 @@ public function index(Request $request)
                 'c1.realisation_date',
                 'c1.score as score',
                 'c1.status',
+                'actions.id as action_id',
                 'c2.id as next_id',
                 'c2.plan_date as next_date',
             ])
diff --git a/app/Models/Control.php b/app/Models/Control.php
index a0cf660..e515970 100644
--- a/app/Models/Control.php
+++ b/app/Models/Control.php
@@ -49,6 +49,11 @@ public function measures()
         return $this->belongsToMany(Measure::class)->orderBy('clause');
     }
 
+    public function actionPlan()
+    {
+        return DB::table('actions')->select('id')->where("control_id",'=',$this->id)->get();
+    }
+
     public function owners()
     {
         return $this->belongsToMany(User::class, 'control_user', 'control_id')->orderBy('name');
diff --git a/resources/views/controls/index.blade.php b/resources/views/controls/index.blade.php
index a403d85..ff85561 100644
--- a/resources/views/controls/index.blade.php
+++ b/resources/views/controls/index.blade.php
@@ -174,19 +174,21 @@
             </td>
             <td>
                 <center id="{{ $control->score }}">
+                    @if ($control->action_id!=null)
+                        <a href="/action/show/{{ $control->action_id }}">
+                    @endif
                     @if ($control->score==1)
-                    <a href="/action/{{ $control->id }}">
                         &#128545;
-                    </a>
                     @elseif ($control->score==2)
-                    <a href="/action/{{ $control->id }}">
                         &#128528;
-                    </a>
                     @elseif ($control->score==3)
                         <span style="filter: sepia(1) saturate(5) hue-rotate(70deg)">&#128512;</span>
                     @else
                         &#9675; <!-- &#9899; -->
                     @endif
+                    @if ($control->action_id!=null)
+                    </a>
+                    @endif
                 </center>
             </td>
             <td>

From 058520555d439b709555f77ec8207d56a3238239 Mon Sep 17 00:00:00 2001
From: didier <dbarzin@gmail.com>
Date: Wed, 5 Feb 2025 16:16:59 +0100
Subject: [PATCH 4/5] work on logs

---
 resources/views/logs/history.blade.php | 132 +++++++++++++++++++++++++
 resources/views/logs/index.blade.php   | 109 ++++++++++++++++++++
 resources/views/logs/show.blade.php    | 104 +++++++++++++++++++
 3 files changed, 345 insertions(+)
 create mode 100644 resources/views/logs/history.blade.php
 create mode 100644 resources/views/logs/index.blade.php
 create mode 100644 resources/views/logs/show.blade.php

diff --git a/resources/views/logs/history.blade.php b/resources/views/logs/history.blade.php
new file mode 100644
index 0000000..5920773
--- /dev/null
+++ b/resources/views/logs/history.blade.php
@@ -0,0 +1,132 @@
+@extends('layout')
+@section('content')
+<div class="p-3 table-responsive">
+    <div class="table-responsive" data-role="panel" data-title-caption="{{ trans('cruds.log.title') }}" data-collapsible="true" data-title-icon="<span class='mif-log-file'></span>">
+
+            <table class="table table-border cell-border">
+                <tbody>
+                    <tr>
+                        <th style="width: 150px;">
+                            {{ trans('cruds.log.subject_id') }}
+                        </th>
+                        <td>
+                            @if ($auditLogs->first()->subject_type=='App\\Models\\Measure')
+                                <a href="/alice/show/{{ $auditLogs->first()->subject_id }} ">
+                                    {{ $auditLogs->first()->subject_id }}
+                                </a>
+                            @elseif ($auditLogs->first()->subject_type=='App\\Models\\Control')
+                                <a href="/bob/show/{{ $auditLogs->first()->subject_id }} ">
+                                    {{ $auditLogs->first()->subject_id }}
+                                </a>
+                            @elseif ($auditLogs->first()->subject_type=='App\\Models\\Action')
+                                <a href="/action/show/{{ $auditLogs->first()->subject_id }} ">
+                                    {{ $auditLogs->first()->subject_id }}
+                                </a>
+                            @elseif ($auditLogs->first()->subject_type=='App\\Models\\User')
+                                <a href="/user/show/{{ $auditLogs->first()->subject_id }} ">
+                                    {{ $auditLogs->first()->subject_id }}
+                                </a>
+                            @else
+                                {{ $auditLogs->first()->subject_id }}
+                            @endif
+                        </td>
+                    </tr>
+                    <tr>
+                        <th>
+                            id
+                        </th>
+                        @foreach($auditLogs as $auditLog)
+                        <td>
+                        <a href="/logs/show/{{ $auditLog->id }}">
+                            {{ $auditLog->id }}
+                        </a>
+                        </td>
+                        @endforeach
+                    </tr>
+                    <tr>
+                        <th>
+                            {{ trans('cruds.log.action') }}
+                        </th>
+                        @foreach($auditLogs as $auditLog)
+                        <td>
+                        {{ $auditLog->description }}
+                        </td>
+                        @endforeach
+                    </tr>
+                    <tr>
+                        <th>
+                            {{ trans('cruds.log.user') }}
+                        </th>
+                        @foreach($auditLogs as $auditLog)
+                        <td>
+                        <a href="/user/{{ $auditLog->user_id }}">
+                            {{ $auditLog->name }}
+                        </a>
+                        </td>
+                        @endforeach
+                    </tr>
+                    @foreach($auditLog->properties as $key => $value)
+                    <tr>
+                            <th>[{{ $key }}]</th>
+                            @php $previous = null; @endphp
+                            @foreach($auditLogs as $auditLog2)
+                                @php
+                                    if (property_exists($auditLog2->properties,$key))
+                                        $value = $auditLog2->properties->{$key};
+                                    else
+                                        $value = null;
+                                @endphp
+                            <td {!! (($loop->first)||($value==$previous)) ? "" : "class='info'" !!}>
+                                @if ((gettype($value)=="string")&&(strlen($value)>100))
+                                {{ substr($value,0,100) }}
+                                @elseif ((gettype($value)=="array"))
+                                @foreach($value as $v)
+                                {{ $v->name }}
+                                @endforeach
+                                @else
+                                {{ $value }}
+                                @endif
+                            </td>
+                                @php $previous = $value; @endphp
+                            @endforeach
+                    </tr>
+                    @endforeach
+                    <tr>
+                        <th>
+                            {{ trans('cruds.log.host') }}
+                        </th>
+                        @foreach($auditLogs as $auditLog)
+                        <td>
+                            {{ $auditLog->host }}
+                        </td>
+                        @endforeach
+                    </tr>
+                    <tr>
+                        <th>
+                            {{ trans('cruds.log.timestamp') }}
+                        </th>
+                        @foreach($auditLogs as $auditLog)
+                        <td>
+                            {{ $auditLog->created_at }}
+                        </td>
+                        @endforeach
+                    </tr>
+                </tbody>
+            </table>
+        <div>
+            <br>
+            <a class="button btn-default" href="/logs">
+            {{ trans('common.cancel') }}
+            </a>
+        </div>
+    </div>
+</div>
+@endsection
+@section('style')
+    <style>
+        /* Style to enable horizontal scroll */
+        .table-responsive {
+            overflow-x: auto;
+        }
+    </style>
+@endsection
diff --git a/resources/views/logs/index.blade.php b/resources/views/logs/index.blade.php
new file mode 100644
index 0000000..cf27e56
--- /dev/null
+++ b/resources/views/logs/index.blade.php
@@ -0,0 +1,109 @@
+@extends("layout")
+
+@section("content")
+<div class="p-3">
+    <div data-role="panel" data-title-caption='{{ trans("cruds.log.index")}}' data-collapsible="true" data-title-icon="<span class='mif-log-file'></span>">
+
+    <div class="grid">
+
+    <table 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"
+       >
+            <thead>
+                <th class="sortable-column">
+                    id
+                </th>
+                <th class="sortable-column">
+                    {{ trans('cruds.log.action') }}
+                </th>
+                <th class="sortable-column">
+                    {{ trans('cruds.log.subject_type') }}
+                </th>
+                <th class="sortable-column">
+                    {{ trans('cruds.log.subject_id') }}
+                </th>
+                <th class="sortable-column">
+                    {{ trans('cruds.log.user') }}
+                </th>
+                <th class="sortable-column">
+                    {{ trans('cruds.log.host') }}
+                </th>
+                <th class="sortable-column">
+                    {{ trans('cruds.log.timestamp') }}
+                </th>
+                <th>
+                </th>
+        </thead>
+        <tbody>
+                @foreach($logs as $log)
+                <tr data-entry-id="{{ $log->id }}">
+                    <td>
+                        <a href="/logs/show/{{ $log->id }}">
+                        {{ $log->id }}
+                        </a>
+                    </td>
+                    <td>
+                        {{ $log->description }}
+                    </td>
+                    <td>
+                        {{ $log->subject_type }}
+                    </td>
+                    <td>
+                        @if ($log->subject_type=='App\\Models\\Measure')
+                            <a href="/alice/show/{{ $log->subject_id }} ">
+                                {{ $log->subject_id }}
+                            </a>
+                        @elseif ($log->subject_type=='App\\Models\\Control')
+                            <a href="/bob/show/{{ $log->subject_id }} ">
+                                {{ $log->subject_id }}
+                            </a>
+                        @elseif ($log->subject_type=='App\\Models\\Action')
+                            <a href="/action/show/{{ $log->subject_id }} ">
+                                {{ $log->subject_id }}
+                            </a>
+                        @elseif ($log->subject_type=='App\\Models\\User')
+                            <a href="/user/show/{{ $log->subject_id }} ">
+                                {{ $log->subject_id }}
+                            </a>
+                        @else
+                            {{ $log->subject_id }}
+                        @endif
+
+
+
+
+                    </td>
+                    <td>
+                        <a href="{{ route('users.show', $log->user_id) }}">
+                        {{ $log->name }}
+                        </a>
+                    </td>
+                    <td>
+                        {{ $log->host }}
+                    </td>
+                    <td>
+                        {{ $log->created_at }}
+                    </td>
+                    <td nowrap>
+                        <a class="button success" href="/logs/show/{{ $log->id }}">
+                            {{ trans('common.show') }}
+                        </a>
+                        <a class="button info" href="/logs/history/{{ $log->id }}">
+                            {{ trans('common.history') }}
+                        </a>
+                    </td>
+                </tr>
+                @endforeach
+            </tbody>
+        </table>
+        <p>
+        {{ $logs->links() }}
+        </p>
+    </div>
+</div>
+@endsection
diff --git a/resources/views/logs/show.blade.php b/resources/views/logs/show.blade.php
new file mode 100644
index 0000000..088d1eb
--- /dev/null
+++ b/resources/views/logs/show.blade.php
@@ -0,0 +1,104 @@
+@extends("layout")
+
+@section("content")
+<div class="p-3">
+    <div data-role="panel" data-title-caption="{{ trans('cruds.log.title') }}" data-collapsible="true" data-title-icon="<span class='mif-log-file'></span>">
+
+        <table class="table table-border cell-border">
+            <tbody>
+                <tr>
+                    <th>
+                        id
+                    </th>
+                    <td>
+                        {{ $auditLog->id }}
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        {{ trans('cruds.log.subject_type') }}
+                    </th>
+                    <td>
+                        {{ $auditLog->subject_type }}
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        {{ trans('cruds.log.subject_id') }}
+                    </th>
+                    <td>
+                        @if ($auditLog->subject_type=='App\\Models\\Measure')
+                            <a href="/alice/show/{{ $auditLog->subject_id }} ">
+                                {{ $auditLog->subject_id }}
+                            </a>
+                        @elseif ($auditLog->subject_type=='App\\Models\\Control')
+                            <a href="/bob/show/{{ $auditLog->subject_id }} ">
+                                {{ $auditLog->subject_id }}
+                            </a>
+                        @elseif ($auditLog->subject_type=='App\\Models\\Action')
+                            <a href="/action/show/{{ $auditLog->subject_id }} ">
+                                {{ $auditLog->subject_id }}
+                            </a>
+                        @elseif ($auditLog->subject_type=='App\\Models\\User')
+                            <a href="/users/{{ $auditLog->subject_id }} ">
+                                {{ $auditLog->subject_id }}
+                            </a>
+                        @else
+                            {{ $auditLog->subject_id }}
+                        @endif
+
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        {{ trans('cruds.log.action') }}
+                    </th>
+                    <td>
+                        {{ $auditLog->description }}
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        {{ trans('cruds.log.user') }}
+                    </th>
+                    <td>
+                    <a href="/users/{{ $auditLog->user_id }}">
+                        {!! $auditLog->user->name !!}
+                    </a>
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        {{ trans('cruds.log.properties') }}
+                    </th>
+                    <td>
+                        {{ $auditLog->properties }}
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        {{ trans('cruds.log.host') }}
+                    </th>
+                    <td>
+                        {{ $auditLog->host }}
+                    </td>
+                </tr>
+                <tr>
+                    <th>
+                        {{ trans('cruds.log.timestamp') }}
+                    </th>
+                    <td>
+                        {{ $auditLog->created_at }}
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+        <div>
+            <br>
+            <a class="button btn-default" href="/logs">
+            {{ trans('common.cancel') }}
+            </a>
+        </div>
+    </div>
+</div>
+@endsection

From 448eb0c0fdcb75a776795407332264209c3960d7 Mon Sep 17 00:00:00 2001
From: didier <dbarzin@gmail.com>
Date: Thu, 6 Feb 2025 19:28:31 +0100
Subject: [PATCH 5/5] fix issue in history

---
 resources/views/logs/history.blade.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/logs/history.blade.php b/resources/views/logs/history.blade.php
index 5920773..27ea05e 100644
--- a/resources/views/logs/history.blade.php
+++ b/resources/views/logs/history.blade.php
@@ -78,13 +78,13 @@
                                 @endphp
                             <td {!! (($loop->first)||($value==$previous)) ? "" : "class='info'" !!}>
                                 @if ((gettype($value)=="string")&&(strlen($value)>100))
-                                {{ substr($value,0,100) }}
+                                    {{ substr($value,0,100) }}
                                 @elseif ((gettype($value)=="array"))
-                                @foreach($value as $v)
-                                {{ $v->name }}
-                                @endforeach
+                                    @foreach($value as $v)
+                                        {{ $v->name }}
+                                    @endforeach
                                 @else
-                                {{ $value }}
+                                    {{ $value }}
                                 @endif
                             </td>
                                 @php $previous = $value; @endphp