diff --git a/app/Http/Controllers/ExecutionProjectController.php b/app/Http/Controllers/ExecutionProjectController.php index a477d336..b1ce347e 100755 --- a/app/Http/Controllers/ExecutionProjectController.php +++ b/app/Http/Controllers/ExecutionProjectController.php @@ -515,21 +515,25 @@ public function receiveExecutionProject($ProjectId) $receivePlant = Plant::where('plant_id', $DatasProject->plant_id)->first(); $receiveCompany = Company::where('company_id', $receivePlant->company_id)->first(); + // Busca na model User $filteredUsers = User::where('type_users', 5) ->whereRaw("SUBSTRING_INDEX(user_name, '-', -1) = ?", [$DatasProject->company_projects_id]) - ->whereRaw("SUBSTRING_INDEX(SUBSTRING_INDEX(email, '@', 1), '-', 1) = ?", [$DatasProject->project_company_name]) + ->whereRaw("SUBSTRING_INDEX(SUBSTRING_INDEX(email, '@', 1), '-', 1) = ?", [$DatasProject->company_projects_id]) ->get(); + // Adicionando a nova coluna realPassword $filteredUsers->map(function ($user) { $user->realPassword = explode('@', $user->email)[0]; return $user; }); + // Busca todos os workstations relevantes $allWorkstations = ConstructionWorkstation::whereIn('name_workstations', $filteredUsers->pluck('user_name'))->get()->keyBy('name_workstations'); + // dd($allWorkstations); // Adicionando a nomenclatura de workstation aos usuários filtrados $filteredUsers->map(function ($user) use ($allWorkstations) { if (isset ($allWorkstations[$user->user_name])) { diff --git a/app/Http/Controllers/ProjectoDatacontroller.php b/app/Http/Controllers/ProjectoDatacontroller.php index 862dd51f..f87bcfa6 100755 --- a/app/Http/Controllers/ProjectoDatacontroller.php +++ b/app/Http/Controllers/ProjectoDatacontroller.php @@ -763,4 +763,8 @@ public function createComment(Request $request){ return back(); } + public function equipmentTaskDetailsPdf(){ + return view('projectsClients.pdf.equipmentTaskDetailsPdf'); + } + } diff --git a/app/Http/Middleware/CheckUserType.php b/app/Http/Middleware/CheckUserType.php index 0ace13ca..962ec651 100755 --- a/app/Http/Middleware/CheckUserType.php +++ b/app/Http/Middleware/CheckUserType.php @@ -79,7 +79,7 @@ protected function getAllowedRoutesForUserType($userType) 'createCompany','ShowPendingUser','register','download','projectDetails_11','editEquipment','EditprocessStep1','createWorkStations','workstationsAssociationTasks','finishCreatingProject', 'preparedProject','EditProjectForArticulated','companyEdit','reportingDataClient','ExecutionProject', 'changeFromExecutionToPlanning','deleteWorkstation','deleteProject','showQrcodesInProject','showDataDetailsProjectClient', - 'getDataAmbitsOfProject', 'showReportingForAmbitsProject','getEquipmentsOfAmbit','getDataEquipmentsOfProject','removingElementalTasksFromProject', + 'getDataAmbitsOfProject', 'showReportingForAmbitsProject','getEquipmentsOfAmbit','getDataEquipmentsOfProject','removingElementalTasksFromProject','equipmentTaskDetailsPdf', ]; diff --git a/public/receiveImagesControlEquipmentWorkstation/2013_3686/img1.png b/public/receiveImagesControlEquipmentWorkstation/2013_3686/img1.png new file mode 100644 index 00000000..920ab238 Binary files /dev/null and b/public/receiveImagesControlEquipmentWorkstation/2013_3686/img1.png differ diff --git a/public/receiveImagesControlEquipmentWorkstation/2013_3686/img2.png b/public/receiveImagesControlEquipmentWorkstation/2013_3686/img2.png new file mode 100644 index 00000000..f3cea75b Binary files /dev/null and b/public/receiveImagesControlEquipmentWorkstation/2013_3686/img2.png differ diff --git a/public/receiveImagesControlEquipmentWorkstation/2013_3686/img3.png b/public/receiveImagesControlEquipmentWorkstation/2013_3686/img3.png new file mode 100644 index 00000000..9c55ca07 Binary files /dev/null and b/public/receiveImagesControlEquipmentWorkstation/2013_3686/img3.png differ diff --git a/resources/views/projectsClients/articulated_2.blade.php b/resources/views/projectsClients/articulated_2.blade.php index b5f7dc2e..d7f3bf3f 100755 --- a/resources/views/projectsClients/articulated_2.blade.php +++ b/resources/views/projectsClients/articulated_2.blade.php @@ -1547,7 +1547,9 @@ class="btn btn-primary float-right">Postos de Trabalho class="badge badge-info">(Número da copia)

Descrição: {{ $pendingEquipment->pending_equipment_description }} (Número da copia)

-

Tipo de Equipamento: {{ $pendingEquipment->equipmentType->equipment_type_name }} + {{--

Tipo de Equipamento: {{ $pendingEquipment->equipmentType->equipment_type_name }} +

--}} +

{{ $pendingEquipment->pending_equipment_type_id }}({{ $pendingEquipment->equipmentType->equipment_type_name }})

+ + +
+ + +
+ + + + + @endif + + + + + + @if ($equipmentStatus == 1) +
+ +
+

Ações ao equipamento (Aprovar/Comentar)

+
+ +
+
+ +
+
+ @csrf + + + +
+ + +
Se aprovar, as observações devem ser incluídas no relatório. Se não + aprovar, comente o que é necessário alterar.
+
+ +
+ + +
+ +
+
+ +
+ + @endif + + + +
+ +
+
+

{{ $detailsProject->company_project_description }}

+
Tag: {{ $detalsEquipment->equipment_tag }}
+
{{ $receiveAmbit->ambitsEquipment->ambits_description }}
+
+
+ + +
+ + @foreach ($receiveAllTasksHistiory as $task_todo) + + @if ($task_todo->elemental_tasks_id == 1) + +
+ + +
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf + +
+ + + +
+
+ formatted_answers['confirm_label_compliance']) && + $task_todo->formatted_answers['confirm_label_compliance'] == 'on') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif required> + +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+
+ formatted_answers['diameter']) && $task_todo->formatted_answers['diameter'] == 'Polegadas') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif> + +
+
+ formatted_answers['diameter']) && $task_todo->formatted_answers['diameter'] == 'Milímetros') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif> + +
+
+
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> x + + cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ + +
+
+
+ formatted_answers['piping']) && $task_todo->formatted_answers['piping'] == 'TRUE') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif> + +
+
+ formatted_answers['piping']) && $task_todo->formatted_answers['piping'] == 'FALSE') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif> + +
+
+
+ +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+ +
+ +
+ @endif + + {{-- TE12 - Inspeção visual --}} + @if ($task_todo->elemental_tasks_id == 18) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+
+
+ @csrf + +
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 2) +
+ +
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf + +
+ + + +
+
+ +
+ +
+
+ formatted_answers['decontamination']) && + $task_todo->formatted_answers['decontamination'] == 'yes') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif> + +
+
+ formatted_answers['decontamination']) && $task_todo->formatted_answers['decontamination'] == 'no') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif> + +
+
+ formatted_answers['decontamination']) && $task_todo->formatted_answers['decontamination'] == 'nA') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif> + +
+
+
+ + +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+ +
+
+ @endif + + + @if ($task_todo->elemental_tasks_id == 3) + +
+ +
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ + +
+
+ @csrf + +
+ +
+ + +
+ + +
+
+ formatted_answers['validate'] ?? '' == 'on') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif + required> + +
+
+ + + +
+ + +
+ + + +
+
+ +
+
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ + +
+
+ +
+
+ +
+ + + +
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ + +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + + +
+
+ +
+
+ +
+
+ + + +
+
+ + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Falha ao abrirFalha de estanquicidade (Fuga) +
+ +
+ + +
+ + 		+ +
+ + +
+ +
+ +
+ + +
+ + 		+ +
+ + +
+ +
+ +
+ + +
+ + 		+ +
+ + +
+ +
+ + +
+ + + + +
+ +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 4) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf + +
+ +
+ + +
+ + +
+
+ formatted_answers['validate_technical_specifications'] ?? '' == 'on') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif + required> + +
+
+ + + +
+ + +
+ + + +
+
+ +
+
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+
+ + + +
+
+ +
+
+ +
+
+ + + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + + + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ +
+ + + + +
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + +
+ +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 5) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ + +
+ + +
+
+ +
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + + {{--
+
+ +
+
+ +
+
--}} + + + +
+
+ +
+
+ +
+
+ + +
+ + + + +
+
+ +
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+ + +
+ + +
+ + +
+ +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 6) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+
+
+ @csrf + +
+ +
+ +
+ +
+ + +
+
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + + +
+
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + +
+ +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 7) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+
+
+ @csrf + +
+ + +
+ + +
+ + +
+
+ formatted_answers['validate_technical_specifications'] ?? '' == 'on') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif + required> + +
+
+ + + +
+ + +
+ + +
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + + +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + +
+ +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 8) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+
+
+ @csrf + +
+ + +
+
+ +
+
+ +
+
+ + +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 9) + +
+ +
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf + +
+ + +
+ +
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + +
+ +
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 10) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf +
+ + + +
+
+ formatted_answers['confirm_label_compliance']) && + $task_todo->formatted_answers['confirm_label_compliance'] == 'on') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif required> + +
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+ +
+ @endif + + + @if ($task_todo->elemental_tasks_id == 11) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf + +
+ + +
+ + +
+
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + + +
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + +
+
+
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + +
+ + +
+ +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 12) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf + +
+ + +
+ + +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + +
+ + + + +
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + +
+
+
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ +
+ + +
+ +
+ + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+ +
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 13) + +
+ +
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+
+
+ @csrf +
+ + + +
+
+ +
+
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif> +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 14) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+
+
+ @csrf + + +
+ +
+
+ +
+
+ +
+
+ +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 15) + +
+ +
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf + +
+ + + +
+
+ formatted_answers['confirm_label_compliance']) && + $task_todo->formatted_answers['confirm_label_compliance'] == 'on') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif required> + +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+ +
+ +
+ @endif + + + @if ($task_todo->elemental_tasks_id == 16) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+
+
+ @csrf + +
+ + + +
+
+ formatted_answers['confirm_label_compliance']) && + $task_todo->formatted_answers['confirm_label_compliance'] == 'on') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif required> + +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 24) + +
+ +
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf + +
+ + + +
+
+ +
+
+
+ formatted_answers['executed']) && $task_todo->formatted_answers['executed'] == 'Sim') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif required> + +
+
+ formatted_answers['executed']) && $task_todo->formatted_answers['executed'] == 'Não') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif> + +
+
+
+ + + +
+ + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ @endif + + + @if ($task_todo->elemental_tasks_id == 17) + +
+ +
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf + +
+ +
+
+ formatted_answers['check_flanges_tightness']) && + $task_todo->formatted_answers['check_flanges_tightness'] == 'on') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif required> + +
+
+ + + +
+
+ formatted_answers['check_flange_alignment']) && + $task_todo->formatted_answers['check_flange_alignment'] == 'on') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif required> + +
+
+ + +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+ +
+ @endif + + + @if ($task_todo->elemental_tasks_id == 19) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+
+
+ @csrf + +
+ + +
+ + +
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + +
+ + + + +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif + required> +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+ + +
+ + +
+ + +
+ +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + + + @if ($task_todo->elemental_tasks_id == 20) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+
+
+ @csrf +
+ +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+ + +
+ +
+ + + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+ +
+ @endif + + + @if ($task_todo->elemental_tasks_id == 21) + +
+
+
+
+ {{ $task_todo->elementalTask->elemental_tasks_code }} - + {{ $task_todo->elementalTask->elemental_tasks_description }} +
+
+
+
+

Data:{{ $task_todo->entry_date }} |

+

Tempo de execução: {{ $task_todo->runtime }}

+
+
+ +
+
+
+ +
+
+ @csrf + +
+ + +
+
+ formatted_answers['validate_technical_specifications'] ?? '' == 'on') checked @endif + @if ($task_todo->cardTypeStyle == 'gray') disabled @endif required> + +
+
+ + + +
+ + +
+ + +
+
+
+ + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + + +
+
+ +
+
+ cardTypeStyle == 'gray') readonly @endif required> +
+
+ + +
+ + @if ($task_todo->cardTypeStyle != 'gray') +
+ + +
+ @endif +
+
+
+ + @endif + @endforeach + +
+ + +
+ + + + + + + +@endsection diff --git a/resources/views/projectsClients/showAmbitDetailProjectHistory.blade.php b/resources/views/projectsClients/showAmbitDetailProjectHistory.blade.php index 8671c055..3bc84985 100644 --- a/resources/views/projectsClients/showAmbitDetailProjectHistory.blade.php +++ b/resources/views/projectsClients/showAmbitDetailProjectHistory.blade.php @@ -10,10 +10,6 @@
    - {{-- Precisa passar o ID do cliente --}} - {{--
  1. Obras Concluidas
    2. --}} - {{-- Passar o numero da Obra --}} - {{--
  2. Relatorios Gerais
    3. --}}
  3. Relatório Individual
@@ -25,68 +21,6 @@
- - {{-- receiveComments --}} - - -
-
-

Comentários sobre o Equipamento

-
- -
-
- -
- -
- - - @foreach ($receiveComments as $receiveComment) -
-
-
{{ $receiveComment->user->user_name }} - ({{ $receiveComment->user->userType->type_user }})
-

{{ $receiveComment->comment }}

-
- {{ $receiveComment->creation_date }} ( - {{ \Carbon\Carbon::parse($receiveComment->creation_date)->diffForHumans() }}) -
-
-
- @endforeach - -
- - {{-- Apenas para equipamentos de Status = 0 ou = 1 --}} - @if ($equipmentStatus == 0) - -
-
- @csrf - - - -
- - -
- - -
-
- @endif - -
-
- - @if ($equipmentStatus == 1)
diff --git a/routes/web.php b/routes/web.php index 42faf717..68660464 100755 --- a/routes/web.php +++ b/routes/web.php @@ -77,6 +77,7 @@ Route::get('showAmbitDetailsProjectHistory/{equipmentStatus}/{projectID}/{equipmentID}', [ProjectoDatacontroller::class, 'showAmbitDetailsProjectHistory'])->name('showAmbitDetailsProjectHistory'); +Route::get('equipmentTaskDetailsPdf',[ProjectoDatacontroller::class,'equipmentTaskDetailsPdf'])->name('equipmentTaskDetailsPdf'); Route::get('getDataEquipment', [ExecutionProjectController::class, 'getDataEquipment'])->name('getDataEquipment'); Route::get('getDetailsEquipmentQrcode', [ExecutionProjectController::class, 'getDetailsEquipmentQrcode'])->name('getDetailsEquipmentQrcode');