diff --git a/app/Http/Controllers/CreateProjectController.php b/app/Http/Controllers/CreateProjectController.php index a2bb52ef..8ed37e69 100755 --- a/app/Http/Controllers/CreateProjectController.php +++ b/app/Http/Controllers/CreateProjectController.php @@ -5,6 +5,7 @@ use App\Models\AssociationCompanyUser; use App\Models\Company; +use App\Models\EquipmentTypeAttribute; use App\Models\EquipmentWorkHistory; use App\Models\HistoryOfEquipmentAmbitsInTheProject; use App\Models\ProjectExcelLog; @@ -1285,8 +1286,6 @@ public function processStep2(Request $request) // Inicialização do hashmap para rastrear as linhas únicas $uniqueRowsHashmap = []; $equipmentPendingLogs = []; - // $ignoredLines = []; - // $duplicateLines = []; // Separa o nome do arquivo para obter o tipo de documento e a data-hora $parts = explode('_', $originalFileName); @@ -1359,8 +1358,8 @@ function normalize($value) $equipmentType = EquipmentType::where('equipment_type_name', $datas['equipment_type_name'])->first(); //-------- Linhas Ignoradas - // Começa a contagem das linhas do excel a partir de 7 linha - if ($i < 6) { + // Começa a contagem das linhas do excel a partir de 9 linha + if ($i < 8) { continue; } // Contador para campos não vazios @@ -1537,9 +1536,9 @@ function normalize($value) $newEquipament->equipment_type_id = $equipmentType->equipment_type_id; $newEquipament->equipment_Description = $datas['equipment_description']; $newEquipament->equipment_tag = $datas['equipment_tag']; - $newEquipament->equipment_serial_number = $datas['serial_number']; - $newEquipament->equipment_brand = $datas['brand']; - $newEquipament->equipment_model = $datas['model']; + $newEquipament->equipment_serial_number = $datas['equipment_serial_number']; + $newEquipament->equipment_brand = $datas['equipment_brand']; + $newEquipament->equipment_model = $datas['equipment_model']; $newEquipament->company_projects_id = $company_projects_id; $newEquipament->save(); @@ -1551,15 +1550,27 @@ function normalize($value) $generalAttributes = GeneralAttributesEquipment::all(); - foreach ($generalAttributes as $generalAttribute) { - - // Verifica se a chave existe em $datas - if (isset($datas[$generalAttribute->general_attributes_equipment_description])) { + $typeId = $newEquipament->equipment_type_id; + + + // 1. Buscar os IDs dos atributos permitidos para esse tipo + $allowedAttributeIds = EquipmentTypeAttribute::where('equipment_type_id', $typeId) + ->pluck('attribute_id') + ->toArray(); + + // 2. Buscar os nomes das descrições para esses atributos + $allowedAttributes = GeneralAttributesEquipment::whereIn('general_attributes_equipment_id', $allowedAttributeIds) + ->get() + ->keyBy('general_attributes_equipment_description'); + + + foreach ($allowedAttributes as $description => $attribute) { + if (isset($datas[$description])) { $specificAttribute = new SpecificAttributesEquipmentType; $specificAttribute->equipment_id = $newEquipament->equipment_id; $specificAttribute->equipment_type_id = $newEquipament->equipment_type_id; - $specificAttribute->general_attributes_equipment_id = $generalAttribute->general_attributes_equipment_id; - $specificAttribute->specific_attributes_value = $datas[$generalAttribute->general_attributes_equipment_description]; + $specificAttribute->general_attributes_equipment_id = $attribute->general_attributes_equipment_id; + $specificAttribute->specific_attributes_value = $datas[$description]; $specificAttribute->save(); } diff --git a/app/Http/Controllers/PreparedProjectController.php b/app/Http/Controllers/PreparedProjectController.php index f172af7c..0a39fee8 100755 --- a/app/Http/Controllers/PreparedProjectController.php +++ b/app/Http/Controllers/PreparedProjectController.php @@ -126,9 +126,111 @@ class PreparedProjectController extends Controller // } + // public function showAllEquipmentsInProjectForQrCode($projectId) + // { + // $detailsEquipment = Equipment::where('company_projects_id', $projectId)->get(); + // $zipFileName = 'equipamentos_projeto_' . $projectId . '.zip'; + // $tempPath = storage_path('app/public/temp_pdfs/'); + // $zipPath = storage_path('app/public/' . $zipFileName); + + // // Busca os dados do equipamento + // $receiveEquipmentWorkHistory = EquipmentWorkHistory::where('equipment_id', $detailsEquipment->equipment_id) + // ->where('company_projects_id', $detailsEquipment->company_projects_id) + // ->first(); + // //Recebe os dados do Ambito para o equipamento atual + // $receiveAmbit = EquipmentAssociationAmbit::where('equipmentWorkHistorys_id', $receiveEquipmentWorkHistory->equipmentWorkHistorys_id)->first(); + + // //Guarda os Detalhes recebidos das outras variavies como Ambito e Numero Ispt + // $detailsEquipment->istp_number = $receiveEquipmentWorkHistory->ispt_number; + // $detailsEquipment->equipment_ambit = $receiveAmbit->ambitsEquipment->ambits_description; + + + // // Criar diretório temporário se não existir + // if (!file_exists($tempPath)) { + // mkdir($tempPath, 0777, true); + // } + + // $files = []; // Armazena os caminhos dos PDFs gerados + + // foreach ($detailsEquipment as $equipment) { + // // Buscar detalhes do equipamento + // $detailsCompanyProject = CompanyProject::find($projectId); + // $detailsPlant = Plant::where('plant_id', $detailsCompanyProject->plant_id)->first(); + // $detailsCompany = Company::where('company_id', $detailsPlant->company_id)->first(); + + // // Usar a mesma estrutura da função principal + // $specificAttributesArray = []; + + // $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $detailsEquipment->equipment_id)->get(); + + // foreach ($specificAttributes as $attribute) { + // $specificAttributesArray[$attribute->general_attributes_equipment_id] = $attribute->specific_attributes_value; + // } + + + // // Buscar equipamentos associados ao QR Code + // $associatedEquipments = QrcodesAssociatedEquipment::where('equipment_id', $equipment->equipment_id)->get(); + // $associatedArray = []; + // $qrCodeImages = []; + + // foreach ($associatedEquipments as $associatedEquipment) { + // $componentParts = explode('@', $associatedEquipment->component_tag); + // $associatedArray[$associatedEquipment->id] = isset($componentParts[1]) ? $componentParts[1] : $associatedEquipment->component_tag; + + // // Gerar QR Code + // $qrCode = new QrCode($associatedEquipment->component_tag); + // $writer = new PngWriter(); + // $qrCodeImages[$associatedEquipment->id] = 'data:image/png;base64,' . base64_encode($writer->write($qrCode)->getString()); + // } + + // // Caminho do logo da empresa + // $logoPath = public_path('companies_logo/' . ($detailsCompany->company_logo ?: 'logoISPT4.0.jpg')); + // if (!file_exists($logoPath)) { + // $logoPath = public_path('companies_logo/logoISPT4.0.jpg'); + // } + // $isptLogoPath = public_path('/img/ispt/ispt.jpg'); + + // //Criar uma nova instância do PdfWrapper para cada equipamento + // $pdfWrapper = new PdfWrapper(); + // $pdf = $pdfWrapper->loadView('projectsClients.showDetailsEquipmentForQrCodePdf', [ + // 'detailsCompanyProject' => $detailsCompanyProject, + // 'detailsEquipment' => $detailsEquipment, + // 'logoPath' => $logoPath, + // 'qrCodeImages' => $qrCodeImages, + // 'associatedArray' => $associatedArray, + // 'isptLogoPath' => $isptLogoPath + // ])->setOrientation('landscape'); + + // // Nome do arquivo PDF + // $pdfFileName = $equipment->equipment_tag . '.pdf'; + // $pdfFilePath = $tempPath . $pdfFileName; + + // // Salvar o PDF + // $pdf->save($pdfFilePath); + // $files[] = $pdfFilePath; + // } + + // // Criar arquivo ZIP e adicionar os PDFs gerados + // $zip = new ZipArchive; + // if ($zip->open($zipPath, ZipArchive::CREATE) === TRUE) { + // foreach ($files as $file) { + // $zip->addFile($file, basename($file)); + // } + // $zip->close(); + // } + + // // Remover arquivos PDF individuais após criar o ZIP + // foreach ($files as $file) { + // unlink($file); + // } + + // // Retornar o arquivo ZIP para download + // return response()->download($zipPath)->deleteFileAfterSend(true); + // } + public function showAllEquipmentsInProjectForQrCode($projectId) { - $equipments = Equipment::where('company_projects_id', $projectId)->get(); + $equipments = Equipment::where('company_projects_id', $projectId)->get(); // ← nome mais apropriado $zipFileName = 'equipamentos_projeto_' . $projectId . '.zip'; $tempPath = storage_path('app/public/temp_pdfs/'); $zipPath = storage_path('app/public/' . $zipFileName); @@ -141,29 +243,44 @@ public function showAllEquipmentsInProjectForQrCode($projectId) $files = []; // Armazena os caminhos dos PDFs gerados foreach ($equipments as $equipment) { - // Buscar detalhes do equipamento + // Reutilizamos $detailsEquipment dentro do loop para compatibilidade com a view + $detailsEquipment = $equipment; + + // Buscar dados do histórico de trabalho e âmbito + $receiveEquipmentWorkHistory = EquipmentWorkHistory::where('equipment_id', $detailsEquipment->equipment_id) + ->where('company_projects_id', $detailsEquipment->company_projects_id) + ->first(); + + // Adicionar campo personalizado ao equipamento + $detailsEquipment->istp_number = $receiveEquipmentWorkHistory->ispt_number ?? 'N/A'; + + $receiveAmbit = EquipmentAssociationAmbit::where('equipmentWorkHistorys_id', $receiveEquipmentWorkHistory->equipmentWorkHistorys_id ?? null) + ->first(); + + $detailsEquipment->equipment_ambit = $receiveAmbit->ambitsEquipment->ambits_description ?? 'N/A'; + + // Buscar detalhes do projeto, planta e empresa $detailsCompanyProject = CompanyProject::find($projectId); $detailsPlant = Plant::where('plant_id', $detailsCompanyProject->plant_id)->first(); $detailsCompany = Company::where('company_id', $detailsPlant->company_id)->first(); // Buscar atributos específicos do equipamento - $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $equipment->equipment_id)->get(); + $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $detailsEquipment->equipment_id)->get(); $specificAttributesArray = []; foreach ($specificAttributes as $attribute) { $specificAttributesArray[$attribute->general_attributes_equipment_id] = $attribute->specific_attributes_value; } - // Buscar equipamentos associados ao QR Code - $associatedEquipments = QrcodesAssociatedEquipment::where('equipment_id', $equipment->equipment_id)->get(); + // Equipamentos associados ao QR Code + $associatedEquipments = QrcodesAssociatedEquipment::where('equipment_id', $detailsEquipment->equipment_id)->get(); $associatedArray = []; $qrCodeImages = []; foreach ($associatedEquipments as $associatedEquipment) { $componentParts = explode('@', $associatedEquipment->component_tag); - $associatedArray[$associatedEquipment->id] = isset($componentParts[1]) ? $componentParts[1] : $associatedEquipment->component_tag; + $associatedArray[$associatedEquipment->id] = $componentParts[1] ?? $associatedEquipment->component_tag; - // Gerar QR Code $qrCode = new QrCode($associatedEquipment->component_tag); $writer = new PngWriter(); $qrCodeImages[$associatedEquipment->id] = 'data:image/png;base64,' . base64_encode($writer->write($qrCode)->getString()); @@ -174,20 +291,24 @@ public function showAllEquipmentsInProjectForQrCode($projectId) if (!file_exists($logoPath)) { $logoPath = public_path('companies_logo/logoISPT4.0.jpg'); } + $isptLogoPath = public_path('/img/ispt/ispt.jpg'); - // Criar uma nova instância do PdfWrapper para cada equipamento + // Criar PDF $pdfWrapper = new PdfWrapper(); $pdf = $pdfWrapper->loadView('projectsClients.showDetailsEquipmentForQrCodePdf', [ - 'detailsEquipment' => $equipment, + 'detailsCompanyProject' => $detailsCompanyProject, + 'detailsEquipment' => $detailsEquipment, 'logoPath' => $logoPath, 'qrCodeImages' => $qrCodeImages, 'associatedArray' => $associatedArray, - 'isptLogoPath' => $isptLogoPath + 'isptLogoPath' => $isptLogoPath, + 'specificAttributesArray' => $specificAttributesArray ])->setOrientation('landscape'); - // Nome do arquivo PDF - $pdfFileName = $equipment->equipment_tag . '.pdf'; + // Nome do PDF com o número ISPT, sanitizado + $istpNumber = preg_replace('/[^a-zA-Z0-9_-]/', '_', $detailsEquipment->istp_number); + $pdfFileName = $istpNumber . '.pdf'; $pdfFilePath = $tempPath . $pdfFileName; // Salvar o PDF @@ -195,7 +316,7 @@ public function showAllEquipmentsInProjectForQrCode($projectId) $files[] = $pdfFilePath; } - // Criar arquivo ZIP e adicionar os PDFs gerados + // Criar ZIP com os PDFs $zip = new ZipArchive; if ($zip->open($zipPath, ZipArchive::CREATE) === TRUE) { foreach ($files as $file) { @@ -204,14 +325,17 @@ public function showAllEquipmentsInProjectForQrCode($projectId) $zip->close(); } - // Remover arquivos PDF individuais após criar o ZIP + // Limpar PDFs temporários foreach ($files as $file) { unlink($file); } - // Retornar o arquivo ZIP para download + // Retornar ZIP para download return response()->download($zipPath)->deleteFileAfterSend(true); - } + } + + + public function showDetailsEquipmentForQrCode($equipmentId, $projectId) { @@ -279,6 +403,7 @@ public function showDetailsEquipmentForQrCode($equipmentId, $projectId) // Gera e retorna o PDF com os detalhes e QR Codes return $pdfWrapper ->loadView('projectsClients.showDetailsEquipmentForQrCodePdf', [ + 'detailsCompanyProject' => $detailsCompanyProject, 'detailsEquipment' => $detailsEquipment, 'logoPath' => $logoPath, 'qrCodeImages' => $qrCodeImages, diff --git a/app/Http/Controllers/ProjectoDatacontroller.php b/app/Http/Controllers/ProjectoDatacontroller.php index caaa14d2..829774e4 100755 --- a/app/Http/Controllers/ProjectoDatacontroller.php +++ b/app/Http/Controllers/ProjectoDatacontroller.php @@ -1058,8 +1058,8 @@ public function projectDetails_11($projectID, $equipmentID) $specificAttributesArray[$attribute->general_attributes_equipment_id] = $attribute->specific_attributes_value; } - // 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) { + // talvez apenas ciar um if ja resolva, se vir da obra em status 1, 3 ou 4 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 || $detailsProject->order_project == 5 ) { // Cria um sistema de 1 a 3 , onde 1 e apenas 'ler', 2 apenas editar e 3 as 2 opcoes $portfolioOnlyreadOrEditToo = 3; @@ -1068,7 +1068,6 @@ public function projectDetails_11($projectID, $equipmentID) $portfolioOnlyreadOrEditToo = 1; } - //filteredTasks', 'OrdemTasks', 'DetailsTasks' campos vazios para ISV. return view('projectsClients.articulated_2_ShowEquipment', compact('detailsProject', 'detalsEquipment', 'filteredTasks', 'OrdemTasks', 'DetailsTasks', 'specificAttributesArray', 'receiveEquipmentWorkHistorys', 'portfolioOnlyreadOrEditToo')); diff --git a/app/Models/EquipmentTypeAttribute.php b/app/Models/EquipmentTypeAttribute.php new file mode 100644 index 00000000..2a21f63e --- /dev/null +++ b/app/Models/EquipmentTypeAttribute.php @@ -0,0 +1,30 @@ +belongsTo(EquipmentType::class, 'equipment_type_id'); + } + + public function attribute() + { + return $this->belongsTo(GeneralAttributesEquipment::class, 'attribute_id'); + } +} diff --git a/public/templateExcel/Valves_Template.xlsx b/public/templateExcel/Valves_Template.xlsx old mode 100755 new mode 100644 index 9438b91b..5b6b2b6a Binary files a/public/templateExcel/Valves_Template.xlsx and b/public/templateExcel/Valves_Template.xlsx differ diff --git a/public/templateExcel/Valves_Template1.xlsx b/public/templateExcel/Valves_Template1.xlsx index 3dc9baf7..9438b91b 100755 Binary files a/public/templateExcel/Valves_Template1.xlsx and b/public/templateExcel/Valves_Template1.xlsx differ diff --git a/resources/views/components/portfolio/portfolioAttributesForEquipments.blade copy.php b/resources/views/components/portfolio/portfolioAttributesForEquipments.blade copy.php new file mode 100755 index 00000000..55e3fcd4 --- /dev/null +++ b/resources/views/components/portfolio/portfolioAttributesForEquipments.blade copy.php @@ -0,0 +1,2695 @@ + +@if ($detalsEquipment->equipment_type_id == 1) + + + @if ($portfolioOnlyreadOrEditToo == 1 || $portfolioOnlyreadOrEditToo == 3) + {{-- Visualizar --}} +
+ +
+
+

CV

+
+ +
+ + + +
+ +
+
+ + +
+
+ +
+
+ + + + +
+
+ +
+ + + {{-- 3 inputs per line :equipmentSerialNumber, equipmentBrand, equipmentModel --}} +
+ +
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 3 inputs per line :dimension, rating, dim_right --}} +
+ +
+
+ + + + +
+
+ +
+
+ + + + +
+
+ +
+
+ + + + +
+
+
+ + + {{-- 3 inputs per line : main_equipment, p&id, sap_number --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 3 inputs per line : manufacturer, actuatorManufacturer, ActuatorModel --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 4 inputs per line : actuatorSerialNumber, positionerManufacturer, positionerSerialNumber, isolation --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 4 Selects per line : scaffolding, crane, interlocks, decontamination --}} +
+ +
+
+ + + + +
+
+ +
+
+ + + + + +
+
+ +
+
+ + + + +
+
+ +
+
+ + + + + +
+
+ +
+ + +
+
+ +
+ @endif + + + @if ($portfolioOnlyreadOrEditToo == 2 || $portfolioOnlyreadOrEditToo == 3) + {{-- Editar --}} +
+
+
+

CV - Editar

+
+
+ @csrf + + + +
+ + + +
+ +
+
+ + +
+
+ +
+
+ + + + +
+
+ +
+ + + +
+ +
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 3 inputs per line :dimension, rating, dim_right --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 3 inputs per line : main_equipment, p&id, sap_number --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 3 inputs per line : manufacturer, actuatorManufacturer, ActuatorModel --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 4 inputs per line : actuatorSerialNumber, positionerManufacturer, positionerSerialNumber, isolation --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ +
+ + + +
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + + +
+
+ + + + +
+
+ + +
+ + + +
+
+
+
+ @endif + + + +@elseif ($detalsEquipment->equipment_type_id == 2) + + @if ($portfolioOnlyreadOrEditToo == 1 || $portfolioOnlyreadOrEditToo == 3) + {{-- Visualizar --}} +
+ + {{-- ISV-card-visualizar --}} +
+
+

ISV - Visualizar

+
+ +
+ + +
+ +
+
+ + +
+
+ +
+
+ + + + +
+
+ +
+ + + {{-- 3 inputs per line :equipmentSerialNumber, equipmentBrand, equipmentModel --}} +
+ +
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 3 inputs per line :dimension, rating, dim_right --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ {{-- ./row --}} + + {{-- 3 inputs per line : main_equipment, p&id, sap_number --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 3 Inputs per line :material ,manufacturer ,isolation --}} +
+
+
+ + + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ {{-- ./row --}} + + {{-- 4 Selects per line : scaffolding, crane, interlocks, decontamination --}} +
+ +
+
+ + + + +
+
+ +
+
+ + + + + +
+
+ +
+
+ + + + +
+
+ +
+
+ + + + + +
+
+ +
+ + +
+ +
+ {{-- ./ISV-card-visualizar --}} + + + @if (isset($receiveEquipmentWorkHistorys)) + {{-- Âmbito-ISV - Visualizar --}} +
+ +
+

Âmbito : + {{ $receiveEquipmentWorkHistorys->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} + - Visualizar +

+
+ +
+
+ {{-- ./card-header --}} +
+
+
+

Lista de Tarefas Elementares : + {{ $receiveEquipmentWorkHistorys->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} +

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#Tarefas ElementaresSelecionar Tarefa +
TE1Desmontar da linha + +
TE2Descontaminar + +
TE4(3)Abertura da válvula, análise e controle dos componentes + +
TE5Limpeza e lavagem dos componentes + +
TE7(3)Fecho da válvula e substituição de componentes + +
TE14Ensaio + +
TE9Pintura + +
TE10Montagem na linha + +
TE11Inspeção Final + +
TE15Empancar (ISV) + +
+
+ + {{-- @livewire('articulado.additonal-task', ['equipment' => $detalsEquipment], key($detalsEquipment->equipment_id)) --}} + +
+ {{-- ./description --}} +
+ {{-- ./card-body --}} +
+ {{-- ./Ambito ISV - Visualizar --}} + @endif + +
+ {{-- Visualizar --}} + @endif + + + @if ($portfolioOnlyreadOrEditToo == 2 || $portfolioOnlyreadOrEditToo == 3) + {{-- Editar --}} +
+ + {{-- ISV-card-Editar --}} +
+
+

ISV - Editar

+
+ +
+ @csrf +
+ + + + +
+
+
+ + + + +
+
+ +
+
+ + + + +
+
+ +
+ + + {{-- 3 inputs per line :equipmentSerialNumber, equipmentBrand, equipmentModel --}} +
+ +
+
+ + + + +
+
+
+
+ + + + + {{-- --}} +
+
+
+
+ + + + + {{-- --}} +
+
+
+ + + {{-- 3 inputs per line :dimension, rating, dim_right --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ {{-- ./row --}} + + {{-- 3 inputs per line : main_equipment, p&id, sap_number --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 3 Inputs per line :material ,manufacturer ,isolation --}} +
+
+
+ + + + + +
+
+
+
+ + + + +
+
+ +
+
+ + + + +
+
+
+ {{-- ./row --}} + + {{-- 4 Selects per line : scaffolding, crane, interlocks, decontamination --}} +
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ +
+ + + +
+ + +
+ + +
+ {{-- ./ISV-card-Editar --}} + + + @if (isset($receiveEquipmentWorkHistorys)) + {{-- Âmbito-ISV - Editar --}} +
+ +
+

Âmbito : + {{ $receiveEquipmentWorkHistorys->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} + - Editar +

+
+ +
+
+ {{-- ./card-header --}} +
+
+
+

Lista de Tarefas Elementares : + {{ $receiveEquipmentWorkHistorys->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} +

+
+ +
+
+ @csrf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#Tarefas ElementaresSelecionar Tarefa +
TE1Desmontar da linha + + + +
TE2Descontaminar + + + +
TE4(3)Abertura da válvula, análise e controle dos componentes + + + +
TE5Limpeza e lavagem dos componentes + + + +
TE7(3)Fecho da válvula e substituição de componentes + + + +
TE14Ensaio + + + +
TE9Pintura + + + +
TE10Montagem na linha + + + +
TE11Inspeção Final + + + +
TE15Empancar (ISV) + + + +
+ + +
+
+ + @livewire('articulado.additonal-task', ['equipment' => $detalsEquipment], key($detalsEquipment->equipment_id)) + +
+ {{-- ./description --}} +
+ {{-- ./card-body --}} +
+ {{-- ./Ambito ISV - Editar --}} + @endif + + + {{-- Editar --}} + @endif + + + +@elseif ($detalsEquipment->equipment_type_id == 3) + + + @if ($portfolioOnlyreadOrEditToo == 1 || $portfolioOnlyreadOrEditToo == 3) + {{-- Visualizar --}} +
+ {{-- ./PSV-card --}} +
+
+

PSV

+
+ +
+ + +
+ +
+
+ + +
+
+ +
+
+ + + + +
+
+ +
+ + + {{-- 3 inputs per line :equipmentSerialNumber, equipmentBrand, equipmentModel --}} +
+ +
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 3 inputs per line : main_equipment, p&id, sap_number --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ + + {{-- 3 inputs per line : area, classe, type_of_fluid --}} +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + {{-- 3 inputs per line : manufacturer, construction_year, material --}} +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + {{-- 2 inputs per line : isolation, scaffolding --}} +
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + {{-- 3 inputs per line : crane,interlocks,decontamination --}} +
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ +
+ +
+ {{-- ./PSV-card --}} + + + @if (isset($receiveEquipmentWorkHistorys)) + {{-- Âmbito-PSV-Visualizar --}} +
+ +
+

Âmbito : + {{ $receiveEquipmentWorkHistorys->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} + - Visualizar +

+
+ +
+
+ {{-- ./card-header --}} +
+
+
+

Lista de Tarefas Elementares : + {{ $receiveEquipmentWorkHistorys->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} +

+
+ +
+ + + + + + + + {{-- --}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#Tarefas ElementaresSelecionar Tarefa + Inspecionar
TE1Desmontar da linha + +
TE2Descontaminar + +
TE3Pŕe-Teste + +
TE4Abertura da válvula, análise e controle dos + componentes + +
TE5Limpeza e lavagem dos componentes + +
TE6Retificação e lapidação + +
TE7Fecho da válvula e substituição de + componentes + +
TE8Calibrar e certificar + +
TE9Pintura + +
TE10Montagem na linha + +
TE10.1Confirmação de ligação + +
TE11Inspeção Final + +
+
+ + {{-- @livewire('articulado.additonal-task', ['equipment' => $detalsEquipment], key($detalsEquipment->equipment_id)) --}} + +
+ {{-- ./description --}} +
+ {{-- ./card-body --}} +
+ @endif + +
+ {{--./Visualizar --}} + @endif + + + @if ($portfolioOnlyreadOrEditToo == 2 || $portfolioOnlyreadOrEditToo == 3) + {{-- Editar-PSV --}} +
+ +
+
+

PSV

+
+ + +
+ @csrf +
+ + + + +
+
+
+ + + + +
+
+ +
+
+ + + + +
+
+
+ + {{-- 3 inputs per line :equipmentSerialNumber, equipmentBrand, equipmentModel --}} +
+ +
+
+ + + + +
+
+
+
+ + + + + {{-- --}} +
+
+
+
+ + + + + {{-- --}} +
+
+
+ + + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ +
+ + +
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + + +
+
+ +
+ + @if (isset($receiveEquipmentWorkHistorys)) + {{-- Âmbito-PSV-Editar --}} +
+ +
+

Âmbito : + {{ $receiveEquipmentWorkHistorys->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} + - Editar +

+
+ +
+
+ {{-- ./card-header --}} +
+
+
+

Lista de Tarefas Elementares : + {{ $receiveEquipmentWorkHistorys->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} +

+
+ +
+ +
+ @csrf + + + + + + + {{-- --}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{-- Apenas para ver se recebe um on ou off, o hidden serve para devolver valor se o checkbox não estiver a 'checked' --}} + + + + + + + + + + + + + + +
#Tarefas ElementaresSelecionar Tarefa + Inspecionar
TE1Desmontar da linha + + + +
TE2Descontaminar + + + +
TE3Pŕe-Teste + + + +
TE4Abertura da válvula, análise e controle dos + componentes + + + +
TE5Limpeza e lavagem dos componentes + + + +
TE6Retificação e lapidação + + + +
TE7Fecho da válvula e substituição de + componentes + + + +
TE8Calibrar e certificar + + + +
TE9Pintura + + + +
TE10Montagem na linha + + + +
TE10.1Confirmação de ligação + + + +
TE11Inspeção Final + + + +
+ + + +
+ +
+ + @livewire('articulado.additonal-task', ['equipment' => $detalsEquipment], key($detalsEquipment->equipment_id)) + +
+ {{-- ./description --}} +
+ {{-- ./card-body --}} +
+ @endif +
+ {{-- ./Editar-PSV --}} + @endif + +@endif + + + + + + + + + + + + + + + + diff --git a/resources/views/components/portfolio/portfolioAttributesForEquipments.blade.php b/resources/views/components/portfolio/portfolioAttributesForEquipments.blade.php index 498eee13..86f27f06 100755 --- a/resources/views/components/portfolio/portfolioAttributesForEquipments.blade.php +++ b/resources/views/components/portfolio/portfolioAttributesForEquipments.blade.php @@ -10,8 +10,8 @@

CV

-
+
@@ -19,8 +19,8 @@
- + - {{-- 3 inputs per line :dimension, rating, dim_right --}} -
- -
-
- - - - -
-
- -
-
- - - - -
-
- -
-
- - - - -
-
-
- - {{-- 3 inputs per line : main_equipment, p&id, sap_number --}}
@@ -141,8 +97,9 @@ class="form-control card_inputs" id="equipmentSerialNumber" title="Main Equipment">
@@ -153,9 +110,9 @@ class="form-control card_inputs" id="equipmentSerialNumber" data-toggle="tooltip" title="P&ID"> + value="{{ $specificAttributesArray[9] ?? '' }}" + class="form-control card_inputs" id="p&id" placeholder="P&ID" + aria-label="P & id" aria-describedby="form-p&id" readonly>
@@ -165,173 +122,261 @@ class="form-control card_inputs" id="equipmentSerialNumber" title="Número Sap"> + value="{{ $specificAttributesArray[10] ?? '' }}" + class="form-control card_inputs" id="sap_number" placeholder="Nº SAP" + aria-label="Numero Sap" aria-describedby="form-sap_number" readonly>
- {{-- 3 inputs per line : manufacturer, actuatorManufacturer, ActuatorModel --}} + {{-- 3 inputs per line : area, classe, type_of_fluid --}}
+
- - + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + {{-- 3 inputs per line : manufacturer, construction_year, material --}} +
+ +
+
+ + + value="{{ $specificAttributesArray[22] ?? '' }}" + class="form-control card_inputs" id="manufacturer" placeholder="Fabricante" + aria-label="Fabricante" aria-describedby="form_manufacturer" readonly>
+ +
- - + + - +
+ +
- - + + - +
- - - {{-- 4 inputs per line : actuatorSerialNumber, positionerManufacturer, positionerSerialNumber, isolation --}} + + {{-- 2 inputs per line : isolation, scaffolding --}}
-
+ + +
- - - - -
-
-
-
- - - - -
-
-
-
- - - - -
-
-
-
- + + value="{{ $specificAttributesArray[23] ?? '' }}" + class="form-control card_inputs" id="isolation" placeholder="Isolamento" + aria-label="Isolamento" aria-describedby="form_isolation" readonly>
-
- - {{-- 4 Selects per line : scaffolding, crane, interlocks, decontamination --}} -
- -
+ +
- - + + value="{{ $specificAttributesArray[24] ?? '' }}" + class="form-control card_inputs" id="scaffolding" placeholder="Andaime" + aria-label="Andaime" aria-describedby="form_scaffolding" readonly>
- -
+
+ + {{-- 3 inputs per line : crane,interlocks,decontamination --}} +
+ + +
- - + + - + value="{{ $specificAttributesArray[25] ?? '' }}" + class="form-control card_inputs" id="crane" placeholder="Guindaste" + aria-label="Guindaste" aria-describedby="form_crane" readonly>
- -
+ + +
- - + + + value="{{ $specificAttributesArray[26] ?? '' }}" + class="form-control card_inputs" id="interlocks" placeholder="Intertravamentos" + aria-label="Intertravamentos" aria-describedby="form_interlocks" readonly>
- -
+ + +
- - + + - + value="{{ $specificAttributesArray[27] ?? '' }}" + class="form-control card_inputs" id="decontamination" placeholder="Descontaminação" + aria-label="Descontaminação" aria-describedby="form_decontamination" readonly> +
+
+
+ + +
+ +
+
+ + + +
+ +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
-
+ +
@@ -345,54 +390,50 @@ class="form-control card_inputs" id="equipmentSerialNumber"

CV - Editar

+
@csrf - - -
- - + + +
-
- - + +
- +
- + + id="equipmentDescription" placeholder="Descrição Equipamento..." + aria-label="Descrição Equipamento" aria-describedby="form-equipmentDescription">
-
- - + {{-- 3 inputs per line :equipmentSerialNumber, equipmentBrand, equipmentModel --}}
- + + {{-- --}}
@@ -423,59 +465,15 @@ class="form-control card_inputs" id="equipmentBrand" placeholder="Marca" value="{{ $detalsEquipment->equipment_model }}" class="form-control card_inputs" id="equipmentModel" placeholder="Modelo" aria-label="Serial Number Equipment" aria-describedby="form-equipmentModel"> + {{-- --}}
- {{-- 3 inputs per line :dimension, rating, dim_right --}} -
-
-
- - - - -
-
-
-
- - - - -
-
-
-
- - - - -
-
-
- - - {{-- 3 inputs per line : main_equipment, p&id, sap_number --}} +
+
@@ -484,251 +482,291 @@ class="form-control card_inputs" id="dim_right" + class="form-control" id="main_equipment" placeholder="Main Equipment" + aria-label="Main Equipment" aria-describedby="form_main_equipment">
+ +
- - + + + class="form-control" id="p_id" placeholder="P&ID" + aria-label="P&ID" aria-describedby="form_p_id">
+ +
- + + title="Número SAP"> + class="form-control" id="sap_number" placeholder="Nº SAP" + aria-label="Número SAP" aria-describedby="form_sap_number">
- - {{-- 3 inputs per line : manufacturer, actuatorManufacturer, ActuatorModel --}} +
+
- - + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + class="form-control" id="manufacturer" placeholder="Fabricante" + aria-label="Fabricante" aria-describedby="form_manufacturer">
+ +
- - + + - +
+ +
- - + + - +
- - {{-- 4 inputs per line : actuatorSerialNumber, positionerManufacturer, positionerSerialNumber, isolation --}} +
-
-
- - - - -
-
-
-
- - - - -
-
-
-
- - - - -
-
-
+
- + - + +
-
- - - -
- -
+
- - + - + +
- -
-
- - - - -
-
- - -
-
- - - - -
-
- - - -
-
- - - - -
-
- -
- - + +
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+
@endif @@ -736,6 +774,7 @@ class="form-control card_inputs" id="positionerSerialNumber" @elseif ($detalsEquipment->equipment_type_id == 2) + @if ($portfolioOnlyreadOrEditToo == 1 || $portfolioOnlyreadOrEditToo == 3) {{-- Visualizar --}} @@ -747,6 +786,7 @@ class="form-control card_inputs" id="positionerSerialNumber"

ISV - Visualizar

+
@@ -755,8 +795,8 @@ class="form-control card_inputs" id="positionerSerialNumber"
- + - {{-- 3 inputs per line :dimension, rating, dim_right --}} -
-
-
- - - - -
-
-
-
- - - - -
-
-
-
- - - - -
-
-
- {{-- ./row --}} - {{-- 3 inputs per line : main_equipment, p&id, sap_number --}}
@@ -874,8 +873,9 @@ class="form-control card_inputs" id="equipmentSerialNumber" title="Main Equipment">
@@ -886,9 +886,9 @@ class="form-control card_inputs" id="equipmentSerialNumber" data-toggle="tooltip" title="P&ID"> + value="{{ $specificAttributesArray[9] ?? '' }}" + class="form-control card_inputs" id="p&id" placeholder="P&ID" + aria-label="P & id" aria-describedby="form-p&id" readonly>
@@ -898,120 +898,185 @@ class="form-control card_inputs" id="equipmentSerialNumber" title="Número Sap"> + value="{{ $specificAttributesArray[10] ?? '' }}" + class="form-control card_inputs" id="sap_number" placeholder="Nº SAP" + aria-label="Numero Sap" aria-describedby="form-sap_number" readonly>
- {{-- 3 Inputs per line :material ,manufacturer ,isolation --}} + {{-- 3 inputs per line : area, classe, type_of_fluid --}}
-
+ +
- - + + - - +
-
+ + +
- - + + + +
+
+ + +
+
+ + + + +
+
+
+ + {{-- 3 inputs per line : manufacturer, construction_year, material --}} +
+ +
+
+ + + value="{{ $specificAttributesArray[22] ?? '' }}" + class="form-control card_inputs" id="manufacturer" placeholder="Fabricante" + aria-label="Fabricante" aria-describedby="form_manufacturer" readonly>
-
+ + +
- + + + + +
+
+ + +
+
+ + + + +
+
+
+ + {{-- 2 inputs per line : isolation, scaffolding --}} +
+ + +
+
+ + value="{{ $specificAttributesArray[23] ?? '' }}" + class="form-control card_inputs" id="isolation" placeholder="Isolamento" + aria-label="Isolamento" aria-describedby="form_isolation" readonly>
-
- {{-- ./row --}} - {{-- 4 Selects per line : scaffolding, crane, interlocks, decontamination --}} -
- -
+ +
- - + + value="{{ $specificAttributesArray[24] ?? '' }}" + class="form-control card_inputs" id="scaffolding" placeholder="Andaime" + aria-label="Andaime" aria-describedby="form_scaffolding" readonly>
- -
+
+ + {{-- 3 inputs per line : crane,interlocks,decontamination --}} +
+ + +
- - + + - + value="{{ $specificAttributesArray[25] ?? '' }}" + class="form-control card_inputs" id="crane" placeholder="Guindaste" + aria-label="Guindaste" aria-describedby="form_crane" readonly>
- -
+ + +
- - + + + class="form-control card_inputs" id="interlocks" placeholder="Intertravamentos" + aria-label="Intertravamentos" aria-describedby="form_interlocks" readonly>
- -
+ + +
- - + + - + class="form-control card_inputs" id="decontamination" placeholder="Descontaminação" + aria-label="Descontaminação" aria-describedby="form_decontamination" readonly>
-
-
+
{{-- ./ISV-card-visualizar --}} @@ -1191,12 +1256,13 @@ class="form-control card_inputs" id="decontamination"

ISV - Editar

+
@csrf
- + - +
@@ -1211,7 +1277,7 @@ class="form-control card_inputs" id="decontamination" aria-describedby="form-tagEquipment">
- +
@@ -1221,12 +1287,10 @@ class="form-control card_inputs" id="decontamination" + aria-label="Descrição Equipamento" aria-describedby="form-equipmentDescription">
-
- {{-- 3 inputs per line :equipmentSerialNumber, equipmentBrand, equipmentModel --}}
@@ -1273,249 +1337,228 @@ class="form-control card_inputs" id="equipmentModel" placeholder="Modelo"
- {{-- 3 inputs per line :dimension, rating, dim_right --}} -
-
-
- - - - -
-
-
-
- - - - -
-
-
-
- - - - -
-
-
- {{-- ./row --}} - - {{-- 3 inputs per line : main_equipment, p&id, sap_number --}} +
+
- + + class="form-control" id="main_equipment" placeholder="Main Equipment" + aria-label="Main Equipment" aria-describedby="form_main_equipment">
+ +
- - + + + class="form-control" id="p_id" placeholder="P&ID" + aria-label="P&ID" aria-describedby="form_p_id">
+ +
- - + + + class="form-control" id="sap_number" placeholder="Nº SAP" + aria-label="Número SAP" aria-describedby="form_sap_number">
- - {{-- 3 Inputs per line :material ,manufacturer ,isolation --}} +
-
+ +
- - + + - - +
-
+ + +
- - + + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + class="form-control" id="manufacturer" placeholder="Fabricante" + aria-label="Fabricante" aria-describedby="form_manufacturer">
- -
+ + +
- - + + - + +
+
+ + +
+
+ + + +
- {{-- ./row --}} - {{-- 4 Selects per line : scaffolding, crane, interlocks, decontamination --}} +
+ +
+
+ + + + +
+
+ -
+
- - + + - + +
- -
+
+ + +
+ + +
- - + + - + +
- -
+ +
- - + + - + +
-
+
- - + + - + +
-
- - - + + +
- - +
- +
{{-- ./ISV-card-Editar --}} @@ -1705,6 +1748,7 @@ class="fas fa-plus">

PSV

+
@@ -1782,101 +1826,6 @@ class="form-control card_inputs" id="equipmentSerialNumber"
- - - {{-- 3 inputs per line :dim_ent, dim_exit, dim_right --}} -
- -
-
- - - - -
-
- -
-
- - - - -
-
- -
-
- - - - -
-
- -
- - - {{-- 3 inputs per line : rating, rating_flange_mount, rating_flange_jusante --}} -
- -
-
- - - - -
-
- -
-
- - - - -
-
- -
-
- - - - -
-
- -
- - {{-- 3 inputs per line : main_equipment, p&id, sap_number --}}
@@ -1919,152 +1868,315 @@ class="form-control card_inputs" id="sap_number" placeholder="Nº SAP"
- {{-- 3 inputs per line :SP_(Bar)_Cold, Back_Presure_(Bar), manufacturer --}} + {{-- 3 inputs per line : area, classe, type_of_fluid --}}
- -
+ +
- - + + - +
- -
+ + +
- - + + - +
- -
+ + +
- - + + + +
+
+
+ + {{-- 3 inputs per line : manufacturer, construction_year, material --}} +
+ +
+
+ + + aria-label="Fabricante" aria-describedby="form_manufacturer" readonly>
- -
- - - {{-- 3 inputs per line : material, isolation, decontamination --}} -
- -
+ + +
- - + + + +
+
+ + +
+
+ + - + aria-label="Material" aria-describedby="form_material" readonly>
- -
+
+ + {{-- 2 inputs per line : isolation, scaffolding --}} +
+ + +
- + + aria-label="Isolamento" aria-describedby="form_isolation" readonly>
-
+ +
- - - - - -
-
- - -
- - - {{-- 3 Selects per line : scaffolding, crane, interlocks --}} -
- -
-
- - + + aria-label="Andaime" aria-describedby="form_scaffolding" readonly>
- -
+
+ + {{-- 3 inputs per line : crane,interlocks,decontamination --}} +
+ + +
- - + + - + class="form-control card_inputs" id="crane" placeholder="Guindaste" + aria-label="Guindaste" aria-describedby="form_crane" readonly>
- -
+ + +
- - + + + class="form-control card_inputs" id="interlocks" placeholder="Intertravamentos" + aria-label="Intertravamentos" aria-describedby="form_interlocks" readonly> +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + +
+ +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
-
+
{{-- ./PSV-card --}} @@ -2244,7 +2356,7 @@ class="form-control card_inputs" id="interlocks" placeholder="Bloqueios" @endif
- {{-- Visualizar --}} + {{--./Visualizar --}} @endif @@ -2261,9 +2373,9 @@ class="form-control card_inputs" id="interlocks" placeholder="Bloqueios"
@csrf
- + - +
@@ -2278,7 +2390,7 @@ class="form-control card_inputs" id="interlocks" placeholder="Bloqueios" aria-describedby="form-tagEquipment">
- +
@@ -2288,12 +2400,10 @@ class="form-control card_inputs" id="interlocks" placeholder="Bloqueios" + aria-label="Descrição Equipamento" aria-describedby="form-equipmentDescription">
-
- {{-- 3 inputs per line :equipmentSerialNumber, equipmentBrand, equipmentModel --}}
@@ -2340,335 +2450,365 @@ class="form-control card_inputs" id="equipmentModel" placeholder="Modelo"
- {{-- 3 inputs per line :dim_ent, dim_exit, dim_right --}} -
- -
-
- - - - -
-
- -
-
- - - - -
-
- -
-
- - - - -
-
- -
- - - {{-- 3 inputs per line : rating, rating_flange_mount, rating_flange_jusante --}} -
- -
-
- - - - -
-
- -
-
- - - - -
-
- -
-
- - - - -
-
- -
- - - {{-- 3 inputs per line : main_equipment, p&id, sap_number --}} +
+
- + + class="form-control" id="main_equipment" placeholder="Main Equipment" + aria-label="Main Equipment" aria-describedby="form_main_equipment">
+ +
- - + + + class="form-control" id="p_id" placeholder="P&ID" + aria-label="P&ID" aria-describedby="form_p_id">
+ +
- - + + + class="form-control" id="sap_number" placeholder="Nº SAP" + aria-label="Número SAP" aria-describedby="form_sap_number">
- - {{-- 3 inputs per line :SP_(Bar)_Cold, Back_Presure_(Bar), manufacturer --}} +
- -
+ +
- - + + - +
-
+ +
- - + + - +
-
+ +
- - + + + + +
+
+
+ + +
+ +
+
+ + + class="form-control" id="manufacturer" placeholder="Fabricante" + aria-label="Fabricante" aria-describedby="form_manufacturer"> +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ + +
+
+ + + + +
+
+ + +
+
+ + + +
- - {{-- 3 inputs per line : material, isolation, decontamination --}} +
- -
+ + +
- - + + - - +
- -
+ +
- - + + - + +
-
+
- - + + - + +
-
- - {{-- 3 Selects per line : scaffolding, psv_crane, interlocks --}} +
- - -
+ +
- - + + - +
- -
+ +
- - + + - +
- - -
-
- - - - -
-
-
- + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
+ +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+ + +
+
+ + + + +
+
+
+ + +
- +
@if (isset($receiveEquipmentWorkHistorys)) diff --git a/resources/views/projectsClients/showDetailsEquipmentForQrCodePdf.blade.php b/resources/views/projectsClients/showDetailsEquipmentForQrCodePdf.blade.php index 9e8984f3..d2902b54 100755 --- a/resources/views/projectsClients/showDetailsEquipmentForQrCodePdf.blade.php +++ b/resources/views/projectsClients/showDetailsEquipmentForQrCodePdf.blade.php @@ -4,7 +4,7 @@ - Card Example + Ficha Técnica - {{ $detailsEquipment->equipment_tag }} + @foreach ($associatedArray as $key => $value) @if ($detailsEquipment->equipmentType->equipment_type_id == 3) @@ -121,25 +90,30 @@
- *Nome da paragem + {{ $detailsCompanyProject->company_project_description }}
+ +
-
+
N.Ispt
-
- {{ $detailsEquipment->istp_number}} +
+ {{ $detailsEquipment->istp_number }}
+ +
-
+
Tag
-
+
{{ $detailsEquipment->equipment_tag }}
+
@@ -158,14 +132,14 @@
Dim.Entrada:
{{ $specificAttributesArray[4] ?? '###' }}
Rating:
-
{{ $specificAttributesArray[6] ?? '###' }}
+
{{ $specificAttributesArray[43] ?? '###' }}
Dim.Saida:
{{ $specificAttributesArray[5] ?? '###' }}
Rating:
-
{{ $specificAttributesArray[16] ?? '###' }}
+
{{ $specificAttributesArray[44] ?? '###' }}
@@ -177,28 +151,28 @@
Fluido:
{{ $specificAttributesArray[41] ?? '###' }}
Pressão:
-
{{ $specificAttributesArray[100] ?? '###' }}
+
{{ $specificAttributesArray[12] ?? '###' }}
C.pressão:
-
{{ $specificAttributesArray[100] ?? '###' }}
+
{{ $specificAttributesArray[13] ?? '###' }}
-
+
T.val:
-
+
PSV
-
+
Âmbito:
-
+
{{ $detailsEquipment->equipment_ambit}}
-
+
Área:
-
+
{{ $specificAttributesArray[35] ?? '###' }}
@@ -281,22 +255,22 @@
-
+
T.val:
-
+
CV
-
+
Âmbito:
-
+
{{ $detailsEquipment->equipment_ambit}}
-
+
Área:
-
+
{{ $specificAttributesArray[35] ?? '###' }}
@@ -381,22 +355,22 @@
-
+
T.val:
-
+
ISV
-
+
Âmbito:
-
+
{{ $detailsEquipment->equipment_ambit}}
-
+
Área:
-
+
{{ $specificAttributesArray[35] ?? '###' }}