From 91e57adef0cec13ca22d2d96081c19a5388c042e Mon Sep 17 00:00:00 2001 From: ygbanzato Date: Wed, 14 Feb 2024 08:04:25 +0000 Subject: [PATCH] Update Qrcodes --- .../Controllers/CreateProjectController.php | 121 +- .../Controllers/PreparedProjectController.php | 163 +- .../Controllers/ProjectoDatacontroller.php | 35 +- composer.json | 1 + composer.lock | 77 +- public/user_logos/1707839809.jpg | Bin 0 -> 12412 bytes resources/views/email/email.blade.php | 12 +- ...t-elemental-tasks-in-wonkstation.blade.php | 4 +- .../articulated_2_ShowEquipment.blade.php | 2168 +++++++++-------- .../projectsClients/preparedProject.blade.php | 169 +- ...wAllEquipmentsInProjectQrCodePdf.blade.php | 182 ++ ...showDetailsEquipmentForQrCodePdf.blade.php | 137 +- .../views/projectsClients/testRoute.blade.php | 188 +- .../projectsClients/workStation_3.blade.php | 13 +- routes/web.php | 1 + vendor/composer/autoload_classmap.php | 55 + vendor/composer/autoload_psr4.php | 1 + vendor/composer/autoload_static.php | 60 + vendor/composer/installed.json | 78 + vendor/composer/installed.php | 13 +- vendor/endroid/qr-code/LICENSE | 19 + vendor/endroid/qr-code/README.md | 215 ++ vendor/endroid/qr-code/assets/noto_sans.otf | Bin 0 -> 16427228 bytes vendor/endroid/qr-code/assets/open_sans.ttf | Bin 0 -> 217360 bytes vendor/endroid/qr-code/composer.json | 57 + .../Bacon/ErrorCorrectionLevelConverter.php | 21 + .../qr-code/src/Bacon/MatrixFactory.php | 32 + .../endroid/qr-code/src/Builder/Builder.php | 282 +++ .../qr-code/src/Builder/BuilderInterface.php | 63 + .../qr-code/src/Builder/BuilderRegistry.php | 25 + .../src/Builder/BuilderRegistryInterface.php | 12 + vendor/endroid/qr-code/src/Color/Color.php | 56 + .../qr-code/src/Color/ColorInterface.php | 23 + .../endroid/qr-code/src/Encoding/Encoding.php | 21 + .../src/Encoding/EncodingInterface.php | 10 + .../qr-code/src/ErrorCorrectionLevel.php | 13 + .../src/Exception/ValidationException.php | 23 + .../qr-code/src/ImageData/LabelImageData.php | 48 + .../qr-code/src/ImageData/LogoImageData.php | 149 ++ .../endroid/qr-code/src/Label/Font/Font.php | 32 + .../qr-code/src/Label/Font/FontInterface.php | 12 + .../qr-code/src/Label/Font/NotoSans.php | 23 + .../qr-code/src/Label/Font/OpenSans.php | 23 + vendor/endroid/qr-code/src/Label/Label.php | 89 + .../qr-code/src/Label/LabelAlignment.php | 12 + .../qr-code/src/Label/LabelInterface.php | 22 + .../qr-code/src/Label/Margin/Margin.php | 47 + .../src/Label/Margin/MarginInterface.php | 19 + vendor/endroid/qr-code/src/Logo/Logo.php | 69 + .../qr-code/src/Logo/LogoInterface.php | 16 + vendor/endroid/qr-code/src/Matrix/Matrix.php | 90 + .../src/Matrix/MatrixFactoryInterface.php | 12 + .../qr-code/src/Matrix/MatrixInterface.php | 22 + vendor/endroid/qr-code/src/QrCode.php | 126 + .../endroid/qr-code/src/QrCodeInterface.php | 27 + .../qr-code/src/RoundBlockSizeMode.php | 13 + .../qr-code/src/Writer/AbstractGdWriter.php | 211 ++ .../qr-code/src/Writer/BinaryWriter.php | 23 + .../qr-code/src/Writer/ConsoleWriter.php | 23 + .../qr-code/src/Writer/DebugWriter.php | 32 + .../endroid/qr-code/src/Writer/EpsWriter.php | 44 + .../endroid/qr-code/src/Writer/GifWriter.php | 23 + .../endroid/qr-code/src/Writer/PdfWriter.php | 139 ++ .../endroid/qr-code/src/Writer/PngWriter.php | 29 + .../src/Writer/Result/AbstractResult.php | 31 + .../src/Writer/Result/BinaryResult.php | 35 + .../src/Writer/Result/ConsoleResult.php | 69 + .../qr-code/src/Writer/Result/DebugResult.php | 74 + .../qr-code/src/Writer/Result/EpsResult.php | 28 + .../qr-code/src/Writer/Result/GdResult.php | 32 + .../qr-code/src/Writer/Result/GifResult.php | 21 + .../qr-code/src/Writer/Result/PdfResult.php | 32 + .../qr-code/src/Writer/Result/PngResult.php | 31 + .../src/Writer/Result/ResultInterface.php | 20 + .../qr-code/src/Writer/Result/SvgResult.php | 43 + .../qr-code/src/Writer/Result/WebPResult.php | 35 + .../endroid/qr-code/src/Writer/SvgWriter.php | 114 + .../src/Writer/ValidatingWriterInterface.php | 12 + .../endroid/qr-code/src/Writer/WebPWriter.php | 29 + .../qr-code/src/Writer/WriterInterface.php | 16 + 80 files changed, 5063 insertions(+), 1284 deletions(-) create mode 100644 public/user_logos/1707839809.jpg create mode 100644 resources/views/projectsClients/showAllEquipmentsInProjectQrCodePdf.blade.php create mode 100644 vendor/endroid/qr-code/LICENSE create mode 100644 vendor/endroid/qr-code/README.md create mode 100644 vendor/endroid/qr-code/assets/noto_sans.otf create mode 100644 vendor/endroid/qr-code/assets/open_sans.ttf create mode 100644 vendor/endroid/qr-code/composer.json create mode 100644 vendor/endroid/qr-code/src/Bacon/ErrorCorrectionLevelConverter.php create mode 100644 vendor/endroid/qr-code/src/Bacon/MatrixFactory.php create mode 100644 vendor/endroid/qr-code/src/Builder/Builder.php create mode 100644 vendor/endroid/qr-code/src/Builder/BuilderInterface.php create mode 100644 vendor/endroid/qr-code/src/Builder/BuilderRegistry.php create mode 100644 vendor/endroid/qr-code/src/Builder/BuilderRegistryInterface.php create mode 100644 vendor/endroid/qr-code/src/Color/Color.php create mode 100644 vendor/endroid/qr-code/src/Color/ColorInterface.php create mode 100644 vendor/endroid/qr-code/src/Encoding/Encoding.php create mode 100644 vendor/endroid/qr-code/src/Encoding/EncodingInterface.php create mode 100644 vendor/endroid/qr-code/src/ErrorCorrectionLevel.php create mode 100644 vendor/endroid/qr-code/src/Exception/ValidationException.php create mode 100644 vendor/endroid/qr-code/src/ImageData/LabelImageData.php create mode 100644 vendor/endroid/qr-code/src/ImageData/LogoImageData.php create mode 100644 vendor/endroid/qr-code/src/Label/Font/Font.php create mode 100644 vendor/endroid/qr-code/src/Label/Font/FontInterface.php create mode 100644 vendor/endroid/qr-code/src/Label/Font/NotoSans.php create mode 100644 vendor/endroid/qr-code/src/Label/Font/OpenSans.php create mode 100644 vendor/endroid/qr-code/src/Label/Label.php create mode 100644 vendor/endroid/qr-code/src/Label/LabelAlignment.php create mode 100644 vendor/endroid/qr-code/src/Label/LabelInterface.php create mode 100644 vendor/endroid/qr-code/src/Label/Margin/Margin.php create mode 100644 vendor/endroid/qr-code/src/Label/Margin/MarginInterface.php create mode 100644 vendor/endroid/qr-code/src/Logo/Logo.php create mode 100644 vendor/endroid/qr-code/src/Logo/LogoInterface.php create mode 100644 vendor/endroid/qr-code/src/Matrix/Matrix.php create mode 100644 vendor/endroid/qr-code/src/Matrix/MatrixFactoryInterface.php create mode 100644 vendor/endroid/qr-code/src/Matrix/MatrixInterface.php create mode 100644 vendor/endroid/qr-code/src/QrCode.php create mode 100644 vendor/endroid/qr-code/src/QrCodeInterface.php create mode 100644 vendor/endroid/qr-code/src/RoundBlockSizeMode.php create mode 100644 vendor/endroid/qr-code/src/Writer/AbstractGdWriter.php create mode 100644 vendor/endroid/qr-code/src/Writer/BinaryWriter.php create mode 100644 vendor/endroid/qr-code/src/Writer/ConsoleWriter.php create mode 100644 vendor/endroid/qr-code/src/Writer/DebugWriter.php create mode 100644 vendor/endroid/qr-code/src/Writer/EpsWriter.php create mode 100644 vendor/endroid/qr-code/src/Writer/GifWriter.php create mode 100644 vendor/endroid/qr-code/src/Writer/PdfWriter.php create mode 100644 vendor/endroid/qr-code/src/Writer/PngWriter.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/AbstractResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/BinaryResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/ConsoleResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/DebugResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/EpsResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/GdResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/GifResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/PdfResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/PngResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/ResultInterface.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/SvgResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/Result/WebPResult.php create mode 100644 vendor/endroid/qr-code/src/Writer/SvgWriter.php create mode 100644 vendor/endroid/qr-code/src/Writer/ValidatingWriterInterface.php create mode 100644 vendor/endroid/qr-code/src/Writer/WebPWriter.php create mode 100644 vendor/endroid/qr-code/src/Writer/WriterInterface.php diff --git a/app/Http/Controllers/CreateProjectController.php b/app/Http/Controllers/CreateProjectController.php index 53b6fcb1..2a0b3e45 100755 --- a/app/Http/Controllers/CreateProjectController.php +++ b/app/Http/Controllers/CreateProjectController.php @@ -227,7 +227,7 @@ public function addFurtherTasks(Request $request) $receiveEquipmentWorkHistory = EquipmentWorkHistory::where('equipment_id', $request->equipmentID) ->where('company_projects_id', $receiveDataEquipment->company_projects_id) ->first(); - + // *Para Criar uma nova Tarefa complementar deve ser a soma dos dados das 2 tabelas para dar o numero da proxima tarefa e assim o numero da TC // Obtenha a contagem de registros nas tabelas ElementalTasks e FurtherTasks @@ -537,28 +537,31 @@ public function removeProjectEquipment(Request $request) return back()->with('success', 'Equipamento retirado da obra !'); } - public function EditEquipment (Request $request) + public function EditEquipment(Request $request) { - dd($request); // Localiza o equipment pelo numberProject - $equipment = Equipment::find($request->equipmentId); + $dataEquipment = Equipment::where('equipment_tag', $request->tag)->first(); + + $receiveEquipmentWorkHistori = EquipmentWorkHistory::where('equipment_id', $dataEquipment->equipment_id) + ->where('company_projects_id', $dataEquipment->company_projects_id) + ->first(); // Atualiza os campos - $equipment->equipment_tag = $request->tag; - $equipment->equipment_description = $request->equipmentDescription; - $equipment->equipment_serial_number = $request->serialNumberEquipment; - $equipment->equipment_brand = $request->equipmentBrand; - $equipment->equipment_model = $request->equipmentModel; + $dataEquipment->equipment_tag = $request->tag; + $dataEquipment->equipment_description = $request->equipmentDescription; + $dataEquipment->equipment_serial_number = $request->serialNumberEquipment; + $dataEquipment->equipment_brand = $request->equipmentBrand; + $dataEquipment->equipment_model = $request->equipmentModel; - $equipment->save(); + $dataEquipment->save(); if ($request->input('attributes')) { foreach ($request->input('attributes') as $key => $value) { // Verifica se o valor é null e a chave é um número (correspondendo aos general_attributes_equipment_id) if ($value == null && is_numeric($key)) { // Procura o registro relevante em SpecificAttributesEquipmentType - $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $request->equipmentId) + $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $dataEquipment->equipment_id) ->where('general_attributes_equipment_id', $key) ->first(); @@ -571,7 +574,7 @@ public function EditEquipment (Request $request) elseif ($value !== null && is_numeric($key)) { // Procura o registro relevante em SpecificAttributesEquipmentType - $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $request->equipmentId) + $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $dataEquipment->equipment_id) ->where('general_attributes_equipment_id', $key) ->first(); @@ -584,8 +587,8 @@ public function EditEquipment (Request $request) else { // Cria um novo registro em SpecificAttributesEquipmentType $specificAttributes = new SpecificAttributesEquipmentType(); - $specificAttributes->equipment_id = $request->equipmentId; - $specificAttributes->equipment_type_id = $equipment->equipment_type_id; + $specificAttributes->equipment_id = $dataEquipment->equipment_id; + $specificAttributes->equipment_type_id = $dataEquipment->equipment_type_id; $specificAttributes->general_attributes_equipment_id = $key; $specificAttributes->specific_attributes_value = $value; $specificAttributes->save(); @@ -595,57 +598,67 @@ public function EditEquipment (Request $request) } + // dd($request); // Se não selecionar nenhuma tarefas ele devolve um erro , pois e necessario pelo menos uma - if (!in_array('on', $request->input('ordemTasks'))) { - return redirect()->back()->with('danger', 'É necessário selecionar pelo menos uma tarefa, Para o Equipamento : ' . $equipment->equipment_tag); - } - $executionOrder = 1; + // if (!in_array('on', $request->input('ordemTasks'))) { + // return redirect()->back()->with('danger', 'É necessário selecionar pelo menos uma tarefa, Para o Equipamento : ' . $equipment->equipment_tag); + // } + // $executionOrder = 1; - foreach ($request->input('ordemTasks') as $key => $value) { - $orderEquipmentTask = OrderEquipmentTasks::where('equipment_id', $request->equipmentId) - ->where('elemental_tasks_id', $key) - ->first(); + + // foreach ($request->input('ordemTasks') as $key => $value) { + // $orderEquipmentTask = OrderEquipmentTasks::where('equipment_id', $request->equipmentId) + // ->where('elemental_tasks_id', $key) + // ->first(); - if ($value == "on") { - if (!$orderEquipmentTask) { - $orderEquipmentTask = new OrderEquipmentTasks(); - $orderEquipmentTask->equipment_id = $request->equipmentId; - $orderEquipmentTask->elemental_tasks_id = $key; - } - $orderEquipmentTask->execution_order = $executionOrder; - $orderEquipmentTask->save(); + // if ($value == "on") { + // if (!$orderEquipmentTask) { + // if ($receiveEquipmentWorkHistori && $receiveEquipmentWorkHistori <> null) { + // $orderEquipmentTask = new OrderEquipmentTasks(); + // $orderEquipmentTask->equipment_id = $request->equipmentId; + // $orderEquipmentTask->elemental_tasks_id = $key; + // } - $executionOrder++; - } elseif ($value == "off" && $orderEquipmentTask) { - $orderEquipmentTask->delete(); - } - } + // } + // //Nal precisa mais indicar a ordem das tarefas pois ela agora nao vao ser feitas por ordem necessariamente + // $orderEquipmentTask->execution_order = null; + // $orderEquipmentTask->save(); + + // $executionOrder++; + // } elseif ($value == "off" && $orderEquipmentTask) { + // $orderEquipmentTask->delete(); + // } + // } - $executionOrder = 1; // Reinicia a contagem de ordem de execução - $remainingOrderEquipmentTasks = OrderEquipmentTasks::where('equipment_id', $request->equipmentId) - ->orderBy('execution_order', 'asc') - ->get(); + // // $executionOrder = 1; // Reinicia a contagem de ordem de execução + // $remainingOrderEquipmentTasks = OrderEquipmentTasks::where('equipment_id', $request->equipmentId) + // ->orderBy('execution_order', 'asc') + // ->get(); - foreach ($remainingOrderEquipmentTasks as $orderEquipmentTask) { - $orderEquipmentTask->execution_order = $executionOrder; - $orderEquipmentTask->save(); - $executionOrder++; - } + // foreach ($remainingOrderEquipmentTasks as $orderEquipmentTask) { + // $orderEquipmentTask->execution_order = null; + // $orderEquipmentTask->save(); + // $executionOrder++; + // } - $orderTasks = OrderEquipmentTasks::where('equipment_id', $request->equipmentId) - ->orderBy('execution_order', 'asc') - ->get(); + // $orderTasks = OrderEquipmentTasks::where('equipment_id', $request->equipmentId) + // ->orderBy('execution_order', 'asc') + // ->get(); - $taskExecutionOrders = []; - foreach ($orderTasks as $task) { - $taskExecutionOrders[$task->elemental_tasks_id] = $task->execution_order; - } + // $taskExecutionOrders = []; + // foreach ($orderTasks as $task) { + // $taskExecutionOrders[$task->elemental_tasks_id] = $task->execution_order; + // } // Retorna uma resposta - return redirect()->route('articulated_2', ['id' => $request->numberProject]) - ->with('success', 'Equipamento ' . $equipment->equipment_tag . ' Editado com Sucesso!!!') - ->with('taskExecutionOrders', $taskExecutionOrders); + // return redirect()->route('articulated_2', ['id' => $request->numberProject]) + // ->with('success', 'Equipamento ' . $dataEquipment->equipment_tag . ' Editado com Sucesso!!!'); + // ->with('taskExecutionOrders', $taskExecutionOrders); + + // return back()->with('success', 'Ação concluída com sucesso!') + return back(); + } public function showJson($id) diff --git a/app/Http/Controllers/PreparedProjectController.php b/app/Http/Controllers/PreparedProjectController.php index ef8acedd..d5ed39d9 100755 --- a/app/Http/Controllers/PreparedProjectController.php +++ b/app/Http/Controllers/PreparedProjectController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use App\Models\EquipmentWorkHistory; +use App\Models\QrcodesAssociatedEquipment; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -19,48 +21,170 @@ use Mpdf\Mpdf; +use Endroid\QrCode\QrCode; +use Endroid\QrCode\Writer\PngWriter; + class PreparedProjectController extends Controller { - // public function showDetailsEquipmentForQrCode($equipmentId,$projectId){ - // // dd($equipmentId); - // $detailsEquipment = Equipment::find($equipmentId); + // public function showAllEquipmentsInProjectForQrCode($projectId) + // { + // $equipments = Equipment::where('company_projects_id', $projectId)->get(); // $userLogoPath = Auth::user()->user_logo ? asset('user_logos/' . Auth::user()->user_logo) : asset('user_logos/logoISPT4.0.jpg'); - // // dd($detailsEquipment); - // $pdf = PDF::loadView('projectsClients.showDetailsEquipmentForQrCodePdf',[ - // 'detailsEquipment' => $detailsEquipment, - // 'userLogoPath' => $userLogoPath - // ])->setPaper('a4'); - - // return $pdf->stream('teste.pdf'); + // $equipmentData = []; + // foreach ($equipments as $equipment) { + + // // Gera o QR Code para cada equipamento + // $qrCode = new QrCode($equipment->equipment_tag); + // $writer = new PngWriter(); + // $qrCodeImage = 'data:image/png;base64,' . base64_encode($writer->write($qrCode)->getString()); + + // // Busca equipamentos associados para cada equipamento + // $associatedEquipments = QrcodesAssociatedEquipment::where('equipment_id', $equipment->equipment_id)->get(); + // $associatedArray = []; + // foreach ($associatedEquipments as $associatedEquipment) { + // $associatedArray[$associatedEquipment->id] = $associatedEquipment->component_tag; + // } + + // // Adiciona os dados necessários para cada equipamento em um array + // $equipmentData[] = [ + // 'detailsEquipment' => $equipment, + // 'userLogoPath' => $userLogoPath, + // 'qrCodeImage' => $qrCodeImage, + // 'associatedArray' => $associatedArray + // ]; + // } + + // // Passa todos os dados dos equipamentos para a view + // $html = view('projectsClients.showAllEquipmentsForQrCodePdf', [ + // 'equipmentData' => $equipmentData, + // 'userLogoPath' => $userLogoPath, + // ])->render(); + + // // Define a orientação da folha como horizontal (Landscape) + // $mpdf = new \Mpdf\Mpdf([ + // 'mode' => 'utf-8', + // 'format' => 'A4-L' // Define o formato como A4 e orientação como Landscape (horizontal) + // ]); + // $mpdf->WriteHTML($html); + // $mpdf->Output('equipamentos_projeto_' . $projectId . '.pdf', 'I'); // } + public function showAllEquipmentsInProjectForQrCode($projectId) + { + $equipments = Equipment::where('company_projects_id', $projectId)->get(); + $userLogoPath = Auth::user()->user_logo ? asset('user_logos/' . Auth::user()->user_logo) : asset('user_logos/logoISPT4.0.jpg'); + + $equipmentData = []; + foreach ($equipments as $equipment) { + $qrCode = new QrCode($equipment->equipment_tag); + $writer = new PngWriter(); + $qrCodeImage = 'data:image/png;base64,' . base64_encode($writer->write($qrCode)->getString()); + + $associatedEquipments = QrcodesAssociatedEquipment::where('equipment_id', $equipment->equipment_id)->get(); + $associatedArray = []; + foreach ($associatedEquipments as $associatedEquipment) { + $associatedArray[$associatedEquipment->id] = $associatedEquipment->component_tag; + } + + $equipmentData[] = [ + 'equipment' => $equipment, + 'qrCodeImage' => $qrCodeImage, + 'associatedArray' => $associatedArray + ]; + } + + // dd($equipmentData); + + $html = view('projectsClients.showAllEquipmentsInProjectQrCodePdf', [ + 'equipmentData' => $equipmentData, + 'userLogoPath' => $userLogoPath + ])->render(); + + $mpdf = new \Mpdf\Mpdf([ + 'mode' => 'utf-8', + 'format' => 'A4' + ]); + $mpdf->WriteHTML($html); + $mpdf->Output('equipamentos_projeto_' . $projectId . '.pdf', 'I'); + } + + public function showDetailsEquipmentForQrCode($equipmentId, $projectId) { $detailsEquipment = Equipment::find($equipmentId); - // Determina o caminho do logo do usuário ou um padrão. - $userLogoPath = Auth::user()->user_logo ? asset('user_logos/' . Auth::user()->user_logo) : asset('user_logos/logoISPT4.0.jpg'); + + // Gera o QR Code + $qrCode = new QrCode($detailsEquipment->equipment_tag); + $writer = new PngWriter(); + + // Converte o QR Code para base64 para incorporar na página + $qrCodeImage = 'data:image/png;base64,' . base64_encode($writer->write($qrCode)->getString()); + + // $userLogoPath = Auth::user()->user_logo ? asset('user_logos/' . Auth::user()->user_logo) : asset('user_logos/logoISPT4.0.jpg'); + + $associatedEquipments = QrcodesAssociatedEquipment::where('equipment_id', $detailsEquipment->equipment_id)->get(); + + $associatedArray = []; + foreach ($associatedEquipments as $associatedEquipment) { + $associatedArray[$associatedEquipment->id] = $associatedEquipment->component_tag; + } + $html = view('projectsClients.showDetailsEquipmentForQrCodePdf', [ 'detailsEquipment' => $detailsEquipment, - 'userLogoPath' => $userLogoPath])->render(); - // Cria uma instância do mPDF - $mpdf = new Mpdf(); - // Escreve o HTML para o mPDF + // 'userLogoPath' => $userLogoPath, + 'qrCodeImage' => $qrCodeImage, + 'associatedArray' => $associatedArray + ])->render(); + + // Define a orientação da folha como horizontal (Landscape) + $mpdf = new \Mpdf\Mpdf([ + 'mode' => 'utf-8', + 'format' => 'A4' // Define o formato como A4 e orientação como Landscape (horizontal) + ]); $mpdf->WriteHTML($html); - // Gera o PDF no navegador $mpdf->Output('nome_do_arquivo.pdf', 'I'); } + public function PreparedProject($ProjectId) { $numberProject = CompanyProject::find($ProjectId); - $equipmentsProjects = Equipment::all()->where('company_projects_id', $ProjectId); - $equipmentsTypes = EquipmentType::all(); + // Carrega todos os equipamentos para um dado projeto + $equipmentsProjects = Equipment::where('company_projects_id', $ProjectId)->get(); + + // Carrega as relações aninhadas + $equipmentsProjects->load('equipmentWorkHistory.equipmentAssociationAmbit.ambitsEquipment'); + + // Adiciona o 'ambits_description' a cada equipamento + foreach ($equipmentsProjects as $equipment) { + // Obtém o primeiro EquipmentWorkHistory (se existir) + $equipmentWorkHistory = $equipment->equipmentWorkHistory->first(); + + // Se existe um EquipmentWorkHistory, tenta obter o 'ambits_description' + if ($equipmentWorkHistory) { + // Tenta obter o EquipmentAssociationAmbit e o AmbitsEquipment relacionados + $equipmentAssociationAmbit = $equipmentWorkHistory->equipmentAssociationAmbit; + if ($equipmentAssociationAmbit) { + $ambitsEquipment = $equipmentAssociationAmbit->ambitsEquipment; + if ($ambitsEquipment) { + // Se existir um AmbitsEquipment, define o 'ambits_description' + $equipment->ambits_description = $ambitsEquipment->ambits_description; + } + } + } + + // Se alguma das relações não existir, define 'ambits_description' como null + if (!isset($equipment->ambits_description)) { + $equipment->ambits_description = null; + } + } + //Retorna todas as Fabricas Unit, com base na Instalação $checkUnits = DB::table('units') ->join('plants', 'units.plant_id', '=', 'plants.plant_id') @@ -71,7 +195,6 @@ public function PreparedProject($ProjectId) // dd($equipmentsProjects); return view('projectsClients/preparedProject') - // ->with('equipmentsProjects', $equipmentsProjects) ->with('equipmentsTypes', $equipmentsTypes) ->with('units', $checkUnits) ->with('numberProject', $numberProject) diff --git a/app/Http/Controllers/ProjectoDatacontroller.php b/app/Http/Controllers/ProjectoDatacontroller.php index f6ebcb7b..1ee186d2 100755 --- a/app/Http/Controllers/ProjectoDatacontroller.php +++ b/app/Http/Controllers/ProjectoDatacontroller.php @@ -290,24 +290,39 @@ public function projectDetails_11($projectID, $equipmentID) $dataEquipment = Equipment::find($equipmentID); - $detailsEquipmentWorkHistory = EquipmentWorkHistory::where('equipment_id',$dataEquipment->equipment_id)->first(); + $detailsEquipmentWorkHistory = EquipmentWorkHistory::where('equipment_id', $dataEquipment->equipment_id)->first(); $receiveEquipmentWorkHistorys = EquipmentWorkHistory::where('equipment_id', $equipmentID) ->where('company_projects_id', $projectID) ->first(); $attributes = SpecificAttributesEquipmentType::where('equipment_id', $equipmentID)->get(); // recebe todos os atributos espesificos do equipamento - $OrdemTasks = OrderEquipmentTasks::where('equipmentWorkHistorys_id', $receiveEquipmentWorkHistorys->equipmentWorkHistorys_id)->get(); // Todas as tarefas que o equipamento vai realizar : - $OrdemTasksIds = $OrdemTasks->pluck('elemental_tasks_id')->all(); // Array de IDs + $DetailsTasks = OrderEquipmentTasks::where('equipmentWorkHistorys_id', $receiveEquipmentWorkHistorys->equipmentWorkHistorys_id)->get(); // Todas as tarefas que o equipamento vai realizar : + // $OrdemTasks = $DetailsTasks->pluck('elemental_tasks_id')->all(); // Array de IDs + $OrdemTasks = $DetailsTasks->pluck('execution_order', 'elemental_tasks_id')->all(); + // Ajuste para definir 'on' para cada tarefa + $OrdemTasks = $DetailsTasks->mapWithKeys(function ($task) { + return [$task->elemental_tasks_id => 'on']; + })->all(); - return view('projectsClients.articulated_2_ShowEquipment', compact('dataEquipment', 'OrdemTasks', 'OrdemTasksIds','detailsEquipmentWorkHistory')); - } + $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $dataEquipment->equipment_id)->get(); + $specificAttributesArray = []; + + foreach ($specificAttributes as $attribute) { + $specificAttributesArray[$attribute->general_attributes_equipment_id] = $attribute->specific_attributes_value; + } + // dd($OrdemTasks); + + return view('projectsClients.articulated_2_ShowEquipment', compact('dataEquipment', 'OrdemTasks', 'DetailsTasks', 'detailsEquipmentWorkHistory','specificAttributesArray')); + } //Funcao que recebe a Acoes do dataTables do portifolio. public function articulated_22($equipmentID) { + //Nao esta recebendo os selects + // $dataEquipment = Equipment::find($equipmentID); // $detailsEquipmentWorkHistory = EquipmentWorkHistory::where('equipment_id',$equipmentID)->first(); @@ -336,7 +351,15 @@ public function articulated_22($equipmentID) } } - return view('projectsClients.testRoute', compact('dataEquipment', 'receiveAlldetailsEquipmentWorkHistory')); + $specificAttributes = SpecificAttributesEquipmentType::where('equipment_id', $dataEquipment->equipment_id)->get(); + + $specificAttributesArray = []; + + foreach ($specificAttributes as $attribute) { + $specificAttributesArray[$attribute->general_attributes_equipment_id] = $attribute->specific_attributes_value; + } + + return view('projectsClients.testRoute', compact('dataEquipment', 'receiveAlldetailsEquipmentWorkHistory','specificAttributesArray')); } diff --git a/composer.json b/composer.json index b0bc0201..f0ccd2dd 100755 --- a/composer.json +++ b/composer.json @@ -7,6 +7,7 @@ "require": { "php": "^8.1", "barryvdh/laravel-dompdf": "^2.0", + "endroid/qr-code": "^5.0", "guzzlehttp/guzzle": "^7.5", "laravel/fortify": "^1.17", "laravel/framework": "^10.8", diff --git a/composer.lock b/composer.lock index ceefe5f5..7da93749 100755 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "64083e5824273dda380cfc7b6f6c0897", + "content-hash": "c3621371ed5b5bd7d608e988583189cb", "packages": [ { "name": "bacon/bacon-qr-code", @@ -675,6 +675,81 @@ ], "time": "2023-01-14T14:17:03+00:00" }, + { + "name": "endroid/qr-code", + "version": "5.0.4", + "source": { + "type": "git", + "url": "https://github.com/endroid/qr-code.git", + "reference": "0efd071a3640af323e23c94122fe92cfd5199833" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/endroid/qr-code/zipball/0efd071a3640af323e23c94122fe92cfd5199833", + "reference": "0efd071a3640af323e23c94122fe92cfd5199833", + "shasum": "" + }, + "require": { + "bacon/bacon-qr-code": "^2.0.5", + "php": "^8.1" + }, + "conflict": { + "khanamiryan/qrcode-detector-decoder": "^1.0.6" + }, + "require-dev": { + "endroid/quality": "dev-main", + "ext-gd": "*", + "khanamiryan/qrcode-detector-decoder": "^1.0.4||^2.0.2", + "setasign/fpdf": "^1.8.2" + }, + "suggest": { + "ext-gd": "Enables you to write PNG images", + "khanamiryan/qrcode-detector-decoder": "Enables you to use the image validator", + "roave/security-advisories": "Makes sure package versions with known security issues are not installed", + "setasign/fpdf": "Enables you to use the PDF writer" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "5.x-dev" + } + }, + "autoload": { + "psr-4": { + "Endroid\\QrCode\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeroen van den Enden", + "email": "info@endroid.nl" + } + ], + "description": "Endroid QR Code", + "homepage": "https://github.com/endroid/qr-code", + "keywords": [ + "code", + "endroid", + "php", + "qr", + "qrcode" + ], + "support": { + "issues": "https://github.com/endroid/qr-code/issues", + "source": "https://github.com/endroid/qr-code/tree/5.0.4" + }, + "funding": [ + { + "url": "https://github.com/endroid", + "type": "github" + } + ], + "time": "2023-12-24T13:47:07+00:00" + }, { "name": "ezyang/htmlpurifier", "version": "v4.16.0", diff --git a/public/user_logos/1707839809.jpg b/public/user_logos/1707839809.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ce91928d0f401447090aff08728e76d05dcb677a GIT binary patch literal 12412 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 Email + + @@ -17,7 +24,10 @@

Agradecemos a sua atenção e ficamos ao dispor para qualquer esclarecimento.

Com os melhores cumprimentos,

Ispt4.0

- + Imagem ISPT 4.0 + + {{-- Imagem ISPT 4.0 --}} diff --git a/resources/views/livewire/articulado/select-elemental-tasks-in-wonkstation.blade.php b/resources/views/livewire/articulado/select-elemental-tasks-in-wonkstation.blade.php index 18b2193d..c36d07ed 100755 --- a/resources/views/livewire/articulado/select-elemental-tasks-in-wonkstation.blade.php +++ b/resources/views/livewire/articulado/select-elemental-tasks-in-wonkstation.blade.php @@ -17,7 +17,7 @@ value="{{ json_encode($receiveElementalTasks) }}">
-

Nome Posto de Trabalho :

+

Nome Posto de Trabalho :

@@ -52,7 +52,6 @@ @endif
-
@if (count($receiveElementalTasks['3']) > 0)
@@ -183,7 +182,6 @@
@endif -
{{-- ./row --}}
{{-- ./col-sm-6 --}}
{{-- ./row --}} diff --git a/resources/views/projectsClients/articulated_2_ShowEquipment.blade.php b/resources/views/projectsClients/articulated_2_ShowEquipment.blade.php index 5e3c7ef1..976d1277 100755 --- a/resources/views/projectsClients/articulated_2_ShowEquipment.blade.php +++ b/resources/views/projectsClients/articulated_2_ShowEquipment.blade.php @@ -33,6 +33,7 @@
+ {{-- CV --}} @if ($dataEquipment->equipment_type_id == 1) {{-- Visualizar --}}
@@ -60,14 +61,16 @@ class="form-control card_inputs" id="equipmentTag"
- + @@ -79,14 +82,16 @@ class="form-control card_inputs" id="equipmentDescription"
- - + +
@@ -110,7 +115,8 @@ class="form-control card_inputs"
- + - + @@ -145,10 +153,10 @@ class="form-control card_inputs" id="dimension" style="color: #00B0EA;"> - {{-- --}}
@@ -160,11 +168,11 @@ class="form-control card_inputs" id="rating" style="color: #00B0EA;"> - {{-- --}}
@@ -179,10 +187,10 @@ class="form-control card_inputs" id="dim_certa" style="color: #00B0EA;"> - {{-- --}}
@@ -193,10 +201,10 @@ class="form-control card_inputs" id="main_equipment" style="color: #00B0EA;"> - {{-- --}}
@@ -207,10 +215,10 @@ class="form-control card_inputs" id="p&id" style="color: #00B0EA;"> - {{-- --}}
@@ -225,25 +233,26 @@ class="form-control card_inputs" id="sap_number" style="color: #00B0EA;"> - {{-- --}}
- + - {{-- --}}
@@ -253,11 +262,11 @@ class="form-control card_inputs" - {{-- --}}
@@ -266,44 +275,51 @@ class="form-control card_inputs" id="isolation"
- - + + - {{-- --}}
- + - {{-- --}}
- - + + - {{-- --}}
@@ -315,15 +331,16 @@ class="form-control card_inputs" id="actuatorSerialNumber" - + - {{-- --}}
@@ -331,15 +348,16 @@ class="form-control card_inputs" - + - {{-- --}}
@@ -350,13 +368,16 @@ class="form-control card_inputs"
- + - + aria-describedby="form-scaffold" value="Sim" + readonly>
@@ -367,361 +388,394 @@ class="form-control card_inputs" id="scaffold" style="color: #00B0EA;"> - - - + aria-describedby="form-scaffold" value="Sim" + readonly>
{{-- ./row --}} + {{-- Editar --}}
-

CV

+

CV - Editar

-
- {{-- 2 inputs per line :equipmentTag ,equipmentDescription --}} -
-
-
- - - - +
+ @csrf +
+ {{-- 2 inputs per line :equipmentTag ,equipmentDescription --}} +
+
+
+ + + + +
+
+
+
+ + + + +
-
-
- - - - + {{-- ./row --}} + {{-- 3 inputs per line :serialNumberEquipment, equipmentBrand, equipmentModel --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
-
- {{-- ./row --}} - {{-- 3 inputs per line :serialNumberEquipment, equipmentBrand, equipmentModel --}} -
-
-
- - - - + {{-- ./row --}} + {{-- 3 inputs per line :equipmentDimension, equipmentRating, equipmentDimcerta --}} +
+
+
+ + + + +
-
-
-
- - - - -
-
-
-
- - - - -
-
-
- {{-- ./row --}} - {{-- 3 inputs per line :equipmentDimension, equipmentRating, equipmentDimcerta --}} -
-
-
- - - - -
-
-
-
- - - - - {{-- --}} +
+
+ + + + +
-
-
-
- - - - - {{-- --}} +
+
+ + + + +
+ {{-- ./row --}} + {{-- 3 Inputs per line :main_equipment ,P_idEquipment ,NumberSapEquipment --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ {{-- ./row --}} + {{-- 3 Inputs per line :materialEquipment ,manufacturerEquipment ,isolationEquipment --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ {{-- ./row --}} + {{-- 3 Inputs per line : actuatorManufacturer, --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ {{-- ./Row --}} + {{-- 2 Inputs per line : actuatorManufacturer, --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ {{-- ./row --}} + {{-- 2 Selects per line :scaffold, crane --}} +
+
+
+ + + + +
+
+
+
+ + + + +
+
+
+ {{-- ./row --}} +
- {{-- ./row --}} - {{-- 3 Inputs per line :main_equipment ,P_idEquipment ,NumberSapEquipment --}} -
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
- {{-- ./row --}} - {{-- 3 Inputs per line :materialEquipment ,manufacturerEquipment ,isolationEquipment --}} -
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
- {{-- ./row --}} - {{-- 3 Inputs per line : actuatorManufacturer, --}} -
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
- {{-- ./Row --}} - {{-- 2 Inputs per line : actuatorManufacturer, --}} -
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
- {{-- ./row --}} - {{-- 2 Selects per line :scaffold, crane --}} -
-
-
- - - - -
-
-
-
- - - - -
-
-
- {{-- ./row --}} -
+
@@ -763,150 +817,187 @@ class="form-control card_inputs" TE1 Desmontar da linha - - + + - {{-- - - --}} + + + + TE12 + Inspeção Final + + + + + TE2 Descontaminar - - + + - {{-- - - --}} + - TE4(3) + TE3(2) + Pŕe-Teste + + + + + + + + TE4(2) Abertura da válvula, análise e controle dos componentes - - + + - {{-- - - --}} + TE5 Limpeza e lavagem dos componentes - - + + - {{-- - - --}} + - - TE7(3) + TE7(2) Fecho da válvula e substituição de componentes - - + - {{-- - - --}} + - TE14 - Ensaio + TE13 + Teste final - - + - {{-- - - --}} + TE9 Pintura - - + - {{-- - - --}} + - TE10 + TE10(2) Montagem na linha {{-- Apenas para ver se recebe um on ou off, o hidden serve para devolver valor se o checkbox não estiver a 'checked' --}} - - + - {{-- - - --}} + + + + TE10.1 + Confirmação de ligação + {{-- Apenas para ver se recebe um on ou off, o hidden serve para devolver valor se o checkbox não estiver a 'checked' --}} + + + + + + + TE11 Inspeção Final - - + - {{-- - - --}} - - - TE15 - Empancar (ISV) - - - - - {{-- - - --}} +
-

Sem tarefas Complementares associadas

- + @livewire('articulado.additonal-task', ['equipment' => $dataEquipment], key($dataEquipment->equipment_id))
{{-- ./description --}}
{{-- ./card-body --}} - @livewire('articulado.additonal-task', ['equipment' => $dataEquipment], key($dataEquipment->equipment_id)) -
@endif @@ -914,9 +1005,10 @@ class="form-control card_inputs" @if ($dataEquipment->equipment_type_id == 2) {{-- Visualizar --}}
+
-

ISV3

+

ISV

@@ -940,7 +1032,7 @@ class="form-control inputsIspt" id="equipmentTag"
+ data-toggle="tooltip" title="Descrição Equipamento"> @@ -975,7 +1067,7 @@ class="form-control card_inputs"
+ data-toggle="tooltip" title="Marca Equipamento"> @@ -990,7 +1082,7 @@ class="form-control card_inputs"
+ data-toggle="tooltip" title="Modelo Equipamento">
+ data-toggle="tooltip" title="Dimensão"> - @@ -1021,11 +1114,12 @@ class="form-control card_inputs" id="dimension"
+ data-toggle="tooltip" title="Rating"> @@ -1034,10 +1128,12 @@ class="form-control card_inputs" id="rating"
- + data-toggle="tooltip" title="Dim certa"> +
- + data-toggle="tooltip" title="Main Equipment"> + @@ -1064,10 +1162,12 @@ class="form-control card_inputs" id="main_equipment"
- + data-toggle="tooltip" title="P&ID"> + @@ -1076,10 +1176,12 @@ class="form-control card_inputs" id="P_idEquipment"
- + data-toggle="tooltip" title="Numero SAP"> + @@ -1093,10 +1195,12 @@ class="form-control card_inputs" id="NumberSapEquipment"
- + data-toggle="tooltip" title="Material"> + @@ -1105,11 +1209,12 @@ class="form-control card_inputs" id="materialEquipment"
- +
- + data-toggle="tooltip" title="Isolamento"> +
- + title="Andaime"> + - + aria-describedby="form-scaffold" value="Sim" readonly>
- - + - + aria-describedby="form-scaffold" value="Sim" readonly>
@@ -1169,18 +1274,19 @@ class="form-control card_inputs" id="crane"
+
{{-- Editar --}}
-
-

ISV

+

ISV - Editar

+
+ @csrf
- {{-- 2 inputs per line :equipmentTag ,equipmentDescription --}}
@@ -1195,23 +1301,23 @@ class="form-control card_inputs" id="crane" class="form-control inputsIspt" id="equipmentTag" placeholder="Tag..." aria-label="Tag Equipment" aria-describedby="form-tagEquipment"> + {{-- --}}
- + + {{-- --}}
@@ -1221,9 +1327,8 @@ class="form-control card_inputs"
- + @@ -1239,7 +1344,7 @@ class="form-control card_inputs"
+ data-toggle="tooltip" title="Marca Equipamento"> @@ -1255,9 +1360,8 @@ class="form-control card_inputs"
- + data-toggle="tooltip" title="Modelo Equipamento"> +
- + data-toggle="tooltip" title="Dimensão"> + - - {{-- --}}
+ data-toggle="tooltip" title="Rating"> @@ -1304,11 +1408,12 @@ class="form-control card_inputs" id="rating"
- + data-toggle="tooltip" title="Dim certa"> +
- + - {{-- --}}
- + - {{-- --}}
- + - {{-- --}}
@@ -1371,41 +1476,41 @@ class="form-control card_inputs" id="NumberSapEquipment"
- + - {{-- --}}
- + - {{-- --}}
- + data-toggle="tooltip" title="Isolamento"> +
- + - - + + +
- - + - + +
{{-- ./row --}} +
+
+
{{-- Âmbito-ISV --}} -
+

Âmbito : {{ $detailsEquipmentWorkHistory->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} @@ -1488,27 +1597,30 @@ class="form-control card_inputs" id="isolationEquipment" TE1 Desmontar da linha - - + + < + {{-- - + + --}} + TE2 Descontaminar - - + + - {{-- - - --}} + TE4(3) @@ -1516,27 +1628,27 @@ class="form-control card_inputs" id="isolationEquipment" dos componentes - - + + - {{-- - - --}} + TE5 Limpeza e lavagem dos componentes - - + + - {{-- - - --}} + @@ -1544,98 +1656,109 @@ class="form-control card_inputs" id="isolationEquipment" Fecho da válvula e substituição de componentes - - + - {{-- - - --}} + TE14 Ensaio - - + - {{-- - - --}} + TE9 Pintura - - + - {{-- - - --}} + TE10 Montagem na linha {{-- Apenas para ver se recebe um on ou off, o hidden serve para devolver valor se o checkbox não estiver a 'checked' --}} - - + - {{-- - - --}} + TE11 Inspeção Final - - + - {{-- - - --}} + TE15 Empancar (ISV) - - + - {{-- - - --}} +

-

Sem tarefas Complementares associadas

- + @livewire('articulado.additonal-task', ['equipment' => $dataEquipment], key($dataEquipment->equipment_id))
{{-- ./description --}}
{{-- ./card-body --}} - @livewire('articulado.additonal-task', ['equipment' => $dataEquipment], key($dataEquipment->equipment_id))
@endif {{-- PSV --}} @if ($dataEquipment->equipment_type_id == 3) + {{-- Visualizar --}}
{{-- ./PSV-card --}} @@ -1650,22 +1773,20 @@ class="form-control card_inputs" id="isolationEquipment"
- +
- + @@ -1686,15 +1807,14 @@ class="form-control" id="equipmentDescription"
- + {{-- --}} @@ -1703,9 +1823,8 @@ class="form-control card_inputs"
- + {{-- --}}
@@ -1742,6 +1860,7 @@ class="form-control card_inputs" id="equipmentModel" data-toggle="tooltip" title="Dimensão"> @@ -1807,6 +1929,7 @@ class="form-control card_inputs" id="main_equipment" title="P&ID"> @@ -1820,6 +1943,7 @@ class="form-control card_inputs" id="p&id" data-toggle="tooltip" title="Número Sap"> @@ -1838,6 +1962,7 @@ class="form-control card_inputs" id="sap_number" data-toggle="tooltip" title="SP(Bar)"> @@ -1848,10 +1973,10 @@ class="form-control card_inputs" id="SP_(Bar)_Cold"
+ data-toggle="tooltip" title="Back_Presure_(Bar)"> @@ -1885,10 +2011,10 @@ class="form-control card_inputs" id="material" data-toggle="tooltip" title="Fabricante"> - {{-- --}}
@@ -1898,10 +2024,10 @@ class="form-control card_inputs" id="manufacturer" data-toggle="tooltip" title="Isolamento"> - {{-- --}}
@@ -1916,10 +2042,10 @@ class="form-control card_inputs" id="isolation" data-toggle="tooltip" title="Andaime"> + aria-describedby="form-isolation" readonly value='Nao'> {{-- --}}
@@ -1932,11 +2058,10 @@ class="form-control card_inputs" id="Scaffold" - {{-- --}} + aria-describedby="form-isolation" readonly value='Nao'>
@@ -1955,302 +2080,325 @@ class="form-control card_inputs" id="Crane"

PSV

-
+
+ @csrf +
-
-
-
- - - - +
+
+
+ + + + +
+
+ +
+
+ + + + +
+
+ +
+ {{--./row --}} + + {{-- 3 inputs per line :equipmentSerialNumber, equipmentBrand, equipmentModel --}} +
+
+
+ + + + + {{-- --}} +
+
+
+
+ + + + + {{-- --}} +
+
+
+
+ + + + + {{-- --}} +
+ {{-- ./row --}} -
-
- - - - + {{-- 3 inputs per line :equipmentDimension, equipmentRating, equipmentDimcerta --}} +
+
+
+ + + + + {{-- --}} +
+
+ +
+
+ + + + + {{-- --}} +
+
+ +
+
+ + + + + {{-- --}} +
+ {{-- ./row --}} + {{-- 3 inputs per line : main_equipment, p&id, sap_number --}} +
+
+
+ + + + + {{-- --}} +
+
+
+
+ + + + + {{-- --}} +
+
+
+
+ + + + + {{-- --}} +
+
+
+ {{-- ./row --}} + + {{-- 3 inputs per line :SP_(Bar)_Cold, Back_Presure_(Bar), material --}} +
+
+
+ + + + + {{-- --}} +
+
+
+
+ + + + + {{-- --}} +
+
+
+
+ + + + + + {{-- --}} +
+
+
+ {{-- ./row --}} + + {{-- 2 inputs per line : --}} +
+
+
+ + + + + {{-- --}} +
+
+
+
+ + + + + {{-- --}} +
+
+
+ {{-- ./row --}} + + {{-- 2 Selects per line :psv_scaffold, psv_crane --}} +
+
+
+ + + + + +
+
+
+
+ + + + +
+
+
+ {{-- ./row --}} + +
- - - {{-- 3 inputs per line :equipmentSerialNumber, equipmentBrand, equipmentModel --}} -
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
- {{-- ./row --}} - - {{-- 3 inputs per line :equipmentDimension, equipmentRating, equipmentDimcerta --}} -
-
-
- - - - - {{-- --}} -
-
- -
-
- - - - - {{-- --}} -
-
- -
-
- - - - - {{-- --}} -
-
-
- {{-- ./row --}} - - {{-- 3 inputs per line : main_equipment, p&id, sap_number --}} -
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
- {{-- ./row --}} - - {{-- 3 inputs per line :SP_(Bar)_Cold, Back_Presure_(Bar), material --}} -
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - - {{-- --}} -
-
-
- {{-- ./row --}} - - {{-- 2 inputs per line : --}} -
-
-
- - - - - {{-- --}} -
-
-
-
- - - - - {{-- --}} -
-
-
- {{-- ./row --}} - - {{-- 2 Selects per line :psv_scaffold, psv_crane --}} -
-
-
- - - - -
-
-
-
- - - - -
-
-
- {{-- ./row --}} -
- + +
{{-- ./Editar --}} @@ -2293,136 +2441,161 @@ class="form-control card_inputs" id="isolation" TE1 Desmontar da linha - - + + - {{-- - - --}} + TE2 Descontaminar - - + + - {{-- - - --}} + - TE4(3) - Abertura da válvula, análise e controle - dos + TE3 + Pŕe-Teste + + + + + + + + TE4 + Abertura da válvula, análise e controle dos componentes - - + + - {{-- - - --}} + TE5 Limpeza e lavagem dos componentes - - + + - {{-- - - --}} + - - TE7(3) + TE6 + Retificação e lapidação + + + + + + + + TE7 Fecho da válvula e substituição de componentes - - + - {{-- - - --}} + - TE14 - Ensaio + TE8 + Calibrar e certificar - - + - {{-- - - --}} + TE9 Pintura - - + - {{-- - - --}} + TE10 Montagem na linha {{-- Apenas para ver se recebe um on ou off, o hidden serve para devolver valor se o checkbox não estiver a 'checked' --}} - - + - {{-- - - --}} + + + + TE11 Inspeção Final - - + - {{-- - - --}} - - - TE15 - Empancar (ISV) - - - - - {{-- - - --}} + @@ -2430,9 +2603,6 @@ class="form-control card_inputs" id="isolation" @livewire('articulado.additonal-task', ['equipment' => $dataEquipment], key($dataEquipment->equipment_id)) - {{--

Sem tarefas Complementares associadas

--}} - -
{{-- ./description --}}
@@ -2440,14 +2610,8 @@ class="form-control card_inputs" id="isolation"
@endif - - - - - -
- +
diff --git a/resources/views/projectsClients/preparedProject.blade.php b/resources/views/projectsClients/preparedProject.blade.php index cea08b64..d172257f 100755 --- a/resources/views/projectsClients/preparedProject.blade.php +++ b/resources/views/projectsClients/preparedProject.blade.php @@ -1,6 +1,7 @@ @extends('Templates/templateAdmin') @section('Main-content') +
@@ -91,20 +92,19 @@
-
-
+
+ -
+ - -

@@ -116,9 +116,6 @@
- {{-- Nao tem motivos para funcionar nestas sutiacao, MAS FUNCIONA SEM ELE NAO APARECE OS QRCODES !!!! --}} - - @@ -154,14 +151,6 @@ - {{--
-
- -
-
--}}
- -
- - -
- - - @@ -230,7 +189,9 @@ class="btn btn-primary float-right">Alterar para Execussao
-
+ {{-- Para colocar os filtros a Funcionar, deve primeiro alterar a tabela para Yajra --}} + + {{--
-
+
--}} {{--
@@ -311,18 +272,17 @@ class="form-control">
- + - {{-- + {{-- --}} - {{-- Por algum motivo se tirar esta modal, ele nao encontra o qrcode do componente ?????????????? WHY????????? --}}
-
@@ -420,10 +379,10 @@ function printCard() {
- +
+ Imprimir Códigos QR +
+
-->
@@ -698,7 +658,7 @@ class="checkboxChoseTasksOficesCV" + /.modal-dialog --> @@ -708,8 +668,41 @@ class="checkboxChoseTasksOficesCV" + + + Alterar para Execussao + + + + @@ -800,31 +793,31 @@ class="checkboxChoseTasksOficesCV" + $('#TablePreparedProjectWorkstation').DataTable({ + autoWidth: false, + processing: true, + serverSide: true, + ajax: { + url: '/api/receiveWorkstationProject/' + $('#receiveNumberProject').val() + }, + columns: [{ + data: 'name_workstations', + name: 'name_workstations' + }, + { + data: 'nomenclature_workstation', + name: 'nomenclature_workstation' + }, + { + data: 'workstations_Association_Tasks', + name: 'workstations_Association_Tasks' + } + ] + }) + }) + + + {{-- Script para funcionar com dataTables yajra, futura implementacao com livewire --}} {{--
{{ $equipment->equipment_tag }} {{ $equipment->equipment_type_id }} {{ $equipment->unit->unit_name }}{{ $equipment->ambits_description }} + {{ $equipment->equipmentAssociationAmbit->ambitsEquipment->ambits_description }} --}} -