diff --git a/app/Http/Controllers/LanguageController.php b/app/Http/Controllers/LanguageController.php deleted file mode 100644 index acae3ed8..00000000 --- a/app/Http/Controllers/LanguageController.php +++ /dev/null @@ -1,21 +0,0 @@ -input('locale'); - - if (!in_array($locale, ['en', 'pt'])) { - abort(400); - } - - session(['locale' => $locale]); - return redirect()->back(); - } -} diff --git a/app/Http/Controllers/WorkstationsJobsController.php b/app/Http/Controllers/WorkstationsJobsController.php index d34da6f1..b7b11c6f 100644 --- a/app/Http/Controllers/WorkstationsJobsController.php +++ b/app/Http/Controllers/WorkstationsJobsController.php @@ -16,8 +16,7 @@ class WorkstationsJobsController extends Controller { public function receiveAnswersEquipment(Request $request) - { - + { // Primeiro ele deve criar a associação entre id atual do control + perguntas e respostas $receiveAnswersElementalTasks = new workstationsTaskAnswers; $receiveAnswersElementalTasks->control_equipment_workstation_id = $request->control_equipment_workstationid; @@ -54,8 +53,7 @@ public function receiveAnswersEquipment(Request $request) // update departure_date value $receiveDataControlWs = ControlEquipmentWorkstation::find($request->control_equipment_workstationid); - $receiveDataControlWs->departure_date = now(); - $receiveDataControlWs->save(); + //FINALIZOU A TAREFA ANTERIOR COM DEPARTURE @@ -86,6 +84,7 @@ public function receiveAnswersEquipment(Request $request) $receiveDataElementalTask = ElementalTasks::find($recebeDataControlId->elemental_tasks_id); $receiveDataEquipment = Equipment::find($recebeDataControlId->equipment_id); + if ($next_todo < 25) { $elemental_tasks_id = $next_todo; $further_tasks_id = null; @@ -93,86 +92,30 @@ public function receiveAnswersEquipment(Request $request) $elemental_tasks_id = null; $further_tasks_id = $next_todo; } + // dd($recebeDataControlId->id_workstations ); + - // Para criar a divisao do equipamento em entre compo e Obturador - if ($receiveDataControlWs->elemental_tasks_id == 5 || $receiveDataControlWs->elemental_tasks_id == 6) { - $nextEquipmentTask1 = DB::select(" - INSERT INTO control_equipment_workstation - (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date) - VALUES - (:equipment_id,NULL,8,:further_tasks_id,NULL,NULL,NULL) - ", [ - 'equipment_id' => $receiveDataEquipment->equipment_id, - 'further_tasks_id' => $further_tasks_id - ]); + if ($request->stateEquipment == "cancel") { + $deleteDataControlWhereRefreashPage = ControlEquipmentWorkstation::where('id_workstations', $receiveDataControlWs->id_workstations) + ->where('equipment_id', $receiveDataEquipment->equipment_id) + ->whereNotNull('entry_date') + ->whereNull('departure_date') + ->first(); - $nextEquipmentTask2 = DB::select(" - INSERT INTO control_equipment_workstation - (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date) - VALUES - (:equipment_id,NULL,9,:further_tasks_id,NULL,NULL,NULL) - ", [ - 'equipment_id' => $receiveDataEquipment->equipment_id, - 'further_tasks_id' => $further_tasks_id - ]); - // Equipamento separado em 2 corpo/ Obturador - return redirect()->route('enterWorkstation'); + if ($deleteDataControlWhereRefreashPage) { + $deleteDataControlWhereRefreashPage->id_workstations = null; + $deleteDataControlWhereRefreashPage->entry_date = null; + $deleteDataControlWhereRefreashPage->departure_date = null; + $deleteDataControlWhereRefreashPage->save(); } + return redirect()->route('enterWorkstation'); - // Quando concluir as tarefas 8 e 9 ele apenas deve - else if ($receiveDataControlWs->elemental_tasks_id == 8 || $receiveDataControlWs->elemental_tasks_id == 9) { - // Verifique se já existem registros na tabela control_equipment_workstation - $existingRecords = DB::table('control_equipment_workstation') - ->where('equipment_id', $receiveDataControlWs->equipment_id) - ->whereIn('elemental_tasks_id', [8, 9]) - ->whereNotNull('departure_date') - ->get(); + } if ($request->stateEquipment == "finish") { - // Verifique se há pelo menos dois registros que atendem às condições - if ($existingRecords->count() >= 2) { - // Crie um novo registro com elemental_tasks_id igual a 10 - $nextEquipmentTask3 = DB::table('control_equipment_workstation')->insertGetId([ - 'equipment_id' => $receiveDataControlWs->equipment_id, - 'id_workstations' => NULL, - 'elemental_tasks_id' => 10, - 'further_tasks_id' => $further_tasks_id, - 'equipment_comments_id' => NULL, - 'entry_date' => NULL, - 'departure_date' => NULL, - ]); - } + $receiveDataControlWs->departure_date = now(); + $receiveDataControlWs->save(); - return redirect()->route('enterWorkstation'); - } - - //Se a proxima WS for igual a atual deve criar dados para a ws - else if ($recebeDataControlId->id_workstations == $next_workstation) { - $nextEquipmentTask = DB::select(" - INSERT INTO control_equipment_workstation - (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date) - VALUES - (:equipment_id,:next_workstation,:elemental_tasks_id,:further_tasks_id,NULL,CURRENT_TIMESTAMP,NULL) - ", [ - 'equipment_id' => $receiveDataEquipment->equipment_id, - 'next_workstation' => $next_workstation, - 'elemental_tasks_id' => $elemental_tasks_id, - 'further_tasks_id' => $further_tasks_id - ]); - - $lastInsertedId = DB::getPdo()->lastInsertId(); - - return view('workstations.workstations', [ - 'receiveDataElementalTask' => $receiveDataElementalTask, - 'receiveDataEquipment' => $receiveDataEquipment, - 'control_ew_id' => $lastInsertedId, - 'task_todo' => $next_todo - ]); - // Se verificar que a proxima tarefa e Null ele deve apenas voltar ao start - } else if ($next_todo == null) { - - return redirect()->route('enterWorkstation'); - } else { - $nextEquipmentTask = DB::select(" + $nextEquipmentTaskStateEquipmentFinish = DB::select(" INSERT INTO control_equipment_workstation (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date) VALUES @@ -182,8 +125,115 @@ public function receiveAnswersEquipment(Request $request) 'elemental_tasks_id' => $elemental_tasks_id, 'further_tasks_id' => $further_tasks_id ]); - return redirect()->route('enterWorkstation'); + + } + if ($request->stateEquipment == 'next') { + + + + $receiveDataControlWs->departure_date = now(); + $receiveDataControlWs->save(); + + // Para criar a divisao do equipamento em entre compo e Obturador + if ($receiveDataControlWs->elemental_tasks_id == 5 && $receiveDataEquipment->equipment_type_id == 3) { + + $nextEquipmentTask1 = DB::select(" + INSERT INTO control_equipment_workstation + (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date) + VALUES + (:equipment_id,NULL,8,:further_tasks_id,NULL,NULL,NULL) + ", [ + 'equipment_id' => $receiveDataEquipment->equipment_id, + 'further_tasks_id' => $further_tasks_id + ]); + + $nextEquipmentTask2 = DB::select(" + INSERT INTO control_equipment_workstation + (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date) + VALUES + (:equipment_id,NULL,9,:further_tasks_id,NULL,NULL,NULL) + ", [ + 'equipment_id' => $receiveDataEquipment->equipment_id, + 'further_tasks_id' => $further_tasks_id + ]); + // Equipamento separado em 2 corpo/ Obturador + return redirect()->route('enterWorkstation'); + } + + // Quando concluir as tarefas 8 e 9 + if ($receiveDataEquipment->equipment_type_id == 3 && ($receiveDataControlWs->elemental_tasks_id == 8 || $receiveDataControlWs->elemental_tasks_id == 9)) { + // dd('recebe if Quando concluir as tarefas 8 e 9 '); + + // Verifique se já existem registros na tabela control_equipment_workstation + $existingRecords = DB::table('control_equipment_workstation') + ->where('equipment_id', $receiveDataControlWs->equipment_id) + ->whereIn('elemental_tasks_id', [8, 9]) + ->whereNotNull('departure_date') + ->get(); + + // Verifique se há pelo menos dois registros que atendem às condições + if ($existingRecords->count() >= 2) { + + // Crie um novo registro com elemental_tasks_id igual a 10 + $nextEquipmentTask3 = DB::table('control_equipment_workstation')->insertGetId([ + 'equipment_id' => $receiveDataControlWs->equipment_id, + 'id_workstations' => NULL, + 'elemental_tasks_id' => 10, + 'further_tasks_id' => $further_tasks_id, + 'equipment_comments_id' => NULL, + 'entry_date' => NULL, + 'departure_date' => NULL, + ]); + } + + return redirect()->route('enterWorkstation'); + } + + + + //Se a proxima WS for igual a atual deve criar dados para a ws + if ($recebeDataControlId->id_workstations == $next_workstation) { + + + $nextEquipmentTask = DB::select(" + INSERT INTO control_equipment_workstation + (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date) + VALUES + (:equipment_id,:next_workstation,:elemental_tasks_id,:further_tasks_id,NULL,CURRENT_TIMESTAMP,NULL) + ", [ + 'equipment_id' => $receiveDataEquipment->equipment_id, + 'next_workstation' => $next_workstation, + 'elemental_tasks_id' => $elemental_tasks_id, + 'further_tasks_id' => $further_tasks_id + ]); + + $lastInsertedId = DB::getPdo()->lastInsertId(); + + $receiveDataNewElementalTask = ElementalTasks::find($elemental_tasks_id); + + return view('workstations.workstations', [ + 'receiveDataElementalTask' => $receiveDataNewElementalTask, + 'receiveDataEquipment' => $receiveDataEquipment, + 'control_ew_id' => $lastInsertedId, + 'task_todo' => $next_todo + ]); + // Se verificar que a proxima tarefa e Null ele deve apenas voltar ao start + + } else if ($next_workstation == null) { + + $nextEquipmentTask = DB::select(" + INSERT INTO control_equipment_workstation + (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date) + VALUES + (:equipment_id,NULL,:elemental_tasks_id,:further_tasks_id,NULL,NULL,NULL) + ", [ + 'equipment_id' => $receiveDataEquipment->equipment_id, + 'elemental_tasks_id' => $elemental_tasks_id, + 'further_tasks_id' => $further_tasks_id + ]); + return redirect()->route('enterWorkstation'); + } } } @@ -273,8 +323,8 @@ public function getEquipmentData($equipment_id) ->whereNotNull('entry_date') ->whereNull('departure_date') ->first(); - // dd($deleteDataControlWhereRefreashPage); - + // dd($deleteDataControlWhereRefreashPage); + if ($deleteDataControlWhereRefreashPage) { $deleteDataControlWhereRefreashPage->id_workstations = null; $deleteDataControlWhereRefreashPage->entry_date = null; @@ -282,7 +332,6 @@ public function getEquipmentData($equipment_id) $deleteDataControlWhereRefreashPage->save(); } return redirect()->route('enterWorkstation'); - } else $receiveDataElementalTask = ElementalTasks::find($recebeDataControlId->elemental_tasks_id); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index a3524b19..a237b67b 100755 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -36,7 +36,6 @@ class Kernel extends HttpKernel \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, - \App\Http\Middleware\Language::class, ], 'api' => [ diff --git a/app/Http/Middleware/Language.php b/app/Http/Middleware/Language.php deleted file mode 100644 index 4906e51a..00000000 --- a/app/Http/Middleware/Language.php +++ /dev/null @@ -1,25 +0,0 @@ -setLocale(session('locale')); - } - - return $next($request); - } -} diff --git a/config/app.php b/config/app.php index 0f3e510b..1bbd47cc 100755 --- a/config/app.php +++ b/config/app.php @@ -83,7 +83,9 @@ | */ - 'locale' => 'en', + // 'locale' => 'en', + 'locale' => 'pt', + /* |-------------------------------------------------------------------------- diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php deleted file mode 100644 index 187668f5..00000000 --- a/resources/lang/en/messages.php +++ /dev/null @@ -1,140 +0,0 @@ - [ - //navbarMenu - 'dashboard' => 'Dashboard', - - 'planning' => [ - 'description' => 'In planning', - 'text' => 'In planning for 2023' - ], - 'prepared' => [ - 'description' => 'Prepared', - 'text' => 'Waiting for the work to start.' - ], - 'on_going' => [ - 'description' => 'On going', - 'text' => 'Work in progress.' - ], - 'finished' => [ - 'description' => 'Finished.', - 'text' => 'Last projects 2023.' - ], - ], - - //alterar na view Portfolio - 'portfolio' => [ - 'top_view_part' => [ - 'management_assets' => 'Management assets', - 'portfolio' => 'portfolio', - 'managing_assets' => 'Managing Assets', - ], - 'change_buttons' => [ - 'create_assets' => 'Create assets', - 'asset_table' => 'Asset table', - ], - 'asset_table' => [ - ''=> '', - ], - 'users_table' => [ - 'id' => 'ID', - 'name' => 'Name', - 'email' => 'Email', - 'user_type' => 'User type', - 'actions' => [ - 'actions' => 'Actions', - 'details' => 'Details', - 'edit'=> 'Edit', - 'delete' => 'Delete' - ], - ], - ], - - 'users_listUsers' => [ - //Navbar - 'users' => 'Users', - 'companies' => 'Companies', - 'create_users' => 'Create users', - - 'top_view_part' => [ - 'companies' => 'Companies', - 'administration' => 'Administration', - 'users_table' => 'Users table', - 'companies_table' => 'Companies Table', - ], - ], - - // View : Create Users - 'pendingUsers' => [ - 'create_users' => 'Create Users', - 'administration' => 'Administration', - 'submit_form' => 'Submit Form', - 'pending_users' => 'Pending Users', - 'submit' => 'Submit', - 'table_pending_user' => [ - 'name' => 'Name', - 'email' => 'Email', - 'verify' => 'Verify' - ], - ], - - // View : createProject - 'createProject' => [ - //NavbarMenu - "create_project"=> "Create a project", - - 'project_work_details' => 'Project Work Details', - 'project_identification' => 'Project identification', - 'ispt_project_number' => 'ISPT Project Number', - 'ispt_project_manager' => 'ISPT Project Manager', - 'compan_project_manager' => 'Company Project Manager', - //Selecionar uma empresa. - 'select_company' => [ - 'contracting_company' => 'Contracting Company', - 'select_company' => 'Select a contracting Company', - ], - //Selecionar ou criar uma instalacao - 'select_plant' => [ - 'plant' => 'Select Plant', - 'create_new_plant' => 'Create a new plant', - 'new_plant' => 'New plant', - 'plant_address' => 'Plant address', - 'select_plant' => 'Select Plant', - ], - 'company_project_number' => 'Company Project Number', - 'project_start_date' => 'Project Start Date', - ], - - - 'profile' => [ - 'show_profile' => [ - 'profile' => 'Profile', - 'full_name' => 'Full Name', - 'nif' => 'Nif', - 'email_address' => 'Email address', - 'user_type' => 'User type', - 'mobile_phone' => 'Mobile phone', - 'account_creation_date' => 'account_creation_date' - ], - 'edit_profile' => [ - 'edit_profile'=> 'Edit profile', - 'update_your_logo' => 'Update your logo', - 'image' => 'Image', - 'full_name'=> 'Full name', - 'nif' => 'Nif', - 'email_address' => 'Email address', - 'mobile_phone' => 'mobile_phone', - ], - ], - - //Botoes gerais ISPT4.0 - 'buttons' => [ - 'save' => 'save', - ], - - 'welcome' => 'Welcome to our application!', -]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php deleted file mode 100644 index e69de29b..00000000 diff --git a/resources/lang/pt/messages.php b/resources/lang/pt/messages.php deleted file mode 100644 index f1b642fc..00000000 --- a/resources/lang/pt/messages.php +++ /dev/null @@ -1,136 +0,0 @@ - [ - //navbarMenu - 'dashboard' => 'Dashboard', - - 'planning' => [ - 'description' => 'Em planeamento', - 'text' => 'Em planeamento de 2023' - ], - 'prepared' => [ - 'description' => 'Preparadas', - 'text' => 'Aguarda o início da obra.' - ], - 'on_going' => [ - 'description' => 'Em execução', - 'text' => 'Obra em curso.' - ], - 'finished' => [ - 'description' => 'Concluídas', - 'text' => 'Últimas obras de 2023.' - ], - - ], - - 'portfolio' => [ - 'top_view_part' => [ - 'management_assets' => 'Gestão de ativos', - 'portfolio' => 'Portefólio', - 'managing_assets' => 'Gerir ativos', - ], - 'change_buttons' => [ - 'create_assets' => 'Criar ativos', - 'asset_table' => 'Tabela de ativos', - ], - 'users_table' => [ - 'id' => 'ID', - 'name' => 'Nome', - 'email' => 'Email', - 'user_type' => 'Tipo de Utilizador', - 'actions' => [ - 'actions' => 'Ações', - 'details' => 'Detalhes', - 'edit' => 'Editar', - 'delete' => 'Excluir' - ], - - ], - ], - - 'users_listUsers' => [ - //Navbar - 'users' => 'Utilizadores', - 'companies' => 'Clientes', - 'create_users' => 'Criar Utilizadores', - - 'top_view_part' => [ - 'companies' => 'Empresas', - 'administration' => 'Administração', - 'users_table' => 'Tabela Utilizadores', - 'companies_table' => 'Tabela Empresas', - ], - ], - - // View : Create Users - 'pendingUsers' => [ - 'create_users' => 'Criar Utilizadores', - 'administration' => 'Administração', - 'submit_form' => 'Enviar Formulário', - 'pending_users' => 'Utilizadores Pendentes', - 'submit' => 'Enviar', - 'table_pending_user' => [ - 'name' => 'Nome', - 'email' => 'Email', - 'verify' => 'Verificar' - ], - ], - - // View : createProject - 'createProject' => [ - //NavbarMenu - "create_project" => "Criar obra", - - 'project_work_details' => 'Detalhes Técnicos do Projeto', - 'project_identification' => 'Identificação do projecto', - 'ispt_project_number' => 'Número do Projeto ISPT', - 'ispt_project_manager' => 'Gestor de Projeto ISPT', - 'compan_project_manager' => 'Gestor de Projeto da Empresa', - //Selecionar uma empresa. - 'select_company' => [ - 'contracting_company' => 'Empresa Contratante', - 'select_company' => 'Selecionar uma Empresa', - ], - //Selecionar ou criar uma instalacao - 'select_plant' => [ - 'plant' => 'Instalação', - 'create_new_plant' => 'Criar uma nova Instalacao', - 'new_plant' => 'Nova Instalação', - 'plant_address' => 'Morada Instalação', - 'select_plant' => 'Selecione uma Instalação', - ], - 'company_project_number' => 'Número do Projeto da Empresa', - 'project_start_date' => 'Data de Início do Projeto', - ], - - //view: usersProfiles - 'profile' => [ - 'show_profile' => [ - 'profile' => 'Perfil', - 'full_name' => 'Nome e Apelido', - 'nif' => 'Nif', - 'email_address' => 'Email', - 'user_type' => 'Tipo de utilizador', - 'mobile_phone' => 'Telemóvel', - 'account_creation_date' => 'Conta Criada em' - ], - 'edit_profile' => [ - 'update_your_logo' => 'Actualizar o seu logótipo', - 'image' => 'Imagem', - 'full_name'=> 'Nome e Apelido', - 'nif' => 'Nif', - 'email_address' => 'Email', - 'mobile_phone' => 'Telemóvel', - ], - ], - - 'buttons' => [ - 'save' => 'Guardar', - ], - - 'welcome' => 'Bem-vindo à nossa aplicação!', - // outras traduções -]; diff --git a/resources/views/Admin/CrudUsers/listCompany.blade.php b/resources/views/Admin/CrudUsers/listCompany.blade.php index 51a3ce1e..7fff767a 100755 --- a/resources/views/Admin/CrudUsers/listCompany.blade.php +++ b/resources/views/Admin/CrudUsers/listCompany.blade.php @@ -11,12 +11,12 @@
-

{{__('messages.users_listUsers.top_view_part.companies')}}

+

Empresas

@@ -27,7 +27,7 @@
-

{{__('messages.users_listUsers.top_view_part.companies_table')}}

+

Tabela Empresas

{{-- ./card-header --}}
diff --git a/resources/views/Admin/CrudUsers/listUsers.blade.php b/resources/views/Admin/CrudUsers/listUsers.blade.php index d343169e..c233fe89 100755 --- a/resources/views/Admin/CrudUsers/listUsers.blade.php +++ b/resources/views/Admin/CrudUsers/listUsers.blade.php @@ -11,12 +11,12 @@
-

{{__('messages.users_listUsers.top_view_part.companies')}}

+

Empresas

@@ -27,7 +27,7 @@
-

{{__('messages.users_listUsers.top_view_part.users_table')}}

+

Tabela Utilizadores

@@ -35,12 +35,12 @@ - - - - - - + + + + + + Empresas @foreach ($users as $user) @@ -59,12 +59,12 @@ class="actions-btn btn btn-light circle "> - {{__('messages.portfolio.users_table.actions.details')}} + Detalhes - {{__('messages.portfolio.users_table.actions.edit')}} + Editar @method('DELETE') diff --git a/resources/views/Admin/DataManagement/manageassets.blade.php b/resources/views/Admin/DataManagement/manageassets.blade.php index f6157b6b..aff9ae2e 100755 --- a/resources/views/Admin/DataManagement/manageassets.blade.php +++ b/resources/views/Admin/DataManagement/manageassets.blade.php @@ -6,14 +6,12 @@
-

{{ __('messages.portfolio.top_view_part.management_assets') }}

- {{-- {{__('messages.dashboard.text')}} --}} - +

Gestão de ativos

@@ -30,10 +28,13 @@
@@ -42,10 +43,10 @@
-

{{ __('messages.portfolio.change_buttons.asset_table') }}

+

Tabela de Ativos

- {{--
+
{{__('messages.portfolio.users_table.id')}}{{__('messages.portfolio.users_table.name')}}{{__('messages.portfolio.users_table.email')}}{{__('messages.portfolio.users_table.user_type')}}{{__('messages.portfolio.users_table.actions.actions')}}
IDNomeEmailTipo de UtilizadorAções
@@ -72,7 +73,7 @@
-
--}} +
@@ -88,7 +89,7 @@ @endsection @section('scriptsTemplateAdmin') - {{-- --}} + {{-- - - @@ -219,32 +211,7 @@ class="fas fa-bars"> - {{-- --}} - @@ -334,7 +300,7 @@ class="d-block">{{ Auth::user()->userType?->type_user }} @@ -472,27 +438,4 @@ class="d-block">{{ Auth::user()->userType?->type_user }} - -{{-- Script para as bandeiras --}} - - - diff --git a/resources/views/Templates/templateWorkstations.blade.php b/resources/views/Templates/templateWorkstations.blade.php index 4792b175..4c7d8014 100644 --- a/resources/views/Templates/templateWorkstations.blade.php +++ b/resources/views/Templates/templateWorkstations.blade.php @@ -31,19 +31,19 @@ - + -
+
@@ -1486,7 +1520,7 @@ class="form-control select2" style="width: 100%;" required> {{ $receiveDataEquipment->equipment_tag }}
-
+ @csrf
@@ -1877,14 +1911,20 @@ class="form-control select2" style="width: 100%;" required>
@@ -1914,7 +1954,7 @@ class="form-control select2" style="width: 100%;" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -2144,14 +2184,20 @@ class="form-control select2" style="width: 100%;" required>
@@ -2179,12 +2225,12 @@ class="form-control select2" style="width: 100%;" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf -
@@ -2213,14 +2259,19 @@ class="form-control select2" style="width: 100%;" required>
@@ -2248,12 +2299,12 @@ class="form-control select2" style="width: 100%;" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf -
@@ -2309,14 +2360,19 @@ class="form-control select2" style="width: 100%;" required>
@@ -2345,7 +2401,7 @@ class="form-control select2" style="width: 100%;" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -2546,14 +2602,19 @@ class="form-control select2" style="width: 100%;" required>
@@ -2581,7 +2642,7 @@ class="form-control select2" style="width: 100%;" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -3173,14 +3234,19 @@ class="form-control" placeholder="" required>
@@ -3209,7 +3275,7 @@ class="form-control" placeholder="" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -3589,14 +3655,19 @@ class="form-control" placeholder="" required>
@@ -3624,7 +3695,7 @@ class="form-control" placeholder="" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -3790,14 +3861,19 @@ class="form-control" style="width: 100%;" placeholder="">
@@ -3825,7 +3901,7 @@ class="form-control" style="width: 100%;" placeholder=""> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -3856,14 +3932,19 @@ class="form-control" style="width: 100%;" placeholder="">
@@ -3891,7 +3972,7 @@ class="form-control" style="width: 100%;" placeholder=""> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -3918,9 +3999,10 @@ class="form-control" style="width: 100%;" placeholder=""> @@ -3929,14 +4011,19 @@ class="form-control select2" style="width: 100%;" required>
@@ -3965,7 +4052,7 @@ class="form-control select2" style="width: 100%;" required> -
+ @csrf @@ -3992,9 +4079,10 @@ class="form-control select2" style="width: 100%;" required> @@ -4003,14 +4091,19 @@ class="form-control select2" style="width: 100%;" required>
@@ -4038,7 +4131,7 @@ class="form-control select2" style="width: 100%;" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -4072,14 +4165,19 @@ class="form-control select2" style="width: 100%;" required>
@@ -4107,7 +4205,7 @@ class="form-control select2" style="width: 100%;" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -4274,14 +4372,19 @@ class="form-control select2" style="width: 100%;" required>
@@ -4310,7 +4413,7 @@ class="form-control select2" style="width: 100%;" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -4609,9 +4712,9 @@ class="form-control" placeholder=""> class="form-control select2" style="width: 100%;" required> - - - + + + @@ -4690,14 +4793,19 @@ class="form-control select2" style="width: 100%;" required>
@@ -4727,7 +4835,7 @@ class="form-control select2" style="width: 100%;" required> -
+ @csrf
@@ -4839,14 +4947,19 @@ class="form-control select2" style="width: 100%;" required>
@@ -4874,10 +4987,11 @@ class="form-control select2" style="width: 100%;" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf - - + +
@@ -4909,8 +5023,9 @@ class="form-control select2" style="width: 100%;" required>
- +
@@ -4921,8 +5036,9 @@ class="form-control" style="width: 100%;" placeholder="" required>
- +
@@ -4991,14 +5107,19 @@ class="form-control" placeholder="" required>
@@ -5026,7 +5147,7 @@ class="form-control" placeholder="" required> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -5057,14 +5178,19 @@ class="form-control" placeholder="" required>
@@ -5075,10 +5201,15 @@ class="form-control" placeholder="" required> @endif + {{--
+
+
+
--}} + - + @endsection - - - diff --git a/routes/web.php b/routes/web.php index 4b69c4c9..8e93bfa1 100755 --- a/routes/web.php +++ b/routes/web.php @@ -28,7 +28,6 @@ use App\Http\Controllers\PreparedProjectController; use App\Http\Controllers\ExecutionProjectController; use App\Http\Controllers\WorkstationsJobsController; -use App\Http\Controllers\LanguageController; // Esta rota so pode aceder quem tiver o link atravez do email @@ -36,10 +35,6 @@ return view('email/FormAdmin'); })->name('formulario'); -Route::post('language/switch', [LanguageController::class, 'switchLanguage'])->name('language.switch'); - - - // Email Route::get('/your-verification-route/{id}/{hash}', [UserController::class, 'yourVerificationMethod']) ->middleware(['auth', 'signed', 'throttle:6,1'])