From 1bbbdc279e81fcb46035cc98105ef45766f9f49f Mon Sep 17 00:00:00 2001
From: ygbanzato <ygbanzato@isptgroup.com>
Date: Mon, 8 Jul 2024 02:24:33 +0100
Subject: [PATCH] Small project update

---
 .../Controllers/WorkstationsJobsController.php    |  7 +------
 app/Livewire/Execução/TasksDashboard.php          | 15 ++++++++++++---
 .../Admin/DataManagement/manageassets.blade.php   |  2 +-
 .../views/components/elemental-tasks.blade.php    |  3 +--
 routes/web.php                                    |  6 +++---
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/WorkstationsJobsController.php b/app/Http/Controllers/WorkstationsJobsController.php
index 4b603698..f63e673b 100755
--- a/app/Http/Controllers/WorkstationsJobsController.php
+++ b/app/Http/Controllers/WorkstationsJobsController.php
@@ -78,11 +78,6 @@ public function receiveQuestionsEquipment($equipmentID)
 
         return response()->json($answersWithYes);
     }
-
-
-  
-    
-
     public function receiveAnswersEquipment(Request $request, $control_equipment_workstation_id)
     {
         
@@ -473,7 +468,7 @@ public function getEquipmentData($equipment_id, $component_tag)
             return $task;
         });
 
-
+        
         // Verificar se component_tag contém '@Obturador' 
         if (strpos($component_tag, '@Obturador') !== false) {
             // Filtrar para manter apenas a tarefa : elemental_tasks_id = 9 (Retificação e lapidação)
diff --git a/app/Livewire/Execução/TasksDashboard.php b/app/Livewire/Execução/TasksDashboard.php
index ed5c4073..5e7c2d9a 100755
--- a/app/Livewire/Execução/TasksDashboard.php
+++ b/app/Livewire/Execução/TasksDashboard.php
@@ -69,12 +69,20 @@ public function refreshDataEquipments($datasProject)
         }
 
         $this->receiveElementalTasksAll = $elementalTasksCountsAll;
+
+        // Obtém a contagem das tarefas considerando os critérios especificados
         $tasksCount = ControlEquipmentWorkstation::whereIn('elemental_tasks_id', $elementalTasks)
             ->whereIn('equipmentWorkHistorys_id', $receiveEquipmentsProject->pluck('equipmentWorkHistorys_id'))
-            ->get(['equipmentWorkHistorys_id', 'elemental_tasks_id'])
+            ->get(['equipmentWorkHistorys_id', 'elemental_tasks_id', 'departure_date', 'status'])
             ->groupBy('elemental_tasks_id')
-            ->map(function ($group) {
-                return $group->unique('equipmentWorkHistorys_id')->count();
+            ->map(function ($group, $taskId) {
+                if ($taskId == 9) {
+                    return $group->filter(function ($item) {
+                        return $item->departure_date !== null && $item->status == 1;
+                    })->unique('equipmentWorkHistorys_id')->count();
+                } else {
+                    return $group->unique('equipmentWorkHistorys_id')->count();
+                }
             });
 
         $newArray = [];
@@ -95,6 +103,7 @@ public function refreshDataEquipments($datasProject)
         }
         $this->receiveElementalTasksAll = $newArray1;
         $this->countElementalTasksAll = array_sum($this->receiveElementalTasksAll);
+
     }
 
     public function render()
diff --git a/resources/views/Admin/DataManagement/manageassets.blade.php b/resources/views/Admin/DataManagement/manageassets.blade.php
index 09be2448..7f218236 100755
--- a/resources/views/Admin/DataManagement/manageassets.blade.php
+++ b/resources/views/Admin/DataManagement/manageassets.blade.php
@@ -23,7 +23,7 @@
     <section class="content">
         <div class="container-fluid">
             <div class="row justify-content-center">
-
+                <div class="col-12">
                     <div class="card card-primary" id="cardAssetsTable">
 
                         <div class="card-header">
diff --git a/resources/views/components/elemental-tasks.blade.php b/resources/views/components/elemental-tasks.blade.php
index 073a76a8..b09a285b 100644
--- a/resources/views/components/elemental-tasks.blade.php
+++ b/resources/views/components/elemental-tasks.blade.php
@@ -6084,5 +6084,4 @@ class="form-control" placeholder=""
         </div>
     @endif
 
-
-@endisset
+@endisset
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 8028161b..ee20e68f 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -91,10 +91,10 @@
 
 
 Route::get('teste1', function () {
-  
+
     return (new PdfWrapper)
-    ->loadUrl('https://www.google.pt')
-    ->download('ispt40.pdf');
+        ->loadUrl('https://www.google.pt')
+        ->download('ispt40.pdf');
 });
 
 // Route::get('teste1', function () {