From 1a0735328fa81f1369736ffdd1cdac81f8bef237 Mon Sep 17 00:00:00 2001 From: ygbanzato Date: Fri, 13 Oct 2023 06:10:31 +0100 Subject: [PATCH] workstation structure update + test files deleted --- .env | 2 +- .../WorkstationsJobsController.php | 902 +-- .../ViewComposers/WorkstationComposer.php | 379 ++ app/Models/ControlEquipmentWorkstation.php | 2 + app/Models/workstationsTaskAnswers.php | 18 + app/Providers/AppServiceProvider.php | 10 +- public/user_logos/1696759647.jpg | Bin 3621 -> 0 bytes public/user_logos/1696761654.jpg | Bin 0 -> 12412 bytes .../views/Admin/CrudUsers/listUsers.blade.php | 2 +- .../manageassets.blade copy.php | 450 ++ .../DataManagement/manageassets.blade.php | 291 +- resources/views/Admin/profile.blade.php | 3 +- resources/views/LinksTemplate.blade.php | 276 - .../Templates/templateWorkstations.blade.php | 25 +- .../testReceveCesarioTemplateWs.blade.php | 384 ++ resources/views/codePronto.blade.php | 1775 ------ resources/views/createProjectExcel.blade.php | 179 - resources/views/email/FormAdmin.blade.php | 9 +- resources/views/email/email.blade.php | 15 +- resources/views/enterWorkstation.blade.php | 7 - resources/views/recebeIdiota.blade.php | 67 - .../views/recebeTestProgressBar.blade.php | 114 - resources/views/templateAdminReal.blade.php | 344 -- resources/views/test.blade.php | 316 -- resources/views/testIdiota.blade.php | 240 - resources/views/workstations/TE1.blade.php | 151 - .../views/workstations/TE10(2).blade.php | 68 - .../views/workstations/TE10(2)1.blade.php | 51 - resources/views/workstations/TE10.blade.php | 68 - resources/views/workstations/TE11.blade.php | 63 - resources/views/workstations/TE12.blade.php | 196 - resources/views/workstations/TE13.blade.php | 395 -- resources/views/workstations/TE14.blade.php | 140 - resources/views/workstations/TE15.blade.php | 146 - resources/views/workstations/TE2.blade.php | 67 - resources/views/workstations/TE3(2).blade.php | 364 -- resources/views/workstations/TE3.blade.php | 407 -- resources/views/workstations/TE4(2).blade.php | 399 -- resources/views/workstations/TE4(3).blade.php | 250 - resources/views/workstations/TE4.blade.php | 339 -- resources/views/workstations/TE5.blade.php | 59 - resources/views/workstations/TE6.blade.php | 84 - resources/views/workstations/TE7(2).blade.php | 591 -- resources/views/workstations/TE7(3).blade.php | 393 -- resources/views/workstations/TE7.blade.php | 227 - resources/views/workstations/TE8.blade.php | 187 - resources/views/workstations/TE9.blade.php | 59 - resources/views/workstations/start.blade.php | 1 + .../views/workstations/workstations.blade.php | 4992 +++++++++++++++++ routes/web.php | 70 +- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_static.php | 1 + 52 files changed, 6530 insertions(+), 9049 deletions(-) create mode 100644 app/Http/ViewComposers/WorkstationComposer.php create mode 100644 app/Models/workstationsTaskAnswers.php delete mode 100644 public/user_logos/1696759647.jpg create mode 100644 public/user_logos/1696761654.jpg create mode 100755 resources/views/Admin/DataManagement/manageassets.blade copy.php delete mode 100755 resources/views/LinksTemplate.blade.php create mode 100644 resources/views/Templates/testReceveCesarioTemplateWs.blade.php delete mode 100755 resources/views/codePronto.blade.php delete mode 100755 resources/views/createProjectExcel.blade.php delete mode 100755 resources/views/enterWorkstation.blade.php delete mode 100755 resources/views/recebeIdiota.blade.php delete mode 100755 resources/views/recebeTestProgressBar.blade.php delete mode 100755 resources/views/templateAdminReal.blade.php delete mode 100755 resources/views/test.blade.php delete mode 100755 resources/views/testIdiota.blade.php delete mode 100644 resources/views/workstations/TE1.blade.php delete mode 100644 resources/views/workstations/TE10(2).blade.php delete mode 100644 resources/views/workstations/TE10(2)1.blade.php delete mode 100644 resources/views/workstations/TE10.blade.php delete mode 100644 resources/views/workstations/TE11.blade.php delete mode 100644 resources/views/workstations/TE12.blade.php delete mode 100644 resources/views/workstations/TE13.blade.php delete mode 100644 resources/views/workstations/TE14.blade.php delete mode 100644 resources/views/workstations/TE15.blade.php delete mode 100644 resources/views/workstations/TE2.blade.php delete mode 100644 resources/views/workstations/TE3(2).blade.php delete mode 100644 resources/views/workstations/TE3.blade.php delete mode 100644 resources/views/workstations/TE4(2).blade.php delete mode 100644 resources/views/workstations/TE4(3).blade.php delete mode 100644 resources/views/workstations/TE4.blade.php delete mode 100644 resources/views/workstations/TE5.blade.php delete mode 100644 resources/views/workstations/TE6.blade.php delete mode 100644 resources/views/workstations/TE7(2).blade.php delete mode 100644 resources/views/workstations/TE7(3).blade.php delete mode 100644 resources/views/workstations/TE7.blade.php delete mode 100644 resources/views/workstations/TE8.blade.php delete mode 100644 resources/views/workstations/TE9.blade.php create mode 100644 resources/views/workstations/workstations.blade.php diff --git a/.env b/.env index 491b9638..f5fb8331 100755 --- a/.env +++ b/.env @@ -18,7 +18,7 @@ DB_PORT=3306 # Alteracoes para funcionar com o servidor, porem não funciona na firma DB_HOST=ispt-innovation.com -DB_DATABASE=ispt40 +DB_DATABASE=ispt40_backup DB_USERNAME=ispt40 DB_PASSWORD=qu3ro3ntr@r diff --git a/app/Http/Controllers/WorkstationsJobsController.php b/app/Http/Controllers/WorkstationsJobsController.php index 5872a37a..77620a59 100644 --- a/app/Http/Controllers/WorkstationsJobsController.php +++ b/app/Http/Controllers/WorkstationsJobsController.php @@ -1,366 +1,13 @@ email; - -// // $equipmentsTodo= DB::select(" -// // WITH equipments_multiple_rows AS ( -// // SELECT -// // e.equipment_id, -// // e.equipment_tag, -// // COALESCE(MAX(oet.elemental_tasks_id), MAX(oet.further_tasks_id)) AS equipment_all_tasks -// // FROM -// // users u -// // JOIN -// // construction_workstations cw ON u.user_name = cw.name_workstations -// // JOIN -// // workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations -// // JOIN -// // equipments e ON wat.company_projects_id = e.company_projects_id -// // JOIN -// // ordered_equipment_tasks oet ON e.equipment_id = oet.equipment_id -// // WHERE -// // u.email = :email -// // AND -// // oet.execution_order = 1 -// // GROUP BY -// // e.equipment_id, -// // e.equipment_tag -// // ), - -// // workstations_multiple_rows AS ( -// // SELECT -// // cw.id_workstations, -// // cw.name_workstations, -// // COALESCE(wat.elemental_tasks_id, wat.further_tasks_id) AS all_tasks -// // FROM -// // users u -// // JOIN -// // construction_workstations cw ON u.user_name = cw.name_workstations -// // JOIN -// // workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations -// // WHERE -// // u.email = :email -// // ), - -// // workstations_control_all_tasks AS ( -// // SELECT -// // cew.control_equipment_workstation_id, -// // cew.equipment_id, -// // CASE -// // WHEN cew.id_workstations IS NULL THEN NULL -// // WHEN cew.id_workstations IN ( -// // SELECT wat.id_workstations -// // FROM workstations_association_tasks wat -// // JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id -// // JOIN users u ON u.user_name = cw.name_workstations -// // WHERE u.email = :email -// // ) THEN cew.id_workstations -// // ELSE NULL -// // END AS control_id_workstations, -// // COALESCE(cew.elemental_tasks_id, cew.further_tasks_id) AS control_workstation_all_tasks, -// // cew.equipment_comments_id, -// // cew.entry_date, -// // cew.departure_date -// // FROM -// // control_equipment_workstation cew -// // WHERE -// // cew.id_workstations IS NULL -// // OR cew.id_workstations IN ( -// // SELECT wat.id_workstations -// // FROM workstations_association_tasks wat -// // JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id -// // JOIN users u ON u.user_name = cw.name_workstations -// // WHERE u.email = :email -// // ) -// // ) - -// // SELECT -// // emr.equipment_id, -// // emr.equipment_tag -// // FROM -// // equipments_multiple_rows emr -// // WHERE -// // ( -// // emr.equipment_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) -// // AND NOT EXISTS ( -// // SELECT 1 -// // FROM workstations_control_all_tasks wc -// // WHERE wc.equipment_id = emr.equipment_id -// // AND wc.control_id_workstations IN (SELECT id_workstations FROM workstations_multiple_rows) -// // ) -// // ) -// // OR -// // ( -// // emr.equipment_id IN ( -// // SELECT equipment_id -// // FROM workstations_control_all_tasks -// // WHERE control_id_workstations IS NULL -// // AND entry_date IS NULL -// // AND departure_date IS NULL -// // AND control_workstation_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) -// // ) -// // AND NOT EXISTS ( -// // SELECT 1 -// // FROM workstations_control_all_tasks wc -// // WHERE wc.equipment_id = emr.equipment_id -// // AND wc.control_id_workstations IS NOT NULL -// // GROUP BY wc.equipment_id -// // HAVING COUNT(DISTINCT wc.control_id_workstations) > 1 -// // ) -// // ) -// // GROUP BY -// // emr.equipment_id, -// // emr.equipment_tag -// // ORDER BY -// // emr.equipment_id ASC; -// // ", ['email' => $userEmail]); - - -// $equipmentsDone = DB::select(" -// WITH equipments_multiple_rows AS ( -// SELECT -// e.equipment_id, -// e.equipment_tag, -// COALESCE(MAX(oet.elemental_tasks_id), MAX(oet.further_tasks_id)) AS equipment_all_tasks -// FROM -// users u -// JOIN -// construction_workstations cw ON u.user_name = cw.name_workstations -// JOIN -// workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations -// JOIN -// equipments e ON wat.company_projects_id = e.company_projects_id -// JOIN -// ordered_equipment_tasks oet ON e.equipment_id = oet.equipment_id -// WHERE -// u.email = :email -// AND -// oet.execution_order = 1 -// GROUP BY -// e.equipment_id, -// e.equipment_tag -// ), - -// workstations_multiple_rows AS ( -// SELECT -// cw.id_workstations, -// cw.name_workstations, -// COALESCE(wat.elemental_tasks_id, wat.further_tasks_id) AS all_tasks -// FROM -// users u -// JOIN -// construction_workstations cw ON u.user_name = cw.name_workstations -// JOIN -// workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations -// WHERE -// u.email = :email -// ), - -// workstations_control_all_tasks AS ( -// SELECT -// cew.control_equipment_workstation_id, -// cew.equipment_id, -// CASE -// WHEN cew.id_workstations IS NULL THEN NULL -// WHEN cew.id_workstations IN ( -// SELECT wat.id_workstations -// FROM workstations_association_tasks wat -// JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id -// JOIN users u ON u.user_name = cw.name_workstations -// WHERE u.email = :email -// ) THEN cew.id_workstations -// ELSE NULL -// END AS control_id_workstations, -// COALESCE(cew.elemental_tasks_id, cew.further_tasks_id) AS control_workstation_all_tasks, -// cew.equipment_comments_id, -// cew.entry_date, -// cew.departure_date -// FROM -// control_equipment_workstation cew -// WHERE -// cew.id_workstations IS NULL -// OR cew.id_workstations IN ( -// SELECT wat.id_workstations -// FROM workstations_association_tasks wat -// JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id -// JOIN users u ON u.user_name = cw.name_workstations -// WHERE u.email = :email -// ) -// ) - -// SELECT -// emr.equipment_id, -// emr.equipment_tag -// FROM -// equipments_multiple_rows emr -// WHERE -// EXISTS ( -// SELECT 1 -// FROM workstations_control_all_tasks wc -// JOIN workstations_multiple_rows wmr ON wc.control_id_workstations = wmr.id_workstations -// WHERE wc.equipment_id = emr.equipment_id -// AND wc.control_workstation_all_tasks = wmr.all_tasks -// AND wc.entry_date IS NOT NULL -// AND wc.departure_date IS NOT NULL -// AND wc.control_id_workstations IS NOT NULL -// ) -// AND NOT EXISTS ( -// SELECT 1 -// FROM workstations_control_all_tasks wc -// WHERE wc.equipment_id = emr.equipment_id -// AND wc.control_workstation_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) -// AND wc.control_id_workstations IS NULL -// ) -// GROUP BY -// emr.equipment_id, -// emr.equipment_tag -// ORDER BY -// emr.equipment_id ASC; -// ", ['email' => $userEmail]); - - -// $equipmentsReturned = DB::select(" -// WITH equipments_multiple_rows AS ( -// SELECT -// e.equipment_id, -// e.equipment_tag, -// COALESCE(MAX(oet.elemental_tasks_id), MAX(oet.further_tasks_id)) AS equipment_all_tasks -// FROM -// users u -// JOIN -// construction_workstations cw ON u.user_name = cw.name_workstations -// JOIN -// workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations -// JOIN -// equipments e ON wat.company_projects_id = e.company_projects_id -// JOIN -// ordered_equipment_tasks oet ON e.equipment_id = oet.equipment_id -// WHERE -// u.email = :email -// AND -// oet.execution_order = 1 -// GROUP BY -// e.equipment_id, -// e.equipment_tag -// ), - -// workstations_multiple_rows AS ( -// SELECT -// cw.id_workstations, -// cw.name_workstations, -// COALESCE(wat.elemental_tasks_id, wat.further_tasks_id) AS all_tasks -// FROM -// users u -// JOIN -// construction_workstations cw ON u.user_name = cw.name_workstations -// JOIN -// workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations -// WHERE -// u.email = :email -// ), - -// workstations_control_all_tasks AS ( -// SELECT -// cew.control_equipment_workstation_id, -// cew.equipment_id, -// CASE -// WHEN cew.id_workstations IS NULL THEN NULL -// WHEN cew.id_workstations IN ( -// SELECT wat.id_workstations -// FROM workstations_association_tasks wat -// JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id -// JOIN users u ON u.user_name = cw.name_workstations -// WHERE u.email = :email -// ) THEN cew.id_workstations -// ELSE NULL -// END AS control_id_workstations, -// COALESCE(cew.elemental_tasks_id, cew.further_tasks_id) AS control_workstation_all_tasks, -// cew.equipment_comments_id, -// cew.entry_date, -// cew.departure_date -// FROM -// control_equipment_workstation cew -// WHERE -// cew.id_workstations IS NULL -// OR cew.id_workstations IN ( -// SELECT wat.id_workstations -// FROM workstations_association_tasks wat -// JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id -// JOIN users u ON u.user_name = cw.name_workstations -// WHERE u.email = :email -// ) -// ) - -// SELECT -// emr.equipment_id, -// emr.equipment_tag -// FROM -// equipments_multiple_rows emr -// WHERE -// emr.equipment_id IN ( -// SELECT equipment_id -// FROM workstations_control_all_tasks -// WHERE control_id_workstations IS NULL -// AND entry_date IS NULL -// AND departure_date IS NULL -// AND control_workstation_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) -// AND EXISTS ( -// SELECT 1 -// FROM workstations_control_all_tasks wc -// WHERE wc.equipment_id = emr.equipment_id -// AND wc.control_id_workstations IS NOT NULL -// GROUP BY wc.equipment_id -// HAVING COUNT(DISTINCT wc.control_id_workstations) >= 2 -// ) -// ) -// GROUP BY -// emr.equipment_id, -// emr.equipment_tag -// ORDER BY -// emr.equipment_id ASC; -// ", ['email' => $userEmail]); - -// $workstationNameQuery = DB::select(" -// SELECT construction_workstations.nomenclature_workstation -// FROM construction_workstations -// JOIN users -// WHERE construction_workstations.name_workstations = users.user_name -// AND users.email = :email; -// ", ['email' => $userEmail]); - -// $workstationName = $workstationNameQuery[0]->nomenclature_workstation; - -// //Counting of equipments -// // $equipmentsTodoCount = count($equipmentsTodo); -// $equipmentsDoneCount = count($equipmentsDone); -// $equipmentsReturnedCount = count($equipmentsReturned); - -// //Returning values of the queries to workstations layout -// return view('workstations.index', [ -// // 'equipmentsTodo' => $equipmentsTodo, 'equipmentsTodoCount' => $equipmentsTodoCount, -// 'equipmentsDone' => $equipmentsDone, 'equipmentsDoneCount' => $equipmentsDoneCount, -// 'equipmentsReturned' => $equipmentsReturned, 'equipmentsReturnedCount' => $equipmentsReturnedCount, -// 'workstationName' => $workstationName -// ]); -// } -// } - - - - namespace App\Http\Controllers; +use App\Models\ConstructionWorkstation; +use App\Models\ControlEquipmentWorkstation; +use App\Models\ElementalTasks; +use App\Models\Equipment; +use App\Models\workstationsTaskAnswers; + use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; @@ -370,365 +17,188 @@ class WorkstationsJobsController extends Controller { public function index() { - $userEmail = Auth::user()->email; + return view('workstations.start'); + } - $equipmentsTodo = DB::select(" - WITH equipments_multiple_rows AS ( - SELECT - e.equipment_id, - e.equipment_tag, - COALESCE(MAX(oet.elemental_tasks_id), MAX(oet.further_tasks_id)) AS equipment_all_tasks - FROM - users u - JOIN - construction_workstations cw ON u.user_name = cw.name_workstations - JOIN - workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations - JOIN - equipments e ON wat.company_projects_id = e.company_projects_id - JOIN - ordered_equipment_tasks oet ON e.equipment_id = oet.equipment_id - WHERE - u.email = :email1 - AND - oet.execution_order = 1 - GROUP BY - e.equipment_id, - e.equipment_tag - ), - - workstations_multiple_rows AS ( - SELECT - cw.id_workstations, - cw.name_workstations, - COALESCE(wat.elemental_tasks_id, wat.further_tasks_id) AS all_tasks - FROM - users u - JOIN - construction_workstations cw ON u.user_name = cw.name_workstations - JOIN - workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations - WHERE - u.email = :email2 - ), - - workstations_control_all_tasks AS ( - SELECT - cew.control_equipment_workstation_id, - cew.equipment_id, - CASE - WHEN cew.id_workstations IS NULL THEN NULL - WHEN cew.id_workstations IN ( - SELECT wat.id_workstations - FROM workstations_association_tasks wat - JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id - JOIN users u ON u.user_name = cw.name_workstations - WHERE u.email = :email3 - ) THEN cew.id_workstations - ELSE NULL - END AS control_id_workstations, - COALESCE(cew.elemental_tasks_id, cew.further_tasks_id) AS control_workstation_all_tasks, - cew.equipment_comments_id, - cew.entry_date, - cew.departure_date - FROM - control_equipment_workstation cew - WHERE - cew.id_workstations IS NULL - OR cew.id_workstations IN ( - SELECT wat.id_workstations - FROM workstations_association_tasks wat - JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id - JOIN users u ON u.user_name = cw.name_workstations - WHERE u.email = :email4 - ) - ) - - SELECT - emr.equipment_id, - emr.equipment_tag - FROM - equipments_multiple_rows emr - WHERE - ( - emr.equipment_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) - AND NOT EXISTS ( - SELECT 1 - FROM workstations_control_all_tasks wc - WHERE wc.equipment_id = emr.equipment_id - AND wc.control_id_workstations IN (SELECT id_workstations FROM workstations_multiple_rows) - ) - ) - OR - ( - emr.equipment_id IN ( - SELECT equipment_id - FROM workstations_control_all_tasks - WHERE control_id_workstations IS NULL - AND entry_date IS NULL - AND departure_date IS NULL - AND control_workstation_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) - ) - AND NOT EXISTS ( - SELECT 1 - FROM workstations_control_all_tasks wc - WHERE wc.equipment_id = emr.equipment_id - AND wc.control_id_workstations IS NOT NULL - GROUP BY wc.equipment_id - HAVING COUNT(DISTINCT wc.control_id_workstations) > 1 - ) - ) - GROUP BY - emr.equipment_id, - emr.equipment_tag - ORDER BY - emr.equipment_id ASC; - ", [ - 'email1' => $userEmail, - 'email2' => $userEmail, - 'email3' => $userEmail, - 'email4' => $userEmail - ]); + public function controlEquipment() + { + // A partir deste dado consigo receber os valores do WS,TE e Equipment + $controlEquipmentWorkstationId = 33; + $receiveEquipment = Equipment::where('equipment_id', 1443)->first(); - $equipmentsReturned = DB::select(" - WITH equipments_multiple_rows AS ( - SELECT - e.equipment_id, - e.equipment_tag, - COALESCE(MAX(oet.elemental_tasks_id), MAX(oet.further_tasks_id)) AS equipment_all_tasks - FROM - users u - JOIN - construction_workstations cw ON u.user_name = cw.name_workstations - JOIN - workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations - JOIN - equipments e ON wat.company_projects_id = e.company_projects_id - JOIN - ordered_equipment_tasks oet ON e.equipment_id = oet.equipment_id - WHERE - u.email = :email1 - AND - oet.execution_order = 1 - GROUP BY - e.equipment_id, - e.equipment_tag - ), - - workstations_multiple_rows AS ( - SELECT - cw.id_workstations, - cw.name_workstations, - COALESCE(wat.elemental_tasks_id, wat.further_tasks_id) AS all_tasks - FROM - users u - JOIN - construction_workstations cw ON u.user_name = cw.name_workstations - JOIN - workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations - WHERE - u.email = :email2 - ), - - workstations_control_all_tasks AS ( - SELECT - cew.control_equipment_workstation_id, - cew.equipment_id, - CASE - WHEN cew.id_workstations IS NULL THEN NULL - WHEN cew.id_workstations IN ( - SELECT wat.id_workstations - FROM workstations_association_tasks wat - JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id - JOIN users u ON u.user_name = cw.name_workstations - WHERE u.email = :email3 - ) THEN cew.id_workstations - ELSE NULL - END AS control_id_workstations, - COALESCE(cew.elemental_tasks_id, cew.further_tasks_id) AS control_workstation_all_tasks, - cew.equipment_comments_id, - cew.entry_date, - cew.departure_date - FROM - control_equipment_workstation cew - WHERE - cew.id_workstations IS NULL - OR cew.id_workstations IN ( - SELECT wat.id_workstations - FROM workstations_association_tasks wat - JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id - JOIN users u ON u.user_name = cw.name_workstations - WHERE u.email = :email4 - ) - ) - - SELECT - emr.equipment_id, - emr.equipment_tag - FROM - equipments_multiple_rows emr - WHERE - emr.equipment_id IN ( - SELECT equipment_id - FROM workstations_control_all_tasks - WHERE control_id_workstations IS NULL - AND entry_date IS NULL - AND departure_date IS NULL - AND control_workstation_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) - AND EXISTS ( - SELECT 1 - FROM workstations_control_all_tasks wc - WHERE wc.equipment_id = emr.equipment_id - AND wc.control_id_workstations IS NOT NULL - GROUP BY wc.equipment_id - HAVING COUNT(DISTINCT wc.control_id_workstations) >= 2 - ) - ) - GROUP BY - emr.equipment_id, - emr.equipment_tag - ORDER BY - emr.equipment_id ASC; - - ", [ - - 'email1' => $userEmail, - 'email2' => $userEmail, - 'email3' => $userEmail, - 'email4' => $userEmail - - ]); - - - $equipmentsDone = DB::select(" - WITH equipments_multiple_rows AS ( - SELECT - e.equipment_id, - e.equipment_tag, - COALESCE(MAX(oet.elemental_tasks_id), MAX(oet.further_tasks_id)) AS equipment_all_tasks - FROM - users u - JOIN - construction_workstations cw ON u.user_name = cw.name_workstations - JOIN - workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations - JOIN - equipments e ON wat.company_projects_id = e.company_projects_id - JOIN - ordered_equipment_tasks oet ON e.equipment_id = oet.equipment_id - WHERE - u.email = :email1 - AND - oet.execution_order = 1 - GROUP BY - e.equipment_id, - e.equipment_tag - ), - - workstations_multiple_rows AS ( - SELECT - cw.id_workstations, - cw.name_workstations, - COALESCE(wat.elemental_tasks_id, wat.further_tasks_id) AS all_tasks - FROM - users u - JOIN - construction_workstations cw ON u.user_name = cw.name_workstations - JOIN - workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations - WHERE - u.email = :email2 - ), - - workstations_control_all_tasks AS ( - SELECT - cew.control_equipment_workstation_id, - cew.equipment_id, - CASE - WHEN cew.id_workstations IS NULL THEN NULL - WHEN cew.id_workstations IN ( - SELECT wat.id_workstations - FROM workstations_association_tasks wat - JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id - JOIN users u ON u.user_name = cw.name_workstations - WHERE u.email = :email3 - ) THEN cew.id_workstations - ELSE NULL - END AS control_id_workstations, - COALESCE(cew.elemental_tasks_id, cew.further_tasks_id) AS control_workstation_all_tasks, - cew.equipment_comments_id, - cew.entry_date, - cew.departure_date - FROM - control_equipment_workstation cew - WHERE - cew.id_workstations IS NULL - OR cew.id_workstations IN ( - SELECT wat.id_workstations - FROM workstations_association_tasks wat - JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id - JOIN users u ON u.user_name = cw.name_workstations - WHERE u.email = :email4 - ) - ) - - SELECT - emr.equipment_id, - emr.equipment_tag - FROM - equipments_multiple_rows emr - WHERE - EXISTS ( - SELECT 1 - FROM workstations_control_all_tasks wc - JOIN workstations_multiple_rows wmr ON wc.control_id_workstations = wmr.id_workstations - WHERE wc.equipment_id = emr.equipment_id - AND wc.control_workstation_all_tasks = wmr.all_tasks - AND wc.entry_date IS NOT NULL - AND wc.departure_date IS NOT NULL - AND wc.control_id_workstations IS NOT NULL - ) - AND NOT EXISTS ( - SELECT 1 - FROM workstations_control_all_tasks wc - WHERE wc.equipment_id = emr.equipment_id - AND wc.control_workstation_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) - AND wc.control_id_workstations IS NULL - ) - GROUP BY - emr.equipment_id, - emr.equipment_tag - ORDER BY - emr.equipment_id ASC; - ", [ - 'email1' => $userEmail, - 'email2' => $userEmail, - 'email3' => $userEmail, - 'email4' => $userEmail - ]); - - $workstationNameQuery = DB::select(" - SELECT construction_workstations.nomenclature_workstation - FROM construction_workstations - JOIN users - WHERE construction_workstations.name_workstations = users.user_name - AND users.email = :email; - ", ['email' => $userEmail]); - - $workstationName = $workstationNameQuery[0]->nomenclature_workstation; - - //Counting of equipments - $equipmentsTodoCount = count($equipmentsTodo); - $equipmentsDoneCount = count($equipmentsDone); - $equipmentsReturnedCount = count($equipmentsReturned); - - //Returning values of the queries to workstations layout - return view('workstations.start', [ - 'equipmentsTodo' => $equipmentsTodo, 'equipmentsTodoCount' => $equipmentsTodoCount, - 'equipmentsDone' => $equipmentsDone, 'equipmentsDoneCount' => $equipmentsDoneCount, - 'equipmentsReturned' => $equipmentsReturned, 'equipmentsReturnedCount' => $equipmentsReturnedCount, - 'workstationName' => $workstationName + $task_todo = 1; + return view('workstations.workstations', [ + 'task_todo' => $task_todo, + 'controlEquipmentWorkstationId' => $controlEquipmentWorkstationId, + 'receiveEquipment' => $receiveEquipment ]); } -} \ No newline at end of file + + // public function receiveAnswersEquipment(Request $request) + // { + // $receiveAnswersElementalTasks = new workstationsTaskAnswers; + + // $receiveAnswersElementalTasks->control_equipment_workstation_id = $request->control_equipment_workstation_id; + // $receiveAnswersElementalTasks->answer_json = + + // } + + // Recebe as perguntas e respostas e deve criar um linha nova. + public function receiveAnswersEquipment(Request $request) + { + // Primeiro ele deve criar a associação entre id atual do control + perguntas e respostas + $receiveAnswersElementalTasks = new workstationsTaskAnswers; + $receiveAnswersElementalTasks->control_equipment_workstation_id = $request->control_equipment_workstationid; + + // Inicializando o array que vai armazenar os objetos JSON + $answersArray = []; + + foreach ($request->all() as $key => $value) { + // Ignorando a chave control_equipment_workstation_id + if ($key !== 'control_equipment_workstation_id') { + // Verificando se $key contém '-' + if (strpos($key, '-') === false) { + // Se não contiver, pular esta iteração + continue; + } + // Dividindo a chave em duas partes: question e type + list($question, $type) = explode('-', $key); + + // Adicionando um novo objeto JSON ao array + $answersArray[] = [ + 'type' => $type, + 'value' => $value, + 'question' => $question + ]; + } + } + + // Convertendo o array em uma string JSON + $jsonString = json_encode($answersArray); + + // Armazenando a string JSON no banco de dados + $receiveAnswersElementalTasks->answer_json = $jsonString; + $receiveAnswersElementalTasks->save(); + + // update departure_date value + $receiveDataControlWs = ControlEquipmentWorkstation::find($request->control_equipment_workstationid); + $receiveDataControlWs->departure_date = now(); + $receiveDataControlWs->save(); + + //FINALIZOU A TAREFA ANTERIOR COM DEPARTURE + + //Busca o Email + $userEmail = Auth::user()->email; + + //Busca o id Anterior + $control_ew_id = $request->control_equipment_workstationid; + + // Busca a Ws com base no id recebido da tabela Control. + $recebeDataControlId = ControlEquipmentWorkstation::find($request->control_equipment_workstationid); + + //Chama o procedimento + $controlTasks = DB::select('CALL ManageNextTask(?, ?)', [$userEmail, $control_ew_id]); + + //Saving the values to a variable + if (count($controlTasks) > 0) { + $current_workstation = $controlTasks[0]->id_workstations; + $next_workstation = $controlTasks[0]->next_workstation; + $next_todo = $controlTasks[0]->next_todo; + } else { + //It should always exist, but you never know :) + $next_todo = null; + } + //RECEBE OS VALORES DA PROXIMA WS E PROXIMA TAREFA + + // Recebe os dados de cada Tarefa Elementar. + $receiveDataElementalTask = ElementalTasks::find($recebeDataControlId->elemental_tasks_id); + $receiveDataEquipment = Equipment::find($recebeDataControlId->equipment_id); + + if ($next_todo < 25) { + $elemental_tasks_id = $next_todo; + $further_tasks_id = null; + } else { + $elemental_tasks_id = null; + $further_tasks_id = $next_todo; + } + //Se a proxima WS for igual a atual deve criar dados para a ws + if ($recebeDataControlId->id_workstations == $next_workstation) { + + $nextEquipmentTask = DB::select(" + INSERT INTO control_equipment_workstation + (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date) + VALUES + (:equipment_id,:next_workstation,:elemental_tasks_id,:further_tasks_id,NULL,CURRENT_TIMESTAMP,NULL) + ", [ + 'equipment_id' => $receiveDataEquipment->equipment_id, + 'next_workstation' => $next_workstation, + 'elemental_tasks_id' => $elemental_tasks_id, + 'further_tasks_id' => $further_tasks_id + ]); + $lastInsertedId = DB::getPdo()->lastInsertId(); + + return view('workstations.workstations', [ + 'receiveDataElementalTask' => $receiveDataElementalTask, + 'receiveDataEquipment' => $receiveDataEquipment, + 'control_ew_id' => $lastInsertedId, + 'task_todo' => $next_todo + ]); + // Se verificar que a proxima tarefa e Null ele deve apenas voltar ao start + } else if($next_todo == null){ + return view('workstations.start'); + } + else { + $nextEquipmentTask = DB::select(" + INSERT INTO control_equipment_workstation + (equipment_id, id_workstations, elemental_tasks_id, further_tasks_id, equipment_comments_id, entry_date, departure_date) + VALUES + (:equipment_id,NULL,:elemental_tasks_id,:further_tasks_id,NULL,NULL,NULL) + ", [ + 'equipment_id' => $receiveDataEquipment->equipment_id, + 'elemental_tasks_id' => $elemental_tasks_id, + 'further_tasks_id' => $further_tasks_id + ]); + + return view('workstations.start'); + } + } + + // Ao selecionar o equipamento para se inicializar a tarefa deve mostrar os dados relacionados. + public function getEquipmentData($equipment_id) + { //vai receber o email atual, no caso o da workstation que se encontra + $userEmail = Auth::user()->email; + + $receiveDataEquipment = Equipment::where('equipment_id', $equipment_id)->first(); + + //Calling the MySQL procedure tthat will return a table with two columns and one row + + //cria a nova linha + $equipmentData = DB::select('CALL ManageEquipmentTasks(?, ?)', [$userEmail, $equipment_id]); + + // //Saving the values to a variable + if (count($equipmentData) > 0) { + $control_ew_id = $equipmentData[0]->control_ew_id; + $task_todo = $equipmentData[0]->task_todo; + } else { + //It should always exist, but you never know :) + $control_ew_id = null; + $task_todo = null; + } + + $recebeDataControlId = ControlEquipmentWorkstation::find($control_ew_id); + + // Recebe os dados de cada Tarefa Elementar. + $receiveDataElementalTask = ElementalTasks::find($recebeDataControlId->elemental_tasks_id); + + //Deve recupar os dados da tarefa Atual quando receber o control_id + + //Returning the values to a view "values" + return view('workstations.workstations', [ + 'receiveDataElementalTask' => $receiveDataElementalTask, + 'receiveDataEquipment' => $receiveDataEquipment, + 'control_ew_id' => $control_ew_id, + 'task_todo' => $task_todo + ]); + } +} diff --git a/app/Http/ViewComposers/WorkstationComposer.php b/app/Http/ViewComposers/WorkstationComposer.php new file mode 100644 index 00000000..16808d5c --- /dev/null +++ b/app/Http/ViewComposers/WorkstationComposer.php @@ -0,0 +1,379 @@ +email; + + $equipmentsTodo = DB::select(" + WITH equipments_multiple_rows AS ( + SELECT + e.equipment_id, + e.equipment_tag, + COALESCE(MAX(oet.elemental_tasks_id), MAX(oet.further_tasks_id)) AS equipment_all_tasks + FROM + users u + JOIN + construction_workstations cw ON u.user_name = cw.name_workstations + JOIN + workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations + JOIN + equipments e ON wat.company_projects_id = e.company_projects_id + JOIN + ordered_equipment_tasks oet ON e.equipment_id = oet.equipment_id + WHERE + u.email = :email1 + AND + oet.execution_order = 1 + GROUP BY + e.equipment_id, + e.equipment_tag + ), + + workstations_multiple_rows AS ( + SELECT + cw.id_workstations, + cw.name_workstations, + COALESCE(wat.elemental_tasks_id, wat.further_tasks_id) AS all_tasks + FROM + users u + JOIN + construction_workstations cw ON u.user_name = cw.name_workstations + JOIN + workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations + WHERE + u.email = :email2 + ), + + workstations_control_all_tasks AS ( + SELECT + cew.control_equipment_workstation_id, + cew.equipment_id, + CASE + WHEN cew.id_workstations IS NULL THEN NULL + WHEN cew.id_workstations IN ( + SELECT wat.id_workstations + FROM workstations_association_tasks wat + JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id + JOIN users u ON u.user_name = cw.name_workstations + WHERE u.email = :email3 + ) THEN cew.id_workstations + ELSE NULL + END AS control_id_workstations, + COALESCE(cew.elemental_tasks_id, cew.further_tasks_id) AS control_workstation_all_tasks, + cew.equipment_comments_id, + cew.entry_date, + cew.departure_date + FROM + control_equipment_workstation cew + WHERE + cew.id_workstations IS NULL + OR cew.id_workstations IN ( + SELECT wat.id_workstations + FROM workstations_association_tasks wat + JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id + JOIN users u ON u.user_name = cw.name_workstations + WHERE u.email = :email4 + ) + ) + + SELECT + emr.equipment_id, + emr.equipment_tag + FROM + equipments_multiple_rows emr + WHERE + ( + emr.equipment_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) + AND NOT EXISTS ( + SELECT 1 + FROM workstations_control_all_tasks wc + WHERE wc.equipment_id = emr.equipment_id + AND wc.control_id_workstations IN (SELECT id_workstations FROM workstations_multiple_rows) + ) + ) + OR + ( + emr.equipment_id IN ( + SELECT equipment_id + FROM workstations_control_all_tasks + WHERE control_id_workstations IS NULL + AND entry_date IS NULL + AND departure_date IS NULL + AND control_workstation_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) + ) + AND NOT EXISTS ( + SELECT 1 + FROM workstations_control_all_tasks wc + WHERE wc.equipment_id = emr.equipment_id + AND wc.control_id_workstations IS NOT NULL + GROUP BY wc.equipment_id + HAVING COUNT(DISTINCT wc.control_id_workstations) > 1 + ) + ) + GROUP BY + emr.equipment_id, + emr.equipment_tag + ORDER BY + emr.equipment_id ASC; + ", [ + 'email1' => $userEmail, + 'email2' => $userEmail, + 'email3' => $userEmail, + 'email4' => $userEmail + ]); + + + $equipmentsReturned = DB::select(" + WITH equipments_multiple_rows AS ( + SELECT + e.equipment_id, + e.equipment_tag, + COALESCE(MAX(oet.elemental_tasks_id), MAX(oet.further_tasks_id)) AS equipment_all_tasks + FROM + users u + JOIN + construction_workstations cw ON u.user_name = cw.name_workstations + JOIN + workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations + JOIN + equipments e ON wat.company_projects_id = e.company_projects_id + JOIN + ordered_equipment_tasks oet ON e.equipment_id = oet.equipment_id + WHERE + u.email = :email1 + AND + oet.execution_order = 1 + GROUP BY + e.equipment_id, + e.equipment_tag + ), + + workstations_multiple_rows AS ( + SELECT + cw.id_workstations, + cw.name_workstations, + COALESCE(wat.elemental_tasks_id, wat.further_tasks_id) AS all_tasks + FROM + users u + JOIN + construction_workstations cw ON u.user_name = cw.name_workstations + JOIN + workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations + WHERE + u.email = :email2 + ), + + workstations_control_all_tasks AS ( + SELECT + cew.control_equipment_workstation_id, + cew.equipment_id, + CASE + WHEN cew.id_workstations IS NULL THEN NULL + WHEN cew.id_workstations IN ( + SELECT wat.id_workstations + FROM workstations_association_tasks wat + JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id + JOIN users u ON u.user_name = cw.name_workstations + WHERE u.email = :email3 + ) THEN cew.id_workstations + ELSE NULL + END AS control_id_workstations, + COALESCE(cew.elemental_tasks_id, cew.further_tasks_id) AS control_workstation_all_tasks, + cew.equipment_comments_id, + cew.entry_date, + cew.departure_date + FROM + control_equipment_workstation cew + WHERE + cew.id_workstations IS NULL + OR cew.id_workstations IN ( + SELECT wat.id_workstations + FROM workstations_association_tasks wat + JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id + JOIN users u ON u.user_name = cw.name_workstations + WHERE u.email = :email4 + ) + ) + + SELECT + emr.equipment_id, + emr.equipment_tag + FROM + equipments_multiple_rows emr + WHERE + emr.equipment_id IN ( + SELECT equipment_id + FROM workstations_control_all_tasks + WHERE control_id_workstations IS NULL + AND entry_date IS NULL + AND departure_date IS NULL + AND control_workstation_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) + AND EXISTS ( + SELECT 1 + FROM workstations_control_all_tasks wc + WHERE wc.equipment_id = emr.equipment_id + AND wc.control_id_workstations IS NOT NULL + GROUP BY wc.equipment_id + HAVING COUNT(DISTINCT wc.control_id_workstations) >= 2 + ) + ) + GROUP BY + emr.equipment_id, + emr.equipment_tag + ORDER BY + emr.equipment_id ASC; + + ", [ + + 'email1' => $userEmail, + 'email2' => $userEmail, + 'email3' => $userEmail, + 'email4' => $userEmail + + ]); + + + $equipmentsDone = DB::select(" + WITH equipments_multiple_rows AS ( + SELECT + e.equipment_id, + e.equipment_tag, + COALESCE(MAX(oet.elemental_tasks_id), MAX(oet.further_tasks_id)) AS equipment_all_tasks + FROM + users u + JOIN + construction_workstations cw ON u.user_name = cw.name_workstations + JOIN + workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations + JOIN + equipments e ON wat.company_projects_id = e.company_projects_id + JOIN + ordered_equipment_tasks oet ON e.equipment_id = oet.equipment_id + WHERE + u.email = :email1 + AND + oet.execution_order = 1 + GROUP BY + e.equipment_id, + e.equipment_tag + ), + + workstations_multiple_rows AS ( + SELECT + cw.id_workstations, + cw.name_workstations, + COALESCE(wat.elemental_tasks_id, wat.further_tasks_id) AS all_tasks + FROM + users u + JOIN + construction_workstations cw ON u.user_name = cw.name_workstations + JOIN + workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations + WHERE + u.email = :email2 + ), + + workstations_control_all_tasks AS ( + SELECT + cew.control_equipment_workstation_id, + cew.equipment_id, + CASE + WHEN cew.id_workstations IS NULL THEN NULL + WHEN cew.id_workstations IN ( + SELECT wat.id_workstations + FROM workstations_association_tasks wat + JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id + JOIN users u ON u.user_name = cw.name_workstations + WHERE u.email = :email3 + ) THEN cew.id_workstations + ELSE NULL + END AS control_id_workstations, + COALESCE(cew.elemental_tasks_id, cew.further_tasks_id) AS control_workstation_all_tasks, + cew.equipment_comments_id, + cew.entry_date, + cew.departure_date + FROM + control_equipment_workstation cew + WHERE + cew.id_workstations IS NULL + OR cew.id_workstations IN ( + SELECT wat.id_workstations + FROM workstations_association_tasks wat + JOIN construction_workstations cw ON wat.company_projects_id = cw.company_projects_id + JOIN users u ON u.user_name = cw.name_workstations + WHERE u.email = :email4 + ) + ) + + SELECT + emr.equipment_id, + emr.equipment_tag + FROM + equipments_multiple_rows emr + WHERE + EXISTS ( + SELECT 1 + FROM workstations_control_all_tasks wc + JOIN workstations_multiple_rows wmr ON wc.control_id_workstations = wmr.id_workstations + WHERE wc.equipment_id = emr.equipment_id + AND wc.control_workstation_all_tasks = wmr.all_tasks + AND wc.entry_date IS NOT NULL + AND wc.departure_date IS NOT NULL + AND wc.control_id_workstations IS NOT NULL + ) + AND NOT EXISTS ( + SELECT 1 + FROM workstations_control_all_tasks wc + WHERE wc.equipment_id = emr.equipment_id + AND wc.control_workstation_all_tasks IN (SELECT all_tasks FROM workstations_multiple_rows) + AND wc.control_id_workstations IS NULL + ) + GROUP BY + emr.equipment_id, + emr.equipment_tag + ORDER BY + emr.equipment_id ASC; + ", [ + 'email1' => $userEmail, + 'email2' => $userEmail, + 'email3' => $userEmail, + 'email4' => $userEmail + ]); + + $workstationNameQuery = DB::select(" + SELECT construction_workstations.nomenclature_workstation + FROM construction_workstations + JOIN users + WHERE construction_workstations.name_workstations = users.user_name + AND users.email = :email; + ", ['email' => $userEmail]); + + $workstationName = $workstationNameQuery[0]->nomenclature_workstation; + + //Counting of equipments + $equipmentsTodoCount = count($equipmentsTodo); + $equipmentsDoneCount = count($equipmentsDone); + $equipmentsReturnedCount = count($equipmentsReturned); + + + //Returning values of the queries to workstations layout + $view->with([ + 'equipmentsTodo' => $equipmentsTodo, + 'equipmentsTodoCount' => $equipmentsTodoCount, + 'equipmentsDone' => $equipmentsDone, + 'equipmentsDoneCount' => $equipmentsDoneCount, + 'equipmentsReturned' => $equipmentsReturned, + 'equipmentsReturnedCount' => $equipmentsReturnedCount, + 'workstationName' => $workstationName + ]); + } +} diff --git a/app/Models/ControlEquipmentWorkstation.php b/app/Models/ControlEquipmentWorkstation.php index 9e8e076a..6ff4d16c 100755 --- a/app/Models/ControlEquipmentWorkstation.php +++ b/app/Models/ControlEquipmentWorkstation.php @@ -13,6 +13,8 @@ class ControlEquipmentWorkstation extends Model protected $table = 'control_equipment_workstation'; + protected $primaryKey = 'control_equipment_workstation_id'; + // protected $primaryKey = 'id'; public function equipment() diff --git a/app/Models/workstationsTaskAnswers.php b/app/Models/workstationsTaskAnswers.php new file mode 100644 index 00000000..182e3cad --- /dev/null +++ b/app/Models/workstationsTaskAnswers.php @@ -0,0 +1,18 @@ +X0N`L_V`pRKU}tCNfqlbOq`sY++5rOXU__NB}65_|LZt@0|0UW#sFi? zOcH=oKqh7&)A2ii$cf2Q%uK)i{uAsROe}1y%%@JWrsn`m%*-eI90v;v`+p0VPBF8v z0@>Jk#Z_)t^YLF)1z&^T_YVk6�>(I)6a|qW%Q)Rt*;PQcB;(Mb^Lw8Wa2cgh}W` z;omZV-%M<*CpkIbiHB26EGIgw|6}4L2NY-Fx7!_%V92qeRxs@`W~izrvQeBSr~Ro5%`&+`l`8C%G3|5eZJ&UX6=CPUCb z@K=&p)zcingUfFQM3^ucKic90)78Px?(wRsMulXQeAZJ!U`#`NXUP-UoRd8po+|Et z>?el!t{(CB(N185b*sM2WBo#ye(zdF`!u`pHclwBGN&FZ<-Cvb`?0V;6|^G)H{05% z=VneV;&JpZkH&=%;&s}PVzlX%mjg;nt2$Vod9m+vQMI}>rG(YSmyFnUnD#A=NR5@8ikj3wnimg|<~*KU`{p}^#icJ^U?*KQ@NSajdVU#h$oVMq-Pr-TuHh`N1p z_rg?%70IlKiB&gs(hxexOO7GmcP?Qfms-Mtnmy`vo9lPlP10SIb%r-GtIM0m=L<^@ zwm<~X{PQ@J@gNG`37ewJ`3`?zf%CWuq$1~lh*HipgCpUT&o-o0=l4yxm4&?uM!5V^ zgXe~({jFEFU#`>XV9&hv0WZg}Tx&#zKTe`o>JvIiHgkEDm`Ky;>&nP4tE-WIkRKOM ztsb=x{?qhj0CC6H+Z^pUd&;|Yx9dmhY5+V@DC_@gXXYHLwT){Ey%-`d2MbbrQd z4JoGIUVF59NA-g$q$WV({?&GN(Qy!cE>G9(o8iQ6YQ<1vFTpOadBst!d^^YoW;oaL zZa`sv{QxR_WW77I(^ypRWtJz5>e=4zcjXs&ip0aqD|-{9u(w997li+|rPKqPW8>lC7~(eVlHb&laSX86F}~Yy=rZPqT0%$!D)@Y8rpq;o z2Ug(G!P9i1bckqN(v)h%s=8Q23?xz;C2cUIWoYCP4UufUa45UsdD|xq`o#=qih@AF zyLtPJPJ;59*-!Ap#(uj312Lmor2D-4Tp`ayaUDX<(l(b23nzo`5kI>o%5N{ zK}t8=O1?NtRx)pU$=Vy<;9FvWZ?8dCE)}%eyEKe-Hef`TZFFi1l2rriOXG>y5BkEnfml;!3MF{u3+ zeOM)iSDoO>QJ`bf9PXO5o4fdtL0iz|vTYv8vJb!Fv!`(xp9UI*RKqN4LI-I-(BA26 zITP^UvRBaQdo9o|k=_NsKoPvehfH&_;4^dWxAd# zlOJXF<MSoCUG6{(chWS4~FE< zl>~`uhbC{uu68iWw^KGD{k_W`_Hp_pzOa>)BRE}0)EKsyG(#xNzGSv*cnnC0?L!~k zoV&8@*X1ADi*WSXAN_IYP`IPul<0*mlQ4lm*OgiINnZcFJ6iEx)n2>U?)EXj>a5Pn ztOge=aWaCKcUm*i8t&=lHQn{AEg7-g`uh5U;&wxwEj24ESn^wz_82jA=r%rd-31^~pu8 z>YBZ`l_!wnQPm05R5^;1(QuG|Fb(TS>X>(b%y?VveNdAh@KIL#y9(Vu$|$^ctFU3cmEMF@@Q=(0qkE&cR6kux&!$cPc+{HT^QyeD??l?q7VVWs z-x8muALQ))G55`AI+rHyUvY9R)B5%EyQlBc#9f1NcdZRx6Z7&y#j~TNW?km|-{pUA zNpwQ*3F@9rN?XsNY`wJUsGs?}hLXFTtW!T5p?G&4R{Mpjn?brTu*@j?l@(SVsu?rp zMX00H&skY*2PO5=G|F@4dQ(2xDpxg8=Ejf%NPN4|w?$ZYa@fx#fwpowzx7RY;pA?J z!OffOuBJOv!09EN>XoN@Xo&H2-q+V1=? zXfC*Q_H^yg2ZlKLHR)P!h`r-x9AbHX|J>a5PF0bU?r7{+f${OcF`JR6ch2pSJ20azUA5pSpZkP*WEzw4KFQKt~OMZ8r zqD&fcUrk=e*i89ufzM>xT*)rwOFjk!(wpvttOw^Zn%!#sR+6@)Cbes_`jBNWicO zmgrjA%@`>v@!{7r{2-6f7(x3U2p6}`fHrtYmLFiI_43x`<+(Pu$%15YOM24e!zx20 zkS|zJZ%krmrdZ=-?z7y3dFJfs;8rb&JaO3m-~(&^$B)sm9C#p*W#&sSiX-I}{8aQP zDAE}HHb_UHd`HN9T+hBgI-?QDbB`p(4GT-vwHSvtg{w}lP&(JWpu5st0v0spzTXu) zI5$n?gw_L$Om*O6B8Z>Avq(as;Fo{>ACtmDsjk*Qp`^bIb?@lejAFwfr9RZn2vDbq z7&+ne$V`CDF8FPP35qzg4=+UPJ~_)@Fw_C<6kD$^bcfii8OP(%f}`uVDVW4HN#U+5 zk=R!x?!(G@W>h5T@z=PDw-_SuOxxx6+)H0{zTko9KtXcP5I6m)2_Dpt+r4yJnO#`6lB0r{ zJ3JzyHz3_xb-WgiUWcVF+Y+N)9LU^4#^#2Srb(?_FD%Ww^`pNIn!ms)c36%B*gXF| z+TXyM4%x-;Rf8&hcImQZfdYx!FfsuGw7l60rYtWJs8WUl{JoD9jy6T&kaATX4aOLJ jJF_T%N8vU6rEzL<0avU$x5T}kbiIG`{=Xry)l<0D$!T0iN~&1PY#D2jAxg3IG6* zct))P$Q6C;Yybcdh#i3OjQkHgts+yu_waBLjS4|#8=^1%(F_d!!1{J{Y%YRxDu zMK9qa=Hukz1o5z>_i=J`b{F%JWc-(KvFG|fXdXuTf01}NNHWU)qm|xBLz`Y6>IR_~ z=H}%B^YRMN14X&{gaw88ft>XGy!^a8e9uLQiw`I!C?Y1nPycUVeAeb>Z6l_up!9ED z&n-#De-Fyr+nd{4fE(&&%flxsD$2vl&%@8p^-RI#?(6Jf>BHsh&h#G%3J`a&o1Ke? z9n_irABmP$P)`p@#%D|a?+~0^G&KH8@c-&9C#QeL^)G674_(NAoAJL=yX*V9KzMW^ z?odxRFyxt>=|9ZRzWaYG`iJn@8ZiYZ*wYE(>;Y1cWPHYOTiaQS@c|Y1g%m}EMC66| z`S=v&g!T%?(n7kXr(gW(I4~07Z zCwkiNp&n58_fVIALd8d~VF|W#{s-}oZ~tv7#LdnNVy)x`b)x^5bHwcahXEpj^1`zG zyh4h?Kp}n+c{wFnB>|wEu&juHlBlepkUZnRd944(fd9WdJkQE`{)y!Oi0pq*&*}0{ z^}q7;x$$3_4sm`?Z@1?>ep&#?15l8W|0&Oaii(1Yj*X6vhK7!Zg@u8Qk4Hd&kB9$~ zkeHH`kcgb3a2v|fyA^<$~0;r$o9{NAC z^}hh=1u_aM8al>5y-N6i7f3HqkWo=l(U8&5ke?^@b1wk^m5>3APZphsQOA{FK#!sUN-y0Bl%7x2FqZE5Dm#RbgeUk z{s~asviXK`gF+qqHTa8;E;888M!VOqd9~Vnz69Nd&|CjrQI>g{MaxHN`7>!>d8pKg z!@+(%Vv=Y=RDWeJ+JHX(CcB@kzQt)f%*f-S#|}xXo%g3^E^>tK3(OTq-8+R)bF8ff zx?{>ev|a-u*hwDU%6UJ2spOFA8z7f8;8eoDQg;#k?7kvr8lugWS6y(ULJskUNs%K6 zrZTVJ3YTHlm7@EhbO;AIgzIQeuc#a+b>^+mzP*O=>sAVO%EcPxyidyRWcEJWr>Cc>i`=MEnzJv|j(x-H`wjmz(u+v=C<`c2CR zJrt$rpiA4$N4*5A62mObX3*J*$B$|9*~KR0WU}_-IxYb|l-9T1U6$I6=2&`gGYj}Y z>#vFubq=Tdp&x}`NRJ15P4X8g7Z$7ThP|2=)44iFa8ojdKOSg0YOe8P-da+y?E_vg zY9-ev5WUqlmIY+F;{b10*%%=x{JS-9?9S~l63S7cwuQik1#G+IZhP;}Jc$~+rRlF$ z8>dSN6cmTKqF^f^+HBs*69E4^EB~#xQfb-Mo(@gm z5lz!DQ#rAva2FS}zWOE7TEQb^x$SK2PAc_hENI^R@{J2s_-a{#0;0A`_T4+Y=>;6U zhw@UB>qXj?$ChPtb;;0&Vi7lo=q3mL#BoK{uLFdLhvs8R%ZI;XJD7BVfIt4S0~J0! zVb>+>RmBD4R>noqzbz~EuvJvE0GhK~vmPH|sG40N(D3AXn##(TvXR*fsx5IX*Z@bd zqmO(_{hR&C@C6u=fG$V88>z|c>;f&xCw8tSqP^z+by5g>o(@d8Q8MBQV2b107tNE# zo%eHO996Vk>@&}&aI@k8z)g-BXa-hm;t=9=ZSn10>W~}jmbv>;M6LdYqbx51c`!xk zno%veE}l(iq^RKsvuO@rfTvph6}(53i~~ZC(EkVo8c64ej!1kn9RXIB!6!Mx$`>E9 zW&^mQrs-8niW(P)<_P`tPn4WbV1QDT)WZfbwQwKJM2^Ar^2&rqjrDK(a1Z zbUN+LWA+{!gBmCj3idhkq0%-5%yB?!?S1*W1#Q7W%STUqpzvNmqNXh+k(YKxgp7E! zcuS$!YUTom$>*k3G1Eu;xU$kcE4E%@Yk6(*5D4ijBi|(1#s~Q$ZhoBG4vLa5sv+V6 zq=`xKjkuN@iiurT>F%Sogz^Se14$wbYxmXoD!$Cp6X~`(^PF~%M@j>^+|%T09BcE7 zTlGwzB*;I}{eIJ2gyU>TwP zRe5kp9_dN8ufgpx(O%h$3S^_J^YIfZpY~*C=Ds|k>6EbC=J-5ES!k5&gcADL&PT3a zxvI55<<|dgjt86DHd9YaH#gUTktUS3@w`8N9u4|V*zvuUu?91C9s!kHl4zFu7RF!U z?HGnZ0i0c@cRvDUe+3-vlI_K-g|xm-V=k$3>03t)`O0nbz*qM;uKK|s%5mN)NWv<+ z+Qt8@@3rUWJd$JvWAQwzAs6VbV(?X*yElQ2+nX`!NyZ{wyj{0Q+r~L)S_f&rd-?=w zxgRgK+rmM_>o2pWi5mS>YP88)5+{7!@k?7OvTz*W&ANSXj*;N*r_)9lUXnUAz;-7b zmQo~B1E4bPxaLbxM9>y_WJktYhRw4FSZ3;0isJKDYGD<{?FW+o#bhk^BapQ~TYlY$ zSpDXzzYQAs*2(2ZSB)_wavV5L+Ie<%`{$dQxIJ31v6K7y25)*%l4-FSYWUcqQ&@H( z_35>vM*J3)rPOsPyfDn%AriN}{hEEudqPHgs|+F0$zfK;-HNJ0<_C+22)El2W*fDCmB% znB_rRnB{*m;md-ud4BFTqKBe8V?g7HGvXJdatd(dT@}IR)MbhI!W=V$$e$t4Nr)k5 zdP!|xTm2zZKHJB>+(#WGjI8(WjcpYScTkRB{ zy+`K_(~t-@GqV42ak%eaJ!>X{$dg>9@(tj%4%bL$9&_3!%b`}*;&?TksV%7puNxvY zbF6x8)x9$6-J`5Zu3|tD-AQkB+EpnyaDesegHM7)&73K-f!ul)AvB`)mnLR1u2QZy zj>>(_kH7ZmNu+8)yy(zJ5tNbFo+lFJD%*v#0lWneOu{hxe2pI+FyO6K{J@+w;t5dq z%K%fTPB_0sF4#(IlIqIVR9ZRXScQn5U`TU5_Hf*_j*g+3{=<59oij>V?$2Ge31Kfn z0?Kd}v-@w`@mDp~B$D@B{5iWR6CIC)_n$s2hy1kPXtWe#vKNZ47h+o>3c@z2If|3X%$N*;z+=PGhyz z!c73s>BfYBaDMyQ`@gR>+OJ1jRfbV*F%5R!X?}J#?TbGdHf7?>2y{*Vg)(i8)Kw$g zFmT$3K&X>;CxxGD`gqIyo__ONZ%9+tcTEpY=WiLWk-s{hh#|cOUVzOr_u1JnAQ3=I zofZ2fmq)-t!e{XP|%3;X)|Rei+NStG$#w5)AW z4^k%%LpDyK0p3lX-GYbhvQ_MME`=YN=tfXqq^B6F40WDKCbl{n_>8bQcB?n%dJ>>Z z{#~l%mN23s> zx(du#5hhhf*Q=$26(ljAWiAwyK}qkG+a+)gC!g2ZWeSw&z{Lh6NZ+|wAF&!d0eocrg5+=3+U!{j;9%E{CIank zgL#u1bM&})yat;mK*bDz2n2ocwre(PVFtye0Wm_(wK;gts}Lo&ymw3mb|^{tq@KCg z!#2C4M%RPMp~qor@KY9u!}$7IOM^{%pdyKf2lM7n)hnSxMW^UT`9x(BOep1>(2epS zby5}nEBE4<`fAkb-aw<5kbK!EK!arT{3$`08S!Cv4-Cb1>#DK;y7Z(^QIVS1;{xa% zhH^1u-IeN~Q9&pbu1sPt80HWx;n({iBLuznuSu5Kwa@4@gH1a2>11%pC9E`Bp>Wyg zpgwVd+;}dFHNdoWbLW94O0K0^x$Piq1FlVZc~14mLdI~Tu_?<0kHms`cjlPtkAdAF zvb@pF7mBx^Oi83AoaB5gCO@QqM;^4JgW+&k!1ce((#n1dGBX03e9@Kb97tZsz#@N+ zg6VQvSL=|?ieAKnOYZ27#&GSd@5)8D()(iOJT*GC(2H)kEO#Q-3;lyXHTS&kxT?64 zzhpjqy|ap)H^8YPLCLKcX6A62p5I+bCZD?eYCnb{{Z=)`Dk=WsO_Fm#- zOq&Tv;wq$`hE-{!fC^i8SUDySv=;lGiC`LUWxUpnv8d-QD>aXMRW}=vDw-EAXCBuK6)oq)-%aj=9gYL7eXn) zMfnCaDDs$?durkt+AJCjved^}2!q-A%HY6i^sm)e;~YNbyqaE1H(zt8#<9x2H>YuL zr~TNA`pH-jV%q*Xq3jhT1B4N=7`25aNIPb$TG?(JyFVB^Qx*Ow^4qQ4==40rSmIT+ zQHo+mQ^n+Eg+_0iwvRVcik&S=X(nr0D8XpF0ycI+wyVfk2Bf!L;qg~y$M3{ePf3H% zY4=f&*L9m0APF@-Ad0CKPfQ&$NV6NsZQ1k*aCEyaK5W0jzt%9M;3D}UAH-P?iF1vx zDgtYF5#k1m=LDd!{1u4VZ`To`FQECnM{HPb z;t7CO6y5+h*bCbj*>oV^+3b9$uNXeuA$$lc?g<!w>W6~6x@y;&oi_Q%(r}O@bbnVPt^avW}(QtX1t{pc%%~j{&(ra*BZQEf= zwSuY&ErmW$j8!k8QLK~e$kJv{RCMaZzYX%UJrg3ce10shW@R4FOTq=80DNHg ziytZ#?rY_wj59~l9aNcy+(P;T<@Z-CIixADFG?*H*d)SY`U_N0JRSLrV_JDi)%koY zt8{EZH#P_0&#N<(wXfZtuiPuQQmhFOis>rW+Fm%*K-#QzqkOCw60{_A*3SK#e zH46LkNr|CYlE z%XzlMtkA__h*b0Pth?iZy4lREaBz+x%5c5=!AKtm!TA8YYJEx_?*!^CFKv@kKAh8r zvfzmD5AUo!)oQpHzn*545MQ#S)?8rINkm>SBZcs00}`t})&W)QQFHw*iQ4t6Gq%zWjo%+lCQSo}Bvy65{_kz{{V z4(XI+g(0u|vtH;|UA`(!xkDxGz-6ycnzv)m`gw?S&ujEP8faQAqq*Jo)e$96?`^x} zi}`^*u7ggKFTzC58l}W+TV)lPYMdw4X=QO{+gC0Nr~R#SO4jbQZK0uF;T+&f)2j~GMKN(m4si;rWlb}0NeTwLABs5S{P4|W zmSS#hy0tRlylEIsU0q{h#;B6i#kxU+tulM@3D{>KZKF~*%e&+DqqULu!& zg7nf@q{(`Bv3yg6>=qI_rS>-%kn+4ep{ohtA3>N>ZrsBZ{^AO4%>A%iL&JbE)CMRK z-f8OdTb~e09BJWQb6>MXj>0;hzmjL?kr;?mT1%K$R>=cDIlK8|WfQe1%7qvpiChhH zSS~i|&UrwrxV(7u2`(IC7jci~-=Aqsh9!9VA_M0&HAREi#KAu6ydmld`IxP`_l?+L&-MQZRu1q&|Y@dV(y>WN++2~00^jWtX0teJ2uB&v@_CjV-GbKl%atuISW zvteu%BWQ(*5({H`EPzI^4{~J6>5`uZkEoDc|6!l6nb3^KDz^h1iY3Qv$=c*t%+Rxv z(Qft5g)kA3lIlG8&_~d4derRIIfX=lnd9-Cg zY>w9UTL}HUq6$6wkpNbtKxHko_z*n4lZbQ773TZF$PpyIvK_v2X1_xcrvJXgh4ZsW z{3v_f98a!lg~K(NaeXHSov_*>dGLZK(3`Mk@k8u7X#WWiGZW<}K2%nmZPv+L`PS}@ zHdk&0#=s;9c{RR(^_4!M7ZZ%dZ=^Ptaq%Zg3snS}E~j$(W`suaz^&oe*y3Gj0t8ooOfPd(92`w{S3jqYU>bR5PZ zO4vFg?FF^Kjd}tIzg7@J<@}v3(O|_JSH|gJfx+Y=WQm$mFwijl=-?D=SMCw1nEB^C z)$*dN2;zejqA9Zih7WYwPaD}2g-8TH@YPVK5PhF(O&;$q2^zto#7WlX7?TJO0MI2| z%g>!gE&u*K+C|h%Z@v?JRE9bXsc@g#V1gE-&!4BUX()WA^YiEA*ydPGdA0Zc&%(AN z6R!R#QFSr6lU{~Ad~Cx4gXXTf!l;?)FJF$UgyJ6;2IOxs>n9CtUzpO>(oS-;_gK6V z4P#buLti+7JMK@GL^;2%u2COBdx+c{Js|Fv1kM4%J(Qqjzxl2Ewgi^4b?bLOmjYZ! z2!I}i*jespy@D4S1lnUW{-T_Q{B6-Di8=f~=h>&TLO95sO;IO4EJcW3u~uamo^*eF zyRbq^X+K=sfK9IFG-9d#WAAlgjwp^C89?Z(pFM3;=|LYxVs5 z8a0r^f5>CY!D^HTIB2+f0+{FUNAH@&R8uAac!z79{&qbY9dT1tzWq|3<8!53{scho z;C4XqjQY`KoeZEqWf~zaA9iM0{qnq4(FBZoa3^3S5}1$YAWmYbK1CF zK0zH6l&)n58FHi#`f+4)*sZM9!N1O*0P-&o0t}?3#TKFoM!*_CA>rcf)@bMa|ruokm{d89hf+Y9-f<3#8$Lg;Ca6{)tWh}t?0Qwa-HZ51J!4*KU`Vz(Ume5T;ZgToryY zC!i>zQMBi!9NZ}zT3L-die_WaeLfD#3rs!AsO8cW@o()%x@^xWhZ}Uc*pwS z`YRyHm3^D~<>v~iGP_@sppL6|)q(OK+TK6jm$BVDx9B(W zIhfC&mll;ovFQro$$0!Ig%T0{%39-)C`Sz`Ymyj;iN0y5d~nATAF6HLGs4V3_0OknMtr{@lE0txpPycNWR&JK;6Ss~qW_OX`WKUMYXH+x@gfr8-2lg5Oyfiiw_l>uaSxz$aG;m%2Z{{a{%)QO4{I zsy{S{>Y-rxwbEU4`liRw281!m3tx2aLQn3(6lahg%}wxeV@{Sq^8ry0#riwE+WbT$ z=^{>aIfU?UXz%cGV8~B~fnM2g)F(MYw@d%XmOwmIqJebYMi+NYt~j1}9#wq8RQ7=0Qep;^$xeIPqNmVfYQr9Ap}82XUwEgd#=w zN0=_~6fRFPz{2R+^*ZlZE!*k+WqCC-Bj!3Gy0&9w2@TbpG&Og?r+j^p%lROba=eXm zX=*41m+lzWH>un;Gk)u&s>=qF9R5%(24|y>W4m&Sg~AV-qCJfX{KOK{2C~R>b``iZ zh(luMf%Tf}b?W^yR?*kSsOse?sl1GjCQk8E?5xYJ@0JZ|4Ngszcz zK?lvFwYs5yLJFe|r#CRAA}*c3oH#tM@|4l*Mn2!dcPe%&d6?;(d}BX8t`FY3B4-@G z!8`e$VndU?wTI>bUsi{GPvbA`3`1Kvp)H^&@#GXroiONmMQW+(F%A;LKWS`P_?FzA z60*1IGkY;VbI}X&=Z~1Cd`;TfiSa{ChuKk4Di`%<3U1A9PKr^~(fj!sGJ2W_>i2nM zQ|i#Ypi!`5EcbBm6CheBVu8s0L_~00?M0fZ5K52$>I3hz`j|nKj%H{&a<5DDxDndJ zro0JsNx698Cd;Dp`=^S>;&MmC!?Cw}&TTb#k?ZO2=KwfVH_^ zbAM#oC8YZv8!Ja(?fsZRz3@9Z&6!O%BrD$=%kf8NNCwuBT2~tzin5FSuHx+NtWRRj zHi^WQ^qS)Xu9~jdIu{1eBq@wyjU~ebNuZgW4J&*xu zyG|C`o~0Xl7qzWunj{n=;qkX6^HY*+dss~>oVMU(K-YzgSZ~|cQ%GNcgCikZ^5wU^ zc*;zdf;Phw6My!LxE05&K%<``lhF)Af9?0!sX2M`tOky0n>KM;C_5&aelkcE5T7n4 zB=>U<{KexEJz(#$iXhQ0gJ3(udNvt=xq^)G=|pwU1q}< zDJpg8G7n&mJ>6{Tg9@ygaSfuxo1_V;GtR*9$^9;`a0hqdR(LPpW?ttoy~6oBLpb1K zRkOwE%ylNbi`5W8z+$ooLZ`|2zM>eE{_9)KC|Hd^o zsKZpbFDi65a3i*{5SQagRm3S+7r4$E}WEN zQ(eY!wkW1_cS`LI2|}cXQoCNRN8vnp8Y&Q%eb4jSb~x|t#c~(RtT#XqU0JZsW;yaP zX{2o3ILUwKL-Ze$9GRs!NDfXl?ZpbenJ*!*o&X34l}DNSNqQ&%n}FhLs)4^nq+|MX zSXX~;$u>6V#im^#8Z4um+%i>sxJ_FlSWLGgcNO+@nOy9xKxlo+?^xV0a6XuxZA)au zu?&_K4GD-Dj$Q|R)z9z`EBthdd~Zbe#SOXr61}uPFV&S%h)V$U?oN%Z%$0`ry`KEu z_M(32BXv*7QlP~eg00Nn%IuW<`SxoRsn^LI$9kfif~`PqpF}mKktMC&WvYokS|jX& zT_P-9w$v^f;%T%r-y?6jvb4PuQI@8t#x#Uo_hN>#H#sPx2WPKhJ---Mo~N$O0`!`F zX@VouF8SIPL`Uozs-@grI&c}N|NL@D$n&oI2>_9p-50Yunfqp^Yb#`&?d7g0|9Ml? zCx#L=1Z_%rnTCVdY9JjY1+4%)=oGzwRTsAxa~;b&>VCh>*~tJhW}90+v~2IfawPjK zaN3RV%+5L%EYI*1x0y>ZWz$&^dK5T9vy}$L$CEoZ6LN>xN#ARW z;8K_3r#1np%&99Dcx)rXMRI)E@|n0RU#qArVxQ3=#|`D>FdC9tgB!!EPP*JDCl!YASxD{jF6_i9OT7k8HB_G& zKDg#zx+m8Qo2JzRKBpWa`{p$H_TuVjWs!!+5ULo&>@+bG0xvcr;&tuiiWKlig>foH zZ=pBTiU@0C1ILul?dwu+pLgC#Qg^F9r5G%QoXyM2D_ZYdLp)IP8cg4H!U7$!Zfe1jv^fRYxes zpAIoZ8X)(!JuWU!fW{}lE-}L8BeNxk;P>qtqxdhrl8w}TN6~E+vDZN&ilR{R3Dvbe ztIFS{R3CPLeIaCH#c_h}n{_P8hJJKu$83bkMFxufw=FsET$aD5zXDTCy3qEdJpnY} z=rHZc6J=V1-&@Jir}tmEMB_ZX8QF@oRgM5lum>da{xe$oQJ)dMufk)yI8z!BMJyCo zt_B57S!LOT@ck_I!qvyoGg__?0%7}nJMd-5TagR^pgh(n$y?&~1=?)>KJDx(hSY=kS?qpQfiooopmX=peZ*%E4 zkoXqAUR#-y$i5oQ&X$iY5b7nKW8~i7s+}J&u^LD!(o^>YAcZ7@-#Qs=O=mUgU9%xY^?}-; zX@M!-SIOuZ-MIvza6FH$zG0xKjEmail Tipo de Utilizador Ações - + Empresas @foreach ($users as $user) diff --git a/resources/views/Admin/DataManagement/manageassets.blade copy.php b/resources/views/Admin/DataManagement/manageassets.blade copy.php new file mode 100755 index 00000000..343cebad --- /dev/null +++ b/resources/views/Admin/DataManagement/manageassets.blade copy.php @@ -0,0 +1,450 @@ +@extends('Templates/templateAdmin') + +@section('Main-content') + +
+
+
+
+

Gestão de ativos

+
+
+ +
+
+
+
+ + + + +
+
+
+
+
+ +
+ +
+ +
+
+

Tabela de Ativos

+
+ +
+ + {{--
+ +
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ +
+ + +
+ +
--}} + +
+ {{-- Tabela para se usar com DataTables Yajra --}} + {{-- + + + + + + + + +
TagTipo EquipamentoFábricasDescrição Equipamento
--}} + + + + + + + + + + + + @foreach ($equipments as $equipment) + + + + + @endforeach + + + + + + {{-- --}} + + + + {{-- --}} + + + + + {{-- ./cardAssetsTable --}} + +
+ +
+ + + + +@endsection + +@section('scriptsTemplateAdmin') + + +{{-- + --}} + + {{-- Script para DataTables Yajra --}} + {{-- --}} + + + + {{-- --}} + + {{-- --}} + + +@endsection diff --git a/resources/views/Admin/DataManagement/manageassets.blade.php b/resources/views/Admin/DataManagement/manageassets.blade.php index 257b1218..aff9ae2e 100755 --- a/resources/views/Admin/DataManagement/manageassets.blade.php +++ b/resources/views/Admin/DataManagement/manageassets.blade.php @@ -6,7 +6,7 @@
-

Gestão de ativos

+

Gestão de ativos

TagTipo EquipamentoFábricasDescrição Equipamento
{{ $equipment->equipment_tag }}
+
+ + + + @foreach ($equipments as $equipment) + + + + + + + + @endforeach +
Tag Tipo Equipamento Fábricas Descrição EquipamentoAções
{{ $equipment->equipment_tag }}{{ $equipment->equipmentType->equipment_type_name }}{{ $equipment->unit->unit_name }}{{ $equipment->equipment_description }}Ações
- - - {{-- --}} - - - - {{-- --}}
+
{{-- ./cardAssetsTable --}} @@ -312,28 +89,41 @@ class="checkboxChoseTasksOficesCV" @endsection @section('scriptsTemplateAdmin') + + + {{-- + --}} - + --}} - - --}} + + {{-- + --}} @endsection diff --git a/resources/views/Admin/profile.blade.php b/resources/views/Admin/profile.blade.php index 470eeb7e..24b2306d 100755 --- a/resources/views/Admin/profile.blade.php +++ b/resources/views/Admin/profile.blade.php @@ -130,8 +130,7 @@ class="col-md-4 col-lg-3 form-label">Actualizar o seu logótipo.
- +
diff --git a/resources/views/LinksTemplate.blade.php b/resources/views/LinksTemplate.blade.php deleted file mode 100755 index e8e21ac7..00000000 --- a/resources/views/LinksTemplate.blade.php +++ /dev/null @@ -1,276 +0,0 @@ - - - - - - - - -{{-- Serve para trabelhar com data e hora no bootstrap , ver se necessario! --}} - -{{-- Para estilzar (checkbox) ver se necessario --}} - -{{-- EStudar este Plugins --}} - - - - {{-- Se você precisa de uma interface onde os utilizadors possam selecionar uma série de datas, como para uma reserva de hotel, por exemplo,--}} - - {{-- Estudar --}} - - {{-- Criacao de interface, Estudar --}} - - {{-- --}} - - {{-- DataTables --}} - - - - - - - - - - - - - - - - - - - - - - -{{-- Parte de Cima - Header --}} - - - - - -{{-- PARTE DE baixo no BODY --}} - - - - - {{-- DataTables --}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{-- Segunda Versao : --}} - - - - - - - - - - - - - {{-- DataTables --}} - - - - - - - - - -{{-- Parde de Baixo antes de fechar body --}} - - - - - - - - - - - - - - - - - -{{-- DataTables --}} - - - - - - - - - - - - - - - -{{-- Plugins-Scripts --}} - - - - - - - - - -{{-- FUNCIONA REAL --}} -{{-- PARTE DE CIMA --}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{-- Parte de Baixo --}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -{{-- - - --}} - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/views/Templates/templateWorkstations.blade.php b/resources/views/Templates/templateWorkstations.blade.php index 0177e506..2b5b2164 100644 --- a/resources/views/Templates/templateWorkstations.blade.php +++ b/resources/views/Templates/templateWorkstations.blade.php @@ -31,6 +31,15 @@ + + @@ -47,19 +56,19 @@ @@ -67,7 +76,7 @@
- - -
diff --git a/resources/views/email/email.blade.php b/resources/views/email/email.blade.php index 4e99a952..f263751d 100755 --- a/resources/views/email/email.blade.php +++ b/resources/views/email/email.blade.php @@ -1,4 +1,4 @@ -{{-- + @@ -16,16 +16,15 @@

Se não estava à espera deste e-mail ou não reconhece o projeto 'Ispt4.0', por favor, ignore esta mensagem.

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

Com os melhores cumprimentos,

-

Yure Ispt4.0

+

Ispt4.0

- --}} + - +{{-- -{{-- Greeting --}}

@if (! empty($greeting)) {{ $greeting }} @@ -38,21 +37,17 @@ @endif

-{{-- Intro Lines --}}

Temos o prazer de apresentar-lhe o acesso exclusivo ao formulário do projeto 'ISPT4.0'

-{{-- Action Button --}} @isset($actionText) {{ $actionText }} @endisset -{{-- Outro Lines --}}

Se não estava à espera deste e-mail ou não reconhece o projeto 'ISPT4.0', por favor, ignore esta mensagem.

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

Com os melhores cumprimentos,

Yure Ispt4.0

-{{-- Image --}} -
\ No newline at end of file +
--}} \ No newline at end of file diff --git a/resources/views/enterWorkstation.blade.php b/resources/views/enterWorkstation.blade.php deleted file mode 100755 index 127ef28c..00000000 --- a/resources/views/enterWorkstation.blade.php +++ /dev/null @@ -1,7 +0,0 @@ -@extends('Templates/templateAdmin') - -@section('Main-content') - -

Bem Vindo ...

- -@endsection \ No newline at end of file diff --git a/resources/views/recebeIdiota.blade.php b/resources/views/recebeIdiota.blade.php deleted file mode 100755 index abb22402..00000000 --- a/resources/views/recebeIdiota.blade.php +++ /dev/null @@ -1,67 +0,0 @@ -@extends('testIdiota') - -@section('idiota') -

Teste

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NamePositionOfficeAgeStart dateSalary
Tiger NixonSystem ArchitectEdinburgh612011-04-25$320,800
Garrett WintersAccountantTokyo632011-07-25$170,750
-@endsection - -@section('idiotaScripts') - -@endsection diff --git a/resources/views/recebeTestProgressBar.blade.php b/resources/views/recebeTestProgressBar.blade.php deleted file mode 100755 index e546ebeb..00000000 --- a/resources/views/recebeTestProgressBar.blade.php +++ /dev/null @@ -1,114 +0,0 @@ -@extends('Templates/templateAdmin') - -@section('Main-content') - - - -@endsection - -@section('scriptsTemplateAdmin') - -@endsection diff --git a/resources/views/templateAdminReal.blade.php b/resources/views/templateAdminReal.blade.php deleted file mode 100755 index 46b9df13..00000000 --- a/resources/views/templateAdminReal.blade.php +++ /dev/null @@ -1,344 +0,0 @@ - - - - - - - - - - ISPT 4.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - {{-- --}} - - {{-- DataTables --}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - {{--
- AdminLTELogo -
--}} - - - - - - - - -
-
-
-
-
- - @yield('Main-content') - -
- {{-- ./col-md-12 --}} -
- {{-- ./row justify-content-center --}} -
- {{-- ./container-fluid --}} -
- {{-- ./content --}} -
- {{-- ./content-wrapper --}} - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@yield('scripts') -{{-- Script que dao erro no projecto --}} - - - - - - -{{-- --}} - diff --git a/resources/views/test.blade.php b/resources/views/test.blade.php deleted file mode 100755 index 5fa44114..00000000 --- a/resources/views/test.blade.php +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - - - {{-- --}} - - - - -
-
-
- -
-
- - -
- -
-
About
-

Sunt est soluta temporibus accusantium neque nam maiores - cumque temporibus. Tempora libero non est unde veniam est qui dolor. Ut sunt iure - rerum quae quisquam autem eveniet perspiciatis odit. Fuga sequi sed ea saepe at - unde.

- -
Profile Details
- -
-
Full Name
-
Kevin Anderson
-
- -
-
Company
-
Lueilwitz, Wisoky and Leuschke
-
- -
-
Job
-
Web Designer
-
- -
-
Country
-
USA
-
- -
-
Address
-
A108 Adam Street, New York, NY 535022
-
- -
-
Phone
-
(436) 486-3538 x29071
-
- -
-
Email
-
k.anderson@example.com
-
- -
- -
- - -
-
- -
- Profile -
- - -
-
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
-
- -
- -
- - -
- -
- -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
- -
- -
-
- -
- -
- -
- -
- -
- -
-
- -
- -
- -
-
- -
- -
- -
-
- -
- -
-
- -
- -
- -
-
- -
-
-
- - {{-- --}} - - - - @livewire('management-dashboard.work-management') - - - - diff --git a/resources/views/testIdiota.blade.php b/resources/views/testIdiota.blade.php deleted file mode 100755 index 15bf4304..00000000 --- a/resources/views/testIdiota.blade.php +++ /dev/null @@ -1,240 +0,0 @@ - - - - - - - - Document - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @yield('idiota') - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @yield('idiotaScripts') - - - - - - - -
- -
-
-
-
- -
- - - {{-- --}} -
-
-
{{ $user->userType->type }} :: {{ $user->name }}
-
- -
-
- {{--

{{ $tipo_Utilizador }}

--}} -
-
-
-
-
-

Nome:

-
- -
-

Email:

-
-
- -
-
-

Telemovel:

-
- -
-

NIF:

-
-
- - {{--
-
-

Palavra-passe :

-
- -
-

Confirmar Palavra-passe :

-
-
--}} - -
-
- {{--

Nova Palavra-passe:

--}} -
-
- -
-
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - -{{-- Oficial --}} - - - -{{-- ./content --}} - -{{-- ./content-wrapper --}} \ No newline at end of file diff --git a/resources/views/workstations/TE1.blade.php b/resources/views/workstations/TE1.blade.php deleted file mode 100644 index e34fed03..00000000 --- a/resources/views/workstations/TE1.blade.php +++ /dev/null @@ -1,151 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') -
-
-
- - -
-
-
-

TE1 - Desmontar da linha

- Válvula XXXXX -
-
-
-
-
- - -
-
- - -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
- x - -
-
- - - -
-
- -
-
- -
-
- - - -
-
- - -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
- - -
-
-
-@endsection diff --git a/resources/views/workstations/TE10(2).blade.php b/resources/views/workstations/TE10(2).blade.php deleted file mode 100644 index a5b37703..00000000 --- a/resources/views/workstations/TE10(2).blade.php +++ /dev/null @@ -1,68 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE10 - CV - Montagem na linha

- Válvula XXXXX -
-
-
-
-
- - -
-
- - -
-
- - - -
-
- -
-
- -
-
- - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE10(2)1.blade.php b/resources/views/workstations/TE10(2)1.blade.php deleted file mode 100644 index 2c30ba29..00000000 --- a/resources/views/workstations/TE10(2)1.blade.php +++ /dev/null @@ -1,51 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE10.1 - CV - Confirmação das ligações

- Válvula XXXXX -
-
-
-
-
- - -
-
- - -
-
- - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE10.blade.php b/resources/views/workstations/TE10.blade.php deleted file mode 100644 index c7451e54..00000000 --- a/resources/views/workstations/TE10.blade.php +++ /dev/null @@ -1,68 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE10 - PSV ISV - Montagem na linha

- Válvula XXXXX -
-
-
-
-
- - -
-
- - -
-
- - - -
-
- -
-
- -
-
- - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE11.blade.php b/resources/views/workstations/TE11.blade.php deleted file mode 100644 index fb601a24..00000000 --- a/resources/views/workstations/TE11.blade.php +++ /dev/null @@ -1,63 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE11 - Inspeção final

- Válvula XXXXX -
-
-
-
-
- - -
-
- - -
-
- - - -
-
- - -
-
- - - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE12.blade.php b/resources/views/workstations/TE12.blade.php deleted file mode 100644 index 244b83b7..00000000 --- a/resources/views/workstations/TE12.blade.php +++ /dev/null @@ -1,196 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE12 - CV - Inspeção visual

- Válvula XXXXX -
-
-
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE13.blade.php b/resources/views/workstations/TE13.blade.php deleted file mode 100644 index f118ee70..00000000 --- a/resources/views/workstations/TE13.blade.php +++ /dev/null @@ -1,395 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE13 - CV - Teste final

- Válvula XXXXX -
-
-
-
-
- -
- - -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - -
- - -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- - -
- - - - -
- - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
- - -
- - -
- - -
- -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE14.blade.php b/resources/views/workstations/TE14.blade.php deleted file mode 100644 index 9ac5f390..00000000 --- a/resources/views/workstations/TE14.blade.php +++ /dev/null @@ -1,140 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE14 - ISV - Ensaio

- Válvula XXXXX -
-
-
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
-
- - -
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
- -
-
- - - -
- - -
- - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE15.blade.php b/resources/views/workstations/TE15.blade.php deleted file mode 100644 index 8c03d989..00000000 --- a/resources/views/workstations/TE15.blade.php +++ /dev/null @@ -1,146 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE15 - ISV - Empancar

- Válvula XXXXX -
-
-
-
-
- - -
-
- - -
-
- - - -
- - -
- - -
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE2.blade.php b/resources/views/workstations/TE2.blade.php deleted file mode 100644 index 26ea4a95..00000000 --- a/resources/views/workstations/TE2.blade.php +++ /dev/null @@ -1,67 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE2 - Descontaminar

- Válvula XXXXX -
-
-
-
-
- - -
-
- -
-
-
- - -
-
- - -
-
- - -
-
-
- - - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE3(2).blade.php b/resources/views/workstations/TE3(2).blade.php deleted file mode 100644 index eac47822..00000000 --- a/resources/views/workstations/TE3(2).blade.php +++ /dev/null @@ -1,364 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE3 - CV - Pré-teste

- Válvula XXXXX -
-
-
-
-
- -
- - -
- - -
-
- - -
-
- - - -
- - -
- - - -
-
- -
-
-
- -
-
-
-
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
-
- -
-
-
- - -
-
- - -
-
-
-
- - - -
-
-
- -
-
-
- - -
-
- - -
-
- - -
-
-
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- - - - -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - -
- - - - -
- -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE3.blade.php b/resources/views/workstations/TE3.blade.php deleted file mode 100644 index 9b5b6ecf..00000000 --- a/resources/views/workstations/TE3.blade.php +++ /dev/null @@ -1,407 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE3 - PSV - Pré-teste

- Válvula XXXXX -
-
-
-
-
- -
- - -
- - -
-
- - -
-
- - - -
- - -
- - - -
-
- -
-
-
- -
-
-
-
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- - -
-
-
- - -
-
- - -
-
-
- - -
- - - - -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- - -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
- - -
-
-
- - - -
-
- -
-
-
- - -
-
- - -
-
- - -
-
-
- - - -
-
- - -
-
-
- - -
-
- - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Falha ao abrirFalha de estanquicidade (Fuga)
- -
- - -
- -
- -
- - -
- -
- -
- - -
- -
- -
- - -
- -
- -
- - -
- -
- -
- - -
- -
- - -
- - - - -
- -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE4(2).blade.php b/resources/views/workstations/TE4(2).blade.php deleted file mode 100644 index 3ebf7993..00000000 --- a/resources/views/workstations/TE4(2).blade.php +++ /dev/null @@ -1,399 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE4 - PSV - Abertura de válvula, análise e controle dos componentes -

- Válvula XXXXX -
-
-
-
-
- -
-
- -
- - -
-
- -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- - - - -
-
- -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
- - -
- -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE4(3).blade.php b/resources/views/workstations/TE4(3).blade.php deleted file mode 100644 index 8727d25d..00000000 --- a/resources/views/workstations/TE4(3).blade.php +++ /dev/null @@ -1,250 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE4 - ISV - Abertura de válvula, análise e controle dos componentes -

- Válvula XXXXX -
-
-
-
-
- -
- - -
- - -
-
- - -
-
- - - -
- - -
- - -
- -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- - - - -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- - -
- -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE4.blade.php b/resources/views/workstations/TE4.blade.php deleted file mode 100644 index fb46b086..00000000 --- a/resources/views/workstations/TE4.blade.php +++ /dev/null @@ -1,339 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE4 - PSV - Abertura de válvula, análise e controle dos componentes -

- Válvula XXXXX -
-
-
-
-
- -
- - -
-
- -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- - - - -
-
- -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
- - -
- - -
- - -
- -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE5.blade.php b/resources/views/workstations/TE5.blade.php deleted file mode 100644 index 5c76f66a..00000000 --- a/resources/views/workstations/TE5.blade.php +++ /dev/null @@ -1,59 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE5 - Limpeza e lavagem dos componentes

- Válvula XXXXX -
-
-
-
-
- - -
-
- -
-
-
- - -
-
- - -
-
-
- - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE6.blade.php b/resources/views/workstations/TE6.blade.php deleted file mode 100644 index db3eba74..00000000 --- a/resources/views/workstations/TE6.blade.php +++ /dev/null @@ -1,84 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE6 - PSV - Retificação e limpeza

- Válvula XXXXX -
-
-
-
-
- -
- -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- -
- - -
-
- -
-
- -
-
- - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE7(2).blade.php b/resources/views/workstations/TE7(2).blade.php deleted file mode 100644 index 93ccaf95..00000000 --- a/resources/views/workstations/TE7(2).blade.php +++ /dev/null @@ -1,591 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE7 - CV - Fecho de válvula e substituição de componentes

- Válvula XXXXX -
-
-
-
-
- -
- - -
-
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- - - - -
- - -
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- - -
- -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE7(3).blade.php b/resources/views/workstations/TE7(3).blade.php deleted file mode 100644 index 950611e2..00000000 --- a/resources/views/workstations/TE7(3).blade.php +++ /dev/null @@ -1,393 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE7 - ISV - Fecho de válvula e substituição de componentes

- Válvula XXXXX -
-
-
-
-
- -
- - -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
- - - - -
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - -
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- -
- - -
- -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE7.blade.php b/resources/views/workstations/TE7.blade.php deleted file mode 100644 index dd4051c2..00000000 --- a/resources/views/workstations/TE7.blade.php +++ /dev/null @@ -1,227 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE7 - PSV - Fecho da válvula e substituição de componentes

- Válvula XXXXX -
-
-
-
-
- - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- - -
-
- - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE8.blade.php b/resources/views/workstations/TE8.blade.php deleted file mode 100644 index f29d72de..00000000 --- a/resources/views/workstations/TE8.blade.php +++ /dev/null @@ -1,187 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE8 - PSV - Calibrar e certificar

- Válvula XXXXX -
-
-
-
-
- - -
-
- -
-
-
- -
-
-
-
-
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
-
- - -
-
- - -
-
- - -
-
-
- - - -
-
- -
-
- -
-
- - - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/TE9.blade.php b/resources/views/workstations/TE9.blade.php deleted file mode 100644 index b012f50c..00000000 --- a/resources/views/workstations/TE9.blade.php +++ /dev/null @@ -1,59 +0,0 @@ -@extends('Templates.templateWorkstations') -@section('content') - -
-
-
- - -
-
-
-

TE9 - Pintura

- Válvula XXXXX -
-
-
-
-
- - -
-
- -
-
-
- - -
-
- - -
-
-
- - - -
-
- -
-
- - -
-
-
- -@endsection diff --git a/resources/views/workstations/start.blade.php b/resources/views/workstations/start.blade.php index eaef43f4..468f46bd 100644 --- a/resources/views/workstations/start.blade.php +++ b/resources/views/workstations/start.blade.php @@ -1,5 +1,6 @@ @extends('Templates.templateWorkstations') @section('content') +
diff --git a/resources/views/workstations/workstations.blade.php b/resources/views/workstations/workstations.blade.php new file mode 100644 index 00000000..5877880a --- /dev/null +++ b/resources/views/workstations/workstations.blade.php @@ -0,0 +1,4992 @@ +@extends('Templates.templateWorkstations') + +@section('content') + {{-- TE1 - Desmontar da linha --}} + @if ($task_todo == 1) +
+
+
+ + +
+
+
+

TE1 - Desmontar da linha

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+ +
+ @csrf + + +
+
+ + +
+
+ + +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+ x + + +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE2 - Descontaminar --}} + @if ($task_todo == 2) +
+
+
+ + +
+
+
+

TE2 - Descontaminar

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + + + +
+
+ + +
+
+ +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ + + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE3 - Pré-teste --}} + @if ($task_todo == 3) +
+
+
+ + +
+
+
+

TE3 - PSV - Pré-teste

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + + +
+
+ +
+ + +
+ + +
+
+ + +
+
+ + + +
+ + +
+ + + +
+
+ +
+
+
+ +
+
+
+
+
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + +
+ + + + +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Falha ao abrirFalha de estanquicidade (Fuga)
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ + +
+ + + + +
+ +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE3(2)-CV Pré-teste --}} + @if ($task_todo == 4) +
+
+
+ + +
+
+
+

TE3 - CV - Pré-teste

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} + +
+
+
+ @csrf + + +
+
+ +
+ + +
+ + +
+
+ + +
+
+ + + +
+ + +
+ + + +
+
+ +
+
+
+ +
+
+
+
+
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + +
+ + + + +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Falha ao abrirFalha de estanquicidade (Fuga)
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ +
+ + +
+ +
+ + +
+ + +
+ +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE4 - Abertura da válvula, análise e controle dos componentes --}} + @if ($task_todo == 5) +
+
+
+ + +
+
+
+

TE4 - PSV - Abertura de válvula, análise e controle dos + componentes +

+ Válvula XXXXX +
+
+
+ @csrf + + +
+
+ +
+ + +
+
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + + +
+
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+ + +
+ + +
+ + +
+ +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE4(2)-CV - Abertura da válvula, análise e controle dos componentes --}} + @if ($task_todo == 6) +
+
+
+ + +
+
+
+

TE4 - CV - Abertura de válvula, análise e controle dos + componentes +

+ Válvula XXXXX +
+
+
+ @csrf +
+
+ +
+
+ +
+ + +
+
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + + +
+
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+ + +
+ +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE4(2)-ISV - Abertura da válvula, análise e controle dos componentes --}} + @if ($task_todo == 7) +
+
+
+ + +
+
+
+

TE4 - ISV - Abertura de válvula, análise e controle dos + componentes +

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + +
+
+ +
+ + +
+ + +
+
+ + +
+
+ + + +
+ + +
+ + +
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + + +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + +
+ +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE5 - Limpeza e lavagem dos componentes --}} + @if ($task_todo == 8) +
+
+
+ + +
+
+
+

TE5 - Limpeza e lavagem dos componentes

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + +
+
+ + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE6 - Retificação e lapidação --}} + @if ($task_todo == 9) +
+
+
+ + +
+
+
+

TE6 - PSV - Retificação e limpeza

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + +
+
+ +
+ +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ +
+ + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE7 - Fecho da válvula e substituição de componentes --}} + @if ($task_todo == 10) +
+
+
+ + +
+
+
+

TE7 - PSV - Fecho da válvula e substituição de componentes +

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + +
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE7(2)-CV - Fecho da válvula e substituição de componentes --}} + @if ($task_todo == 11) +
+
+
+ + +
+
+
+

TE7 - CV - Fecho de válvula e substituição de componentes

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + + +
+
+ +
+ + +
+
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + + +
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + +
+ +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE7(3)-ISV - Fecho da válvula e substituição de componentes --}} + @if ($task_todo == 12) +
+
+
+ + +
+
+
+

TE7 - ISV - Fecho de válvula e substituição de componentes +

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + + +
+
+ +
+ + +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+ + + + +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ +
+ + +
+ +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE8 - Calibrar e certificar --}} + @if ($task_todo == 13) +
+
+
+ + +
+
+
+

TE8 - PSV - Calibrar e certificar

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + + +
+
+ + +
+
+ +
+
+
+ +
+
+
+
+
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE9 - Pintura --}} + @if ($task_todo == 14) +
+
+
+ + +
+
+
+

TE9 - Pintura

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + + +
+
+ + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE10 - Montagem na linha --}} + @if ($task_todo == 15) +
+
+
+ + +
+
+
+

TE10 - PSV ISV - Montagem na linha

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + +
+
+ + +
+
+ + +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE10(2)-CV - Montagem na linha --}} + @if ($task_todo == 16) +
+
+
+ + +
+
+
+

TE10 - CV - Montagem na linha

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+ +
+ @csrf + +
+
+ + +
+
+ + +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE11 - Inspeção Final --}} + @if ($task_todo == 17) +
+
+
+ + +
+
+
+

TE11 - Inspeção final

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + + +
+
+ + +
+
+ + +
+
+ + + +
+
+ + +
+
+ + + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE12 - Inspeção visual --}} + @if ($task_todo == 18) +
+
+
+ + +
+
+
+

TE12 - CV - Inspeção visual

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + +
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- Verificar quantos inputs sao retornados --}} + {{-- TE13 - Teste final --}} + @if ($task_todo == 19) +
+
+
+ + +
+
+
+

TE13 - CV - Teste final

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + +
+
+ +
+ + +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + +
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + +
+ + + + +
+ + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + +
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+ + +
+ + +
+ + +
+ +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- Consertar Formatacao --}} + {{-- TE14 - Ensaio --}} + @if ($task_todo == 20) +
+
+
+ + +
+
+
+

TE14 - ISV - Ensaio

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+
+ @csrf + +
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+
+ + +
+
+ + +
+
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+ + +
+ + +
+
+ +
+
+ + +
+
+
+ @endif + + {{-- TE15 - Empancar --}} + @if ($task_todo == 21) +
+
+
+ + +
+
+
+

TE15 - Empancar

+

+ {{ $receiveDataElementalTask->elemental_tasks_code }}-{{ $receiveDataElementalTask->elemental_tasks_description }} +

+ {{ $receiveDataEquipment->equipment_tag }} +
+
+
+ @csrf + + +
+
+ + +
+
+ + +
+
+ + + +
+ + +
+ + +
+
+
+ + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + + +
+
+ +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+ @endif +@endsection diff --git a/routes/web.php b/routes/web.php index 99d1b1aa..658e48d5 100755 --- a/routes/web.php +++ b/routes/web.php @@ -29,11 +29,17 @@ use App\Http\Controllers\ExecutionProjectController; use App\Http\Controllers\WorkstationsJobsController; + + +Route::get('formulario', function () { + return view('email/FormAdmin'); +})->name('formulario'); + route::get('testt', function () { return view('test'); }); -Route::get('te102', function(){ +Route::get('te102', function () { return view('workstations.TE10(2)'); }); @@ -114,7 +120,7 @@ Route::post('editProfile/{id}', 'EditProfile')->name('editProfile'); }); - Route::controller(CreateProjectController::class) +Route::controller(CreateProjectController::class) ->group(function () { // indication of progress bar to projects that are in 'Planning' Route::get('test1/{id}', 'showStep1')->name('test1'); @@ -165,36 +171,22 @@ */ Route::get('manageAssets', [ProjectoDatacontroller::class, 'ManageAssets'])->name('manageAssets'); + +Route::get('enterWorkstation', [WorkstationsJobsController::class, 'index'])->name('enterWorkstation'); +Route::get('controlEquipment', [WorkstationsJobsController::class, 'controlEquipment'])->name('controlEquipment'); + +Route::get('/getEquipmentData/{equipment_id}', [WorkstationsJobsController::class, 'getEquipmentData'])->name('getEquipmentData'); + + +Route::post('receiveAnswersEquipment', [WorkstationsJobsController::class, 'receiveAnswersEquipment'])->name('receiveAnswersEquipment'); + + Route::middleware(['auth', 'checkUserType'])->group(function () { // Rotas protegidas que exigem verificação de e-mail Route::get('/', [ProjectoDatacontroller::class, ('HomePage')])->name('home'); - - - - Route::get('enterWorkstation', [WorkstationsJobsController::class, 'index'])->name('enterWorkstation'); - /* - |-------------------------------------------------------------------------- - | Create Projects with Super Admin and Admin - |-------------------------------------------------------------------------- - | - |Crud model for the application's projects, where both their creation and the indication of project statuses are handled. - | - */ - Route::get('/CreateUsers/{id}', [Pending_UserController::class, 'ShowFormUser'])->name('ShowPendingUser'); - Route::post('formulario/receive', [Pending_UserController::class, 'store'])->name('criarUser'); - - - Route::post('/register', [CustomRegistrationController::class, 'store'])->name('register'); - - - - - - - - +}); /* @@ -208,11 +200,23 @@ | */ - // Mostrar Instalação click - Route::get('units/{id}', [ProjectoDatacontroller::class, 'showUnit'])->name('showUnit'); +// Mostrar Instalação click +Route::get('units/{id}', [ProjectoDatacontroller::class, 'showUnit'])->name('showUnit'); - -}); + +/* + |-------------------------------------------------------------------------- + | Create Projects with Super Admin and Admin + |-------------------------------------------------------------------------- + | + |Crud model for the application's projects, where both their creation and the indication of project statuses are handled. + | + */ +Route::get('/CreateUsers/{id}', [Pending_UserController::class, 'ShowFormUser'])->name('ShowPendingUser'); +Route::post('formulario/receive', [Pending_UserController::class, 'store'])->name('criarUser'); + + +Route::post('/register', [CustomRegistrationController::class, 'store'])->name('register'); Route::get('/CreateUsers', [Pending_UserController::class, 'ListPendingUsers'])->name('CreateUsers'); @@ -228,10 +232,6 @@ | be assigned to the "web" middleware group. Make something great! | */ -Route::get('formulario', function () { - return view('email/FormAdmin'); -})->name('formulario'); - diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 902574e4..7896523c 100755 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -39,6 +39,7 @@ 'App\\Http\\Middleware\\TrustProxies' => $baseDir . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\ValidateSignature' => $baseDir . '/app/Http/Middleware/ValidateSignature.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => $baseDir . '/app/Http/Middleware/VerifyCsrfToken.php', + 'App\\Http\\ViewComposers\\WorkstationComposer' => $baseDir . '/app/Http/ViewComposers/WorkstationComposer.php', 'App\\Livewire\\Articulado\\AdditonalTask' => $baseDir . '/app/Livewire/Articulado/AdditonalTask.php', 'App\\Livewire\\Articulado\\SelectElementalTasksInWonkstation' => $baseDir . '/app/Livewire/Articulado/SelectElementalTasksInWonkstation.php', 'App\\Livewire\\Execução\\EquipmentsDashboard' => $baseDir . '/app/Livewire/Execução/EquipmentsDashboard.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index a4bb5611..b46fd11d 100755 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -629,6 +629,7 @@ class ComposerStaticInit4de2290df2a8c5142f72130885c7079d 'App\\Http\\Middleware\\TrustProxies' => __DIR__ . '/../..' . '/app/Http/Middleware/TrustProxies.php', 'App\\Http\\Middleware\\ValidateSignature' => __DIR__ . '/../..' . '/app/Http/Middleware/ValidateSignature.php', 'App\\Http\\Middleware\\VerifyCsrfToken' => __DIR__ . '/../..' . '/app/Http/Middleware/VerifyCsrfToken.php', + 'App\\Http\\ViewComposers\\WorkstationComposer' => __DIR__ . '/../..' . '/app/Http/ViewComposers/WorkstationComposer.php', 'App\\Livewire\\Articulado\\AdditonalTask' => __DIR__ . '/../..' . '/app/Livewire/Articulado/AdditonalTask.php', 'App\\Livewire\\Articulado\\SelectElementalTasksInWonkstation' => __DIR__ . '/../..' . '/app/Livewire/Articulado/SelectElementalTasksInWonkstation.php', 'App\\Livewire\\Execução\\EquipmentsDashboard' => __DIR__ . '/../..' . '/app/Livewire/Execução/EquipmentsDashboard.php',