diff --git a/app/Http/Controllers/CreateProjectController.php b/app/Http/Controllers/CreateProjectController.php
index ba3bc5df..560370de 100755
--- a/app/Http/Controllers/CreateProjectController.php
+++ b/app/Http/Controllers/CreateProjectController.php
@@ -977,7 +977,7 @@ public function processStep1(Request $request)
$project->save();
return redirect()->route('articulated_2', ['projectID' => $project->company_projects_id])
- ->with('success', 'Project criado com sucesso!');
+ ->with('success', 'Projeto Criado!');
}
public function showStep2($company_projects_id)
@@ -1038,7 +1038,6 @@ public function showStep2($company_projects_id)
});
-
if (!$pendingEquipments->isEmpty()) {
// Retornamos para a view 'step' => 2 indicando conclusao da primeira parte, $numberProject para associacao de equipamentos a esta obra, alem de todos os equipamentos e fabricao ja existente com base na Instalação que se iniciou a obra.
return view('projectsClients/articulated_2', ['step' => 2, 'numberProject' => $numberProject])
@@ -1670,6 +1669,9 @@ function normalize($value)
public function showStep3($company_projects_id)
{
+
+ $receiveDataCompanyProject= CompanyProject::find($company_projects_id)->first();
+
$equipments = Equipment::where('company_projects_id', $company_projects_id)
->get();
@@ -1731,7 +1733,8 @@ public function showStep3($company_projects_id)
return view('projectsClients/workStation_3', ['step' => 3, 'numberProject' => $company_projects_id])
->with('listWorkstations', $listWorkstations)
->with('equipments', $equipments)
- ->with('futherTasks', $futherTasks);
+ ->with('futherTasks', $futherTasks)
+ ->with('receiveDataCompanyProject', $receiveDataCompanyProject);
}
public function workstationsAssociationTasks(Request $request)
diff --git a/app/Http/Controllers/ExecutionProjectController.php b/app/Http/Controllers/ExecutionProjectController.php
index fcc056e4..ef8ad6b8 100755
--- a/app/Http/Controllers/ExecutionProjectController.php
+++ b/app/Http/Controllers/ExecutionProjectController.php
@@ -322,7 +322,7 @@ public function getDetailsEquipmentQrcode(Request $request)
// Retorna apenas a ação para visualizar o PDF
$dropdownHtml = '
- Visualizar PDF
+ QR Code
';
return $dropdownHtml;
})
diff --git a/app/Http/Controllers/Pending_UserController.php b/app/Http/Controllers/Pending_UserController.php
index c8cebb1c..b5eae870 100755
--- a/app/Http/Controllers/Pending_UserController.php
+++ b/app/Http/Controllers/Pending_UserController.php
@@ -88,10 +88,11 @@ public function validateForm(Request $request)
}
- public function ListPendingUsers()
+ public function ListPendingUsers($typeUser)
{
+ // Passa para a funcao para qual tipo de utilizador vai criar.
$pend_users = PendingUser::all();
- return view('email/pendingUsers', compact('pend_users'));
+ return view('email/pendingUsers', compact('pend_users','typeUser'));
}
public function ShowFormUser($id)
diff --git a/app/Http/Controllers/PreparedProjectController.php b/app/Http/Controllers/PreparedProjectController.php
index 226d75a4..70e44093 100755
--- a/app/Http/Controllers/PreparedProjectController.php
+++ b/app/Http/Controllers/PreparedProjectController.php
@@ -306,6 +306,7 @@ public function PreparedProject($ProjectId)
->with('units', $checkUnits)
->with('numberProject', $numberProject)
->with('equipmentsProjects', $equipmentsProjects);
+
}
public function getAmbits($equipmentType)
diff --git a/app/Http/Controllers/ProjectoDatacontroller.php b/app/Http/Controllers/ProjectoDatacontroller.php
index 7205658f..c919c34b 100755
--- a/app/Http/Controllers/ProjectoDatacontroller.php
+++ b/app/Http/Controllers/ProjectoDatacontroller.php
@@ -1280,8 +1280,15 @@ public function receiveAllEquipments()
->toJson();
}
- public function receiveWorkstationProject($receiveNumberProject)
+ public function receiveWorkstationProject($receiveNumberProject,Request $request)
{
+
+ // Captura o valor de 'typePage' vindo da requisição
+ $typePage = $request->input('typePage');
+
+ // Apenas para verificação, você pode usar dd() para ver o valor
+ dd($typePage);
+
$model = ConstructionWorkstation::where('company_projects_id', $receiveNumberProject)->with('workstationsAssociationTasks');
// Se ao varificar na tabela 'workstationsAssociationTasks' a coluna elementalTask estiver a null, significa que e uma further task, sendo assim ele busca o campo ao lado.
diff --git a/app/Http/Middleware/CheckUserType.php b/app/Http/Middleware/CheckUserType.php
index 1a86b2a5..75615964 100755
--- a/app/Http/Middleware/CheckUserType.php
+++ b/app/Http/Middleware/CheckUserType.php
@@ -70,7 +70,7 @@ protected function getAllowedRoutesForUserType($userType)
'showAllClientsForProjectReports',
'manageAssets',
'users.company','users.Show','users.edit','users.destroy','users.update','users.list',
- 'CreateUsers',
+ 'CreateUsers','createNewUsers',
'enviar.formulario',
'projectDetails_1','workStation_3','addFurtherTasks','deleteFurtherTasks','editEquipmentTasks',
'usersProfiles','showCompany',
diff --git a/public/img/avatar.png b/public/img/avatar.png
deleted file mode 100755
index a71d2a3a..00000000
Binary files a/public/img/avatar.png and /dev/null differ
diff --git a/public/img/avatar2.png b/public/img/avatar2.png
deleted file mode 100755
index 321c7274..00000000
Binary files a/public/img/avatar2.png and /dev/null differ
diff --git a/public/img/avatar4.png b/public/img/avatar4.png
deleted file mode 100755
index fa9be3d8..00000000
Binary files a/public/img/avatar4.png and /dev/null differ
diff --git a/public/img/photo2.png b/public/img/photo2.png
deleted file mode 100755
index dc8e9e95..00000000
Binary files a/public/img/photo2.png and /dev/null differ
diff --git a/public/img/photo3.jpg b/public/img/photo3.jpg
deleted file mode 100755
index 769a9925..00000000
Binary files a/public/img/photo3.jpg and /dev/null differ
diff --git a/public/img/prod-1.jpg b/public/img/prod-1.jpg
deleted file mode 100755
index 5054d396..00000000
Binary files a/public/img/prod-1.jpg and /dev/null differ
diff --git a/public/img/prod-3.jpg b/public/img/prod-3.jpg
deleted file mode 100755
index 5dffcd79..00000000
Binary files a/public/img/prod-3.jpg and /dev/null differ
diff --git a/public/img/prod-4.jpg b/public/img/prod-4.jpg
deleted file mode 100755
index fdbacf71..00000000
Binary files a/public/img/prod-4.jpg and /dev/null differ
diff --git a/public/img/user2-160x160.jpg b/public/img/user2-160x160.jpg
deleted file mode 100755
index e4df4f21..00000000
Binary files a/public/img/user2-160x160.jpg and /dev/null differ
diff --git a/public/img/user3-128x128.jpg b/public/img/user3-128x128.jpg
deleted file mode 100755
index 2a1a9cdd..00000000
Binary files a/public/img/user3-128x128.jpg and /dev/null differ
diff --git a/resources/views/Templates/AdminLayout/AdminLayout.blade.php b/resources/views/Templates/AdminLayout/AdminLayout.blade.php
index 4f6ec167..0f1b1704 100644
--- a/resources/views/Templates/AdminLayout/AdminLayout.blade.php
+++ b/resources/views/Templates/AdminLayout/AdminLayout.blade.php
@@ -36,9 +36,10 @@