diff --git a/app/Http/Controllers/ExecutionProjectController.php b/app/Http/Controllers/ExecutionProjectController.php
index ef8ad6b8..dd2bc9cf 100755
--- a/app/Http/Controllers/ExecutionProjectController.php
+++ b/app/Http/Controllers/ExecutionProjectController.php
@@ -303,6 +303,11 @@ public function getDetailsEquipmentQrcode(Request $request)
return DataTables::of($query)
+ ->addColumn('ispt_number', function ($query) {
+ // Assumindo que você quer o 'ispt_number' do primeiro 'EquipmentWorkHistory' que corresponde ao 'company_projects_id'
+ $equipmentWorkHistory = $query->equipmentWorkHistory->first();
+ return $equipmentWorkHistory ? $equipmentWorkHistory->ispt_number : 'N/A';
+ })
->addColumn('equipment_type_name', function ($query) {
// Retorna 'equipment_type_name' do relacionamento 'equipmentType'
return $query->equipmentType ? $query->equipmentType->equipment_type_name : 'N/A';
@@ -316,16 +321,51 @@ public function getDetailsEquipmentQrcode(Request $request)
return $firstEquipmentWorkHistory->equipmentAssociationAmbit->ambitsEquipment->ambits_description;
})
- ->addColumn('action', function ($equipment) use ($receiveNumberProject) {
- $pdfUrl = route('showDetailsEquipmentForQrCode', ['equipmentId' => $equipment->equipment_id, 'projectId' => $receiveNumberProject]);
+ // ->addColumn('action', function ($equipment) use ($receiveNumberProject) {
+ // $pdfUrl = route('showDetailsEquipmentForQrCode', ['equipmentId' => $equipment->equipment_id, 'projectId' => $receiveNumberProject]);
- // Retorna apenas a ação para visualizar o PDF
- $dropdownHtml = '
-
- QR Code
- ';
+ // // Retorna apenas a ação para visualizar o PDF
+ // $dropdownHtml = '
+ //
+ // QR Code
+ // ';
+ // return $dropdownHtml;
+ // })
+
+ ->addColumn('action', function ($equipment) use ($receiveNumberProject) {
+ $pdfUrl = route('showDetailsEquipmentForQrCode', [
+ 'equipmentId' => $equipment->equipment_id,
+ 'projectId' => $receiveNumberProject
+ ]);
+
+ $detailsUrl = !is_null($receiveNumberProject)
+ ? route('projectDetails_11', ['projectID' => $receiveNumberProject, 'equipmentID' => $equipment->equipment_id])
+ : route('articulated_22', ['equipmentID' => $equipment->equipment_id]);
+
+ // Criando dropdown com botões
+ $dropdownHtml = '
+
+
';
+
+ // 🔹 Adiciona ação para visualizar o PDF (QR Code)
+ $dropdownHtml .= '
+ QR Code
+ ';
+
+ // 🔹 Adiciona ação para visualizar detalhes do equipamento
+ $dropdownHtml .= '
+ Detalhes
+ ';
+
+ $dropdownHtml .= '
'; // Fecha as tags do dropdown
+
return $dropdownHtml;
})
+
+
+
->make(true);
}
diff --git a/app/Http/Controllers/ProjectoDatacontroller.php b/app/Http/Controllers/ProjectoDatacontroller.php
index ef9df62e..caaa14d2 100755
--- a/app/Http/Controllers/ProjectoDatacontroller.php
+++ b/app/Http/Controllers/ProjectoDatacontroller.php
@@ -967,9 +967,10 @@ public function receivePlants($receiveAllClients)
//Funcao que recebe a Acoes do dataTables das obrar em Planeamento.
public function projectDetails_11($projectID, $equipmentID)
{
+
$detailsProject = CompanyProject::find($projectID);
- $dataEquipment = Equipment::find($equipmentID);
+ $detalsEquipment = Equipment::find($equipmentID);
$receiveEquipmentWorkHistorys = EquipmentWorkHistory::where('equipment_id', $equipmentID)
->where('company_projects_id', $projectID)
@@ -1049,7 +1050,7 @@ public function projectDetails_11($projectID, $equipmentID)
return [$task->elemental_tasks_id => 'on'];
})->all();
- $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $dataEquipment->equipment_id)->get();
+ $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $detalsEquipment->equipment_id)->get();
$specificAttributesArray = [];
@@ -1057,17 +1058,26 @@ public function projectDetails_11($projectID, $equipmentID)
$specificAttributesArray[$attribute->general_attributes_equipment_id] = $attribute->specific_attributes_value;
}
- // Cria um sistema de 1 a 3 , onde 1 e apenas 'ler', 2 apenas editar e 3 as 2 opcoes
- $portfolioOnlyreadOrEditToo = 3;
+ // talvez apenas ciar um if ja resolva, se vir da obra em status 1 ou 3 receve 3 para editar e ver, se viar da obra status 2, deve ser apenas 1
+ if ($detailsProject->order_project == 1 || $detailsProject->order_project == 3) {
+ // Cria um sistema de 1 a 3 , onde 1 e apenas 'ler', 2 apenas editar e 3 as 2 opcoes
+ $portfolioOnlyreadOrEditToo = 3;
+
+ } elseif ($detailsProject->order_project == 2) {
+ //Caso seja o 2 sera a obra preparada e nela, nao se deve fazer alteracoes por isso vai visualizar
+ $portfolioOnlyreadOrEditToo = 1;
+ }
+
+
+
//filteredTasks', 'OrdemTasks', 'DetailsTasks' campos vazios para ISV.
- return view('projectsClients.articulated_2_ShowEquipment', compact('detailsProject', 'dataEquipment', 'filteredTasks', 'OrdemTasks', 'DetailsTasks', 'specificAttributesArray', 'receiveEquipmentWorkHistorys', 'portfolioOnlyreadOrEditToo'));
+ return view('projectsClients.articulated_2_ShowEquipment', compact('detailsProject', 'detalsEquipment', 'filteredTasks', 'OrdemTasks', 'DetailsTasks', 'specificAttributesArray', 'receiveEquipmentWorkHistorys', 'portfolioOnlyreadOrEditToo'));
}
//Funcao que recebe a Acoes do dataTables do portifolio.
public function articulated_22($equipmentID)
{
- //Nao esta recebendo os selects
-
+ //(Nao esta recebendo os selects
// $dataEquipment = Equipment::find($equipmentID);
// $detailsEquipmentWorkHistory = EquipmentWorkHistory::where('equipment_id',$equipmentID)->first();
@@ -1107,6 +1117,7 @@ public function articulated_22($equipmentID)
// Cria um sistema de 1 a 3 , onde 1 e apenas 'ler', 2 apenas editar e 3 as 2 opcoes
$portfolioOnlyreadOrEditToo = 3;
+
return view('projectsClients.testRoute', compact('dataEquipment', 'receiveAlldetailsEquipmentWorkHistory', 'specificAttributesArray', 'portfolioOnlyreadOrEditToo'));
}
@@ -1277,7 +1288,7 @@ public function receiveAllEquipments()
->toJson();
}
- public function receiveWorkstationProject($receiveNumberProject,Request $request)
+ public function receiveWorkstationProject($receiveNumberProject, Request $request)
{
// Captura o valor de 'typePage' vindo da requisição
diff --git a/resources/views/components/portfolio/portfolioAttributesForEquipments.blade.php b/resources/views/components/portfolio/portfolioAttributesForEquipments.blade.php
index 1e173282..498eee13 100755
--- a/resources/views/components/portfolio/portfolioAttributesForEquipments.blade.php
+++ b/resources/views/components/portfolio/portfolioAttributesForEquipments.blade.php
@@ -4,7 +4,7 @@
@if ($portfolioOnlyreadOrEditToo == 1 || $portfolioOnlyreadOrEditToo == 3)
{{-- Visualizar --}}
-