From 98593e22ed27c5c0fc4aaef2f1ceb26c88f5b98f Mon Sep 17 00:00:00 2001 From: ygbanzato Date: Tue, 3 Oct 2023 15:49:51 +0100 Subject: [PATCH] final implementation of graphics to visualize the work in progress. --- app/Http/Controllers/userController.php | 46 ++++++++------ app/Livewire/Execução/TasksDashboard.php | 21 ++++--- .../Execução/WorkstationDashboard.php | 10 +-- app/Models/User.php | 10 +-- resources/views/Admin/profile.blade.php | 2 + .../execução/tasks-dashboard.blade.php | 63 +++++++++++++------ .../execução/workstation-dashboard.blade.php | 25 ++++++-- routes/web.php | 5 +- 8 files changed, 117 insertions(+), 65 deletions(-) diff --git a/app/Http/Controllers/userController.php b/app/Http/Controllers/userController.php index cf8de174..d12de3f6 100755 --- a/app/Http/Controllers/userController.php +++ b/app/Http/Controllers/userController.php @@ -23,7 +23,15 @@ class userController extends Controller { public function EditProfile(Request $request){ - + // dump($request); + + $user = User::find($request->userID); + + $user->user_name = $request->fullName; + $user->email = $request->email; + $user->user_phone = $request->phone; + $user->user_nif = $request->nif; + // $request->validate([ // 'name' => 'required', // 'email' => 'required|email|unique:users,email,' . $user->user_id, @@ -128,24 +136,26 @@ public function edit($id) public function update(Request $request, User $user) { - - $request->validate([ - 'name' => 'required', - 'email' => 'required|email|unique:users,email,' . $user->user_id, - 'password' => 'nullable|min:8|confirmed', - 'user_type' => 'required', - 'user_phone' => 'required', - 'user_nif' => 'required', - ]); + dump($request); + // $request->validate([ + // 'name' => 'required', + // 'email' => 'required|email|unique:users,email,' . $user->user_id, + // 'password' => 'nullable|min:8|confirmed', + // 'user_type' => 'required', + // 'user_phone' => 'required', + // 'user_nif' => 'required', + // ]); - $user->update([ - 'name' => $request->get('name'), - 'email' => $request->get('email'), - 'password' => $request->filled('password') ? Hash::make($request->get('password')) : $user->password, - 'user_type' => $request->get('user_type'), - 'user_phone' => $request->get('user_phone'), - 'user_nif' => $request->get('user_nif'), - ]); + // $user->update([ + // 'name' => $request->get('name'), + // 'email' => $request->get('email'), + // 'password' => $request->filled('password') ? Hash::make($request->get('password')) : $user->password, + // 'user_type' => $request->get('user_type'), + // 'user_phone' => $request->get('user_phone'), + // 'user_nif' => $request->get('user_nif'), + // ]); + + // $userUpdate-> return redirect('/users/listUsers')->with('success', 'Utilizadores atualizado com Sucesso!!'); } diff --git a/app/Livewire/Execução/TasksDashboard.php b/app/Livewire/Execução/TasksDashboard.php index 92ec2493..34dbc896 100644 --- a/app/Livewire/Execução/TasksDashboard.php +++ b/app/Livewire/Execução/TasksDashboard.php @@ -19,11 +19,14 @@ class TasksDashboard extends Component public $receiveElementalTasks; // Recebe todas as acoes ja feitas atualmente por tarefa public $receiveElementalTasksAll;// Recebe o total de tarefas que vamos fazer + public $countElementalTasks; + public $countElementalTasksAll; + public $lastUpdated; // Por enquanto nao ira usar, vamos deixar // public $receiveAllFurtherTasks; - public $lastUpdated; + // Deveria funcionar para receber o Repositorio. // public function initialize() @@ -39,7 +42,7 @@ class TasksDashboard extends Component public function updateTimeGrafics() { // Data atual - $this->lastUpdated = now()->toDateTimeString(); + $this->lastUpdated = now()->format('Y-m-d H:i'); // Chame o método para atualizar os dados dos gráficos $this->refreshDataEquipments($this->datasProject); @@ -51,7 +54,6 @@ public function updateTimeGrafics() ]); } - // Graficos de porcentagem entre o valor atual de finalizadas com valor final de quantas faltam public function showPercentageElementalTasks() { @@ -59,14 +61,10 @@ public function showPercentageElementalTasks() $this->dispatch('refreshPercentageElementalTasks', [ 'receiveElementalTasks' => $this->receiveElementalTasks, 'receiveElementalTasksAll' => $this->receiveElementalTasksAll, - + 'countElementalTasksAll'=> $this->countElementalTasksAll ]); } - - - - public function mount($datasProject) { $this->datasProject = $datasProject; @@ -127,6 +125,13 @@ public function mount($datasProject) // Agora, $newArray contém a contagem de tasks por elemental_tasks_code $this->receiveElementalTasksAll = $newArray1; + + + // Criar o contador para receber o valor total. + $this->countElementalTasksAll =array_sum($this->receiveElementalTasksAll); + + + $this->lastUpdated = now()->format('Y-m-d H:i'); } diff --git a/app/Livewire/Execução/WorkstationDashboard.php b/app/Livewire/Execução/WorkstationDashboard.php index 1b6c791e..5011bcdc 100644 --- a/app/Livewire/Execução/WorkstationDashboard.php +++ b/app/Livewire/Execução/WorkstationDashboard.php @@ -12,7 +12,7 @@ class WorkstationDashboard extends Component { public $receivefnishTasksInWorkstation; - public $test = 'batata'; + public $lastUpdated; public function mount() { @@ -21,6 +21,9 @@ public function mount() ->whereNotNull('departure_date') ->get(); + + $this->lastUpdated = now()->format('Y-m-d H:i'); + // Inicializando um array para armazenar a contagem // $workstationCounts = []; @@ -39,8 +42,6 @@ public function mount() // dump($workstationCounts); - - $workstationCounts = ControlEquipmentWorkstation::select('id_workstations', DB::raw('count(*) as count')) ->whereNotNull('id_workstations') ->whereNotNull('entry_date') @@ -67,7 +68,8 @@ public function updateData() // Atualize a variável com os novos dados $this->receivefnishTasksInWorkstation = [1, 2, 3]; - $this->test = 'FUncionaa'; + // Data atual + $this->lastUpdated = now()->format('Y-m-d H:i'); // Emita um evento com os novos dados $this->dispatch('updateChart', $this->receivefnishTasksInWorkstation); diff --git a/app/Models/User.php b/app/Models/User.php index f9454593..eadda4d3 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -26,15 +26,7 @@ class User extends Authenticatable * * @var array */ - // protected $fillable = [ - // 'name', - // 'email', - // 'password', - // 'user_type', - // 'user_phone', - // 'user_nif' - - // ]; + protected $fillable = ['user_name', 'email', 'password', 'user_phone', 'user_nif', 'type_users']; diff --git a/resources/views/Admin/profile.blade.php b/resources/views/Admin/profile.blade.php index 8475a269..b229d7d6 100755 --- a/resources/views/Admin/profile.blade.php +++ b/resources/views/Admin/profile.blade.php @@ -100,6 +100,8 @@ class="bi bi-trash"> --}} +
diff --git a/resources/views/livewire/execução/tasks-dashboard.blade.php b/resources/views/livewire/execução/tasks-dashboard.blade.php index a49b1d47..189ea7a3 100644 --- a/resources/views/livewire/execução/tasks-dashboard.blade.php +++ b/resources/views/livewire/execução/tasks-dashboard.blade.php @@ -1,25 +1,35 @@
-
+ {{-- Proxima implementacao --}} + {{--
+
--}} + +
+
+ +
+ {{ $lastUpdated }} +
+
Quantidade Tarefas Concluidas
-

Total de acções a serem realizadas por tarefa.

+

Total de acções já realizadas de acordo com a tarefa.

Quantidade tarefas Acumuladas
-

Total de acções já realizadas de acordo com a tarefa.

+

Total de acções a serem realizadas por tarefa.

- - {{ $lastUpdated }} -
-{{-- Script de Gradico em porcentagem --}} - + --}} diff --git a/resources/views/livewire/execução/workstation-dashboard.blade.php b/resources/views/livewire/execução/workstation-dashboard.blade.php index a6b500bf..eb19b24c 100644 --- a/resources/views/livewire/execução/workstation-dashboard.blade.php +++ b/resources/views/livewire/execução/workstation-dashboard.blade.php @@ -1,6 +1,15 @@
- - +
+
+ +
+ {{ $lastUpdated }} +
+
+
@@ -37,7 +46,15 @@ }] }, options: { - events: [], // Desativa todos os eventos - } + animation: false, + plugins: { + legend: { + display: false + }, + tooltip: { + enabled: false + } + } + }, }); diff --git a/routes/web.php b/routes/web.php index 87f4318e..db9f4b7d 100755 --- a/routes/web.php +++ b/routes/web.php @@ -37,6 +37,7 @@ }); +Route::get('/', [ProjectoDatacontroller::class, ('HomePage')])->name('home'); @@ -120,7 +121,7 @@ Route::get('users/{id}/edit', 'edit')->name('users.edit'); Route::put('users/{user}', 'update')->name('users.update'); Route::delete('users/{user}', 'destroy')->name('users.destroy'); - Route::put('editProfile/{id}', 'EditProfile')->name('editProfile'); + Route::get('editProfile/{id}', 'EditProfile')->name('editProfile'); }); Route::controller(CreateProjectController::class) @@ -216,7 +217,7 @@ // Mostrar Instalação click Route::get('units/{id}', [ProjectoDatacontroller::class, 'showUnit'])->name('showUnit'); - Route::get('/', [ProjectoDatacontroller::class, ('HomePage')])->name('home'); + });