Story /issues/582

Author: SMEWebify

app/Broadcasting/TaskActivity.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Broadcasting;
+
+use App\Models\User;
+
+class TaskActivity
+{
+    /**
+     * Create a new channel instance.
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Authenticate the user's access to the channel.
+     */
+    public function join(User $user)
+    {
+        return true; 
+    }
+}

app/Events/TaskActivityTriggered.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Support\Facades\Log;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow ;
+
+class TaskActivityTriggered implements ShouldBroadcastNow 
+{
+    use Dispatchable, InteractsWithSockets, SerializesModels;
+
+    public $message;
+    /**
+     * Create a new event instance.
+     */
+    public function __construct($message)
+    {
+        $this->message = $message;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return array<int, \Illuminate\Broadcasting\Channel>
+     */
+    public function broadcastOn(): array
+    {
+        return [
+            new Channel('TaskActivity'), 
+        ];
+    }
+
+    public function broadcastAs()
+    {
+        return 'task.activity.triggered';
+    }
+}

app/Http/Controllers/Planning/AndonAlertController.php

@@ -2,11 +2,13 @@
 
 namespace App\Http\Controllers\Planning;
 
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Events\AndonAlertTriggered;
 use App\Http\Controllers\Controller;
 use App\Models\Planning\AndonAlerts;
 use Illuminate\Support\Facades\Auth;
+use App\Models\Planning\TaskActivities;
 
 class AndonAlertController extends Controller
 {
@@ -21,7 +23,7 @@ public function triggerAlert(Request $request)
             'user_id' => Auth::id(),
             'triggered_at' => now(),
         ]);
-        $alertData= ['message' => 'Une alerte Andon a été déclenchée'];
+
         // Émettre l'événement
         broadcast(new AndonAlertTriggered($alert));
 
@@ -50,9 +52,17 @@ public function inProgressAlert($id)
         return redirect()->back();
     }
 
-    public function dashboard()
+    public function taskAlertsDashboard()
     {
         $andonAlerts = AndonAlerts::orderByRaw("FIELD(status, '1', '2', '3')")->orderByDesc('id')->get();
         return view('workshop/workshop-andon', compact('andonAlerts'));
     }
+
+    public function taskActivityDashboard()
+    {
+        $taskActivities = TaskActivities::where('timestamp', '>=', Carbon::now()->subDay())
+                                        ->orderByDesc('id')
+                                        ->get();
+        return view('workshop/workshop-andon-task-activity', compact('taskActivities'));
+    }
 }

app/Models/Planning/TaskActivities.php

@@ -20,7 +20,7 @@ class TaskActivities extends Model
                             'comment',];
 
 
-    public function Taks()
+    public function Tasks()
     {
         return $this->belongsTo(Task::class, 'task_id');
     }

app/Services/TaskService.php

@@ -2,7 +2,7 @@
 
 namespace App\Services;
 
-
+use App\Events\TaskActivityTriggered;
 use Carbon\Carbon;
 use App\Models\Planning\Task;
 use App\Events\TaskChangeStatu;
@@ -36,7 +36,7 @@ public function closeTasks($orderLineId)
 
     public function recordTaskActivity($taskId, $type, $goodQty, $addBadQt)
     {
-        TaskActivities::create([
+        $taskActivity = TaskActivities::create([
             'task_id' => $taskId,
             'user_id'=> Auth::user()->id,
             'type' => $type,
@@ -45,5 +45,7 @@ public function recordTaskActivity($taskId, $type, $goodQty, $addBadQt)
             'bad_qt'=> $addBadQt,
             'comment' => '',
         ]);
+
+        broadcast(new TaskActivityTriggered($taskActivity));
     }
 }

resources/views/workshop/workshop-andon-task-activity.blade.php

@@ -0,0 +1,81 @@
+@extends('adminlte::page')
+
+@section('title', __('general_content.logs_activity_trans_key'))
+
+@section('content_header')
+  <h1>{{ __('general_content.logs_activity_trans_key') }}</h1>
+@stop
+
+@section('content')
+<div class="timeline">
+    @foreach($taskActivities as $taskActivity)
+        <div style=" display: flex; justify-content: space-between; padding: 10px; border-radius: 10px; background-color: 
+            @if($taskActivity->type == 1) #3490dc
+            @elseif($taskActivity->type == 2) #ffed4a
+            @elseif($taskActivity->type == 3) #38c172
+            @elseif($taskActivity->type == 4) #4dc0b5
+            @elseif($taskActivity->type == 5) #e3342f
+            @else #6c757d @endif; margin-bottom: 10px;">
+            
+            <!-- Première colonne : Type d'activité -->
+            <div class="col-2">
+                @if($taskActivity->type == 1)
+                    <h3><i class="fas fa-play-circle"></i> {{ __('general_content.set_to_start_trans_key') }}</h3>
+                @elseif($taskActivity->type == 2)
+                    <h3><i class="fas fa-pause-circle"></i> {{ __('general_content.set_to_end_trans_key') }}</h3>
+                @elseif($taskActivity->type == 3)
+                    <h3><i class="fas fa-check-circle"></i> {{ __('general_content.set_to_finish_trans_key') }}</h3>
+                @elseif($taskActivity->type == 4)
+                    <h3><i class="fas fa-box"></i> {{ __('general_content.declare_finish_trans_key') }} : {{ $taskActivity->good_qt }} {{ __('general_content.part_trans_key') }}</h3>
+                @elseif($taskActivity->type == 5)
+                    <h3><i class="fas fa-times-circle"></i> {{ __('general_content.declare_rejected_trans_key') }} : {{ $taskActivity->bad_qt }} {{ __('general_content.part_trans_key') }}</h3>
+                @else
+                    <h3><i class="fas fa-question-circle"></i> {{ __('general_content.unknown_activity_trans_key') }}</h3>
+                @endif
+            </div>
+
+            <!-- Deuxième colonne : Date et Utilisateur -->
+            <div class="col-3">
+                <h3>{{ $taskActivity->GetPrettyCreatedAttribute() }} / {{ $taskActivity->user->name ?? 'System' }}</h3>
+            </div>
+            
+            <!-- Troisième colonne : Détails de la tâche -->
+            <div class="col-3"><h3>
+                <a href="{{ route('production.task.statu.id', ['id' =>  $taskActivity->task_id]) }}" class="btn btn-sm btn-success">{{__('general_content.view_trans_key') }} </a>
+                                
+                {{ __('general_content.task_trans_key') }} : #{{ $taskActivity->task_id }} - {{ $taskActivity->Tasks->label }}</h3>
+            </div>
+
+            <!-- Quatrième colonne : Commentaire -->
+            <div class="col-3">
+                <x-OrderButton id="{{ $taskActivity->Tasks->OrderLines->orders_id }}" code="{{ $taskActivity->Tasks->OrderLines->order->code }} #{{ __('general_content.line_trans_key') }} {{ $taskActivity->Tasks->OrderLines->label }}"  /> 
+            </div>
+
+        </div>
+    @endforeach
+</div>
+@stop
+
+@section('css')
+
+@stop
+
+@section('js')
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+    <script>
+        $(document).ready(function(){
+            // Cache la sidebar dès le chargement
+            $("body").addClass("sidebar-hidden");
+        });
+    </script>
+
+    <script src="{{ mix('js/app.js') }}"></script>
+    <script>
+        Echo.channel('TaskActivity')
+        .listen('.task.activity.triggered', function(data) {
+            setTimeout(() => {
+                location.reload(); 
+            }, 200);
+        });
+    </script>
+@stop

resources/views/workshop/workshop-andon.blade.php

@@ -13,7 +13,7 @@
             <!-- Première colonne : Type et Déclenchement -->
             <div class="col-3">
                 <h3>{{ $alert->type }}</h3>
-                <small>{{ $alert->GetPrettyCreatedAttribute() }} par {{ $alert->UserManagement['name'] }}</small>
+                <small>{{ $alert->GetPrettyCreatedAttribute() }} / {{ $alert->UserManagement['name'] }}</small>
             </div>
 
             <!-- Deuxième colonne : Description -->

routes/channels.php

@@ -1,6 +1,7 @@
 <?php
 
 use App\Broadcasting\AndonAlert;
+use App\Broadcasting\TaskActivity;
 use Illuminate\Support\Facades\Broadcast;
 
 /*
@@ -19,8 +20,5 @@
 });
 
 Broadcast::channel('AndonAlert', AndonAlert::class);
-
-Broadcast::channel( 'my-channel', function ($user) {
-    return true; // Autorise tous les utilisateurs à rejoindre ce canal
-});
+Broadcast::channel('TaskActivity', TaskActivity::class);
 

routes/web.php

@@ -38,10 +38,12 @@
         Route::get('/Stock/Detail', 'App\Http\Controllers\Workshop\WorkshopController@stockDetail')->name('workshop.stock.detail');
 
 
-        Route::get('/andon', 'App\Http\Controllers\Planning\AndonAlertController@dashboard')->name('workshop.andon');
+        Route::get('/andon', 'App\Http\Controllers\Planning\AndonAlertController@taskAlertsDashboard')->name('workshop.andon');
         Route::post('/andon/store', 'App\Http\Controllers\Planning\AndonAlertController@triggerAlert')->name('workshop.andon.store');
         Route::post('/andon/inProgress/{id}', 'App\Http\Controllers\Planning\AndonAlertController@inProgressAlert')->name('workshop.andon.inProgress');
         Route::post('/andon/resolve/{id}', 'App\Http\Controllers\Planning\AndonAlertController@resolveAlert')->name('workshop.andon.resolve');
+
+        Route::get('/andon/task-activity', 'App\Http\Controllers\Planning\AndonAlertController@taskActivityDashboard')->name('workshop.andon.task-activity');
     });