From 3bf69682fc1f74afee1f71c3b7aef633116038fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ces=C3=A1rio=20Garcia=20Mil-Homens?= Date: Fri, 13 Oct 2023 09:34:20 +0100 Subject: [PATCH 1/9] Atualizar resources/views/auth/login.blade.php Password to Palavra-passe --- resources/views/auth/login.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 245c185d..6574183c 100755 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -113,7 +113,7 @@
+ placeholder="Palavra-passe">
From f9ac80163f987df22a90f780db39f5b7ffd224a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ces=C3=A1rio=20Garcia=20Mil-Homens?= Date: Fri, 13 Oct 2023 13:02:03 +0100 Subject: [PATCH 2/9] QR Code final --- .../Templates/templateWorkstations.blade.php | 207 ++++++++++++------ 1 file changed, 134 insertions(+), 73 deletions(-) diff --git a/resources/views/Templates/templateWorkstations.blade.php b/resources/views/Templates/templateWorkstations.blade.php index 2b5b2164..506b759d 100644 --- a/resources/views/Templates/templateWorkstations.blade.php +++ b/resources/views/Templates/templateWorkstations.blade.php @@ -9,15 +9,13 @@ - + - + @@ -31,27 +29,26 @@ - + -
+
- - {{-- --}} - {{-- --}} + + - - + + + + +
@@ -3622,7 +3695,7 @@ class="form-control" placeholder="" required> {{ $receiveDataEquipment->equipment_tag }}
-
+ @csrf @@ -3788,14 +3861,19 @@ class="form-control" style="width: 100%;" placeholder="">
- - {{-- --}} - {{-- --}} + + - - + + + + +
@@ -3823,7 +3901,7 @@ class="form-control" style="width: 100%;" placeholder=""> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -3854,14 +3932,19 @@ class="form-control" style="width: 100%;" placeholder="">
- - {{-- --}} - {{-- --}} + + - - + + + + +
@@ -3889,7 +3972,7 @@ class="form-control" style="width: 100%;" placeholder=""> {{ $receiveDataEquipment->equipment_tag }} -
+ @csrf @@ -3928,14 +4011,19 @@ class="form-control select2" style="width: 100%;" required>
- - {{-- --}} - {{-- --}} + + - - + + + + +
@@ -3964,7 +4052,7 @@ class="form-control select2" style="width: 100%;" required> -
+ @csrf @@ -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 @@ -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 - - - From 4a32858b2e87d78b90f7b1f6d37845e25206c8d7 Mon Sep 17 00:00:00 2001 From: ygbanzato Date: Tue, 31 Oct 2023 16:17:05 +0000 Subject: [PATCH 9/9] Revert "Merge remote-tracking branch 'origin/Project-update-after-test-in-sines' into Update-project-style" This reverts commit 4db5baa536d6e88fe0a45fe80107c0e843b6d715, reversing changes made to a9c54f4274d053a2d6289e3aaeda134d724fc101. --- app/Http/Controllers/LanguageController.php | 21 --- .../WorkstationsJobsController.php | 59 +------- app/Http/Kernel.php | 1 - app/Http/Middleware/Language.php | 25 ---- config/app.php | 4 +- resources/lang/en/messages.php | 140 ------------------ resources/lang/en/validation.php | 0 resources/lang/pt/messages.php | 136 ----------------- .../Admin/CrudUsers/listCompany.blade.php | 8 +- .../views/Admin/CrudUsers/listUsers.blade.php | 26 ++-- .../DataManagement/manageassets.blade.php | 25 ++-- resources/views/Admin/index.blade.php | 17 +-- resources/views/Admin/profile.blade.php | 51 +++---- .../views/Templates/templateAdmin.blade.php | 75 ++-------- .../Templates/templateWorkstations.blade.php | 2 +- resources/views/email/pendingUsers.blade.php | 27 ++-- .../projectsClients/articulated_2.blade.php | 3 +- .../projectsClients/createProject.blade.php | 69 ++++----- .../views/workstations/workstations.blade.php | 69 ++++----- routes/web.php | 5 - 20 files changed, 152 insertions(+), 611 deletions(-) delete mode 100644 app/Http/Controllers/LanguageController.php delete mode 100644 app/Http/Middleware/Language.php delete mode 100644 resources/lang/en/messages.php delete mode 100644 resources/lang/en/validation.php delete mode 100644 resources/lang/pt/messages.php 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 a739e030..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; @@ -50,7 +49,7 @@ public function receiveAnswersEquipment(Request $request) // Armazenando a string JSON no banco de dados $receiveAnswersElementalTasks->answer_json = $jsonString; - $receiveAnswersElementalTasks->save(); + // $receiveAnswersElementalTasks->save(); // update departure_date value $receiveDataControlWs = ControlEquipmentWorkstation::find($request->control_equipment_workstationid); @@ -93,7 +92,9 @@ public function receiveAnswersEquipment(Request $request) $elemental_tasks_id = null; $further_tasks_id = $next_todo; } - + // dd($recebeDataControlId->id_workstations ); + + if ($request->stateEquipment == "cancel") { $deleteDataControlWhereRefreashPage = ControlEquipmentWorkstation::where('id_workstations', $receiveDataControlWs->id_workstations) ->where('equipment_id', $receiveDataEquipment->equipment_id) @@ -296,57 +297,7 @@ public function getEquipmentData($equipment_id) 'task_todo' => $controlEquipmentWorkstation->elemental_tasks_id ]); } else - // Busca as tarefas do Equipamento a serem feitas - $equipmentTasks = DB::table('users as u') - ->join('construction_workstations as cw', 'u.user_name', '=', 'cw.name_workstations') - ->join('workstations_association_tasks as wat', 'cw.id_workstations', '=', 'wat.id_workstations') - ->join('equipments as e', 'wat.company_projects_id', '=', 'e.company_projects_id') - ->join('ordered_equipment_tasks as oet', 'e.equipment_id', '=', 'oet.equipment_id') - ->where('u.email', $userEmail->email) - ->select('e.equipment_id', 'e.equipment_tag', DB::raw('GROUP_CONCAT(DISTINCT COALESCE(oet.elemental_tasks_id, oet.further_tasks_id) ORDER BY oet.execution_order) AS equipment_all_tasks')) - ->groupBy('e.equipment_id', 'e.equipment_tag') - ->orderBy('e.equipment_id', 'ASC') - ->get(); - //Busca as tarefas que podem ser feitas pela WS Atual a partir do Email - $userTasks = DB::table('users as u') - ->join('construction_workstations as cw', 'u.user_name', '=', 'cw.name_workstations') - ->join('workstations_association_tasks as wat', 'cw.id_workstations', '=', 'wat.id_workstations') - ->where('u.email', $userEmail->email) - ->select('cw.id_workstations', 'cw.name_workstations', DB::raw('GROUP_CONCAT(COALESCE(wat.elemental_tasks_id, wat.further_tasks_id)) AS all_tasks')) - ->groupBy('cw.id_workstations', 'cw.name_workstations') - ->get(); - - // Convertendo as tarefas do usuário em um array - $tasksArray = explode(',', $userTasks->pluck('all_tasks')->first()); - - $controlEquipmentWorkstation = ControlEquipmentWorkstation::where('equipment_id', $receiveDataEquipment->equipment_id) - ->whereIn('elemental_tasks_id', $tasksArray) - ->whereNull('id_workstations') - ->whereNull('entry_date') - ->whereNull('departure_date') - ->first(); - - // Se encontrar um dado que satisfaca as verificacoes acima deve implementar a tarefa para esta WS. - if ($controlEquipmentWorkstation) { - - $controlEquipmentWorkstation->id_workstations = $findDataWs->id_workstations; - $controlEquipmentWorkstation->entry_date = now(); - $controlEquipmentWorkstation->save(); - - $receiveDataElementalTask = ElementalTasks::find($controlEquipmentWorkstation->elemental_tasks_id); - - //Returning the values to a view "values" - return view('workstations.workstations', [ - 'receiveDataElementalTask' => $receiveDataElementalTask, - 'receiveDataEquipment' => $receiveDataEquipment, - 'control_ew_id' => $controlEquipmentWorkstation->control_equipment_workstation_id, - 'task_todo' => $controlEquipmentWorkstation->elemental_tasks_id - ]); - } else - - //cria a nova linha - $equipmentData = DB::select('CALL ManageEquipmentTasks(?, ?)', [$userEmail->email, $equipment_id]); //cria a nova linha $equipmentData = DB::select('CALL ManageEquipmentTasks(?, ?)', [$userEmail->email, $equipment_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

    -
  1. {{__('messages.users_listUsers.top_view_part.administration')}}
    2. -
  2. {{__('messages.users_listUsers.top_view_part.companies')}}
    3. +
  3. Administração
    4. +
  4. 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

    -
  1. {{__('messages.users_listUsers.top_view_part.administration')}}
    2. -
  2. {{__('messages.users_listUsers.top_view_part.companies')}}
    3. +
  3. Administração
    4. +
  4. 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

    -
  1. {{ __('messages.portfolio.top_view_part.portfolio') }}
    2. -
  2. {{ __('messages.portfolio.top_view_part.managing_assets') }}
    3. +
  3. Portefólio
    4. +
  4. Gerir 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"> - {{--
    -
    - @csrf - -
    -
  • - - - -
    • -
--}} - @@ -334,7 +300,7 @@ class="d-block">{{ Auth::user()->userType?->type_user }}
  • -

    {{ __('messages.users_listUsers.top_view_part.administration') }} +

    Administração

    @@ -342,19 +308,19 @@ class="d-block">{{ Auth::user()->userType?->type_user }}
  • -

    {{ __('messages.users_listUsers.users') }}

    +

    Utilizadores
  • -

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

    +

    Clientes
  • -

    {{ __('messages.users_listUsers.create_users') }}

    +

    Criar Utilizadores

    • @@ -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 7839721b..4c7d8014 100644 --- a/resources/views/Templates/templateWorkstations.blade.php +++ b/resources/views/Templates/templateWorkstations.blade.php @@ -142,7 +142,7 @@ class="brand-image img-circle elevation-3" style="opacity: .8">

    - {{ $equipmentsTodoCount }} a inicia + {{ $equipmentsTodoCount }} a iniciar

    diff --git a/resources/views/email/pendingUsers.blade.php b/resources/views/email/pendingUsers.blade.php index ecc0962c..f2dfd92f 100755 --- a/resources/views/email/pendingUsers.blade.php +++ b/resources/views/email/pendingUsers.blade.php @@ -11,12 +11,13 @@
    -

    {{__('messages.pendingUsers.create_users')}}

    +

    Criar Utilizadores

      -
    1. {{__('messages.pendingUsers.administration')}}
      2. -
    2. {{__('messages.pendingUsers.create_users')}}
      3. +
    3. Administração +
      4. +
    4. Criar Utilizadores
    @@ -29,13 +30,9 @@
    -

    {{__('messages.pendingUsers.submit_form')}}

    +

    Enviar Formulário:

    - - - {{--

    {{ __('messages.welcome') }}

    --}} -
    @csrf @@ -46,15 +43,15 @@
    - {{-- --}}
    - +
    @@ -65,7 +62,7 @@
    -

    {{__('messages.pendingUsers.pending_users')}}:

    +

    Utilizadores Pendentes :

    @@ -73,9 +70,9 @@ id="tableReceiveAllPendingUsers"> - {{__('messages.pendingUsers.table_pending_user.name')}} - {{__('messages.pendingUsers.table_pending_user.email')}} - {{__('messages.pendingUsers.table_pending_user.verify')}} + Nome + Email + Verificar diff --git a/resources/views/projectsClients/articulated_2.blade.php b/resources/views/projectsClients/articulated_2.blade.php index e19b4c0d..b58182f9 100755 --- a/resources/views/projectsClients/articulated_2.blade.php +++ b/resources/views/projectsClients/articulated_2.blade.php @@ -1221,8 +1221,7 @@ class="btn btn-info">Baixar Template {{-- ./table-responsive --}} @foreach ($listEquipmentsProjects as $listEquipmentsProject) - - +