diff --git a/app/Http/Controllers/WorkstationsJobsController.php b/app/Http/Controllers/WorkstationsJobsController.php index ab95f143..5872a37a 100644 --- a/app/Http/Controllers/WorkstationsJobsController.php +++ b/app/Http/Controllers/WorkstationsJobsController.php @@ -1,5 +1,364 @@ 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 Illuminate\Http\Request; @@ -13,121 +372,7 @@ public function index() { $userEmail = Auth::user()->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(" + $equipmentsTodo = DB::select(" WITH equipments_multiple_rows AS ( SELECT e.equipment_id, @@ -144,7 +389,7 @@ public function index() JOIN ordered_equipment_tasks oet ON e.equipment_id = oet.equipment_id WHERE - u.email = :email + u.email = :email1 AND oet.execution_order = 1 GROUP BY @@ -164,7 +409,7 @@ public function index() JOIN workstations_association_tasks wat ON cw.id_workstations = wat.id_workstations WHERE - u.email = :email + u.email = :email2 ), workstations_control_all_tasks AS ( @@ -178,7 +423,7 @@ public function index() 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 + WHERE u.email = :email3 ) THEN cew.id_workstations ELSE NULL END AS control_id_workstations, @@ -195,7 +440,236 @@ public function index() 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 + 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 ) ) @@ -227,109 +701,12 @@ public function index() 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]); + ", [ + 'email1' => $userEmail, + 'email2' => $userEmail, + 'email3' => $userEmail, + 'email4' => $userEmail + ]); $workstationNameQuery = DB::select(" SELECT construction_workstations.nomenclature_workstation @@ -342,16 +719,16 @@ public function index() $workstationName = $workstationNameQuery[0]->nomenclature_workstation; //Counting of equipments - // $equipmentsTodoCount = count($equipmentsTodo); + $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, + return view('workstations.start', [ + 'equipmentsTodo' => $equipmentsTodo, 'equipmentsTodoCount' => $equipmentsTodoCount, 'equipmentsDone' => $equipmentsDone, 'equipmentsDoneCount' => $equipmentsDoneCount, 'equipmentsReturned' => $equipmentsReturned, 'equipmentsReturnedCount' => $equipmentsReturnedCount, 'workstationName' => $workstationName ]); } -} +} \ No newline at end of file diff --git a/app/Http/Controllers/userController.php b/app/Http/Controllers/userController.php index d12de3f6..44f291fb 100755 --- a/app/Http/Controllers/userController.php +++ b/app/Http/Controllers/userController.php @@ -5,6 +5,8 @@ use App\Models\TypeUser; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Auth; +use Illuminate\Support\Facades\File; + use Illuminate\Validation\ValidationException; @@ -21,38 +23,55 @@ class userController extends Controller { - public function EditProfile(Request $request){ + public function EditProfile(Request $request) + { + // dd($request); + $messages = [ + 'user_logo.max' => 'O tamanho da imagem não deve ser maior que 70KB.', + ]; - // dump($request); + $request->validate([ + 'user_logo' => 'image|mimes:jpeg,png,jpg,gif,svg|max:70', + 'fullName' => 'required', + 'email' => 'required|email|unique:users,email,' . $request->userID . ',user_id', + 'phone' => 'required', + 'nif' => 'required', + ], $messages); $user = User::find($request->userID); - $user->user_name = $request->fullName; + if ($request->hasFile('user_logo')) { + $imageName = time() . '.' . $request->user_logo->extension(); + + // Verifica se o usuário já tem uma imagem e se é diferente da nova imagem + if ($user->user_logo && $user->user_logo != $imageName) { + // Constrói o caminho completo para o arquivo de imagem existente + $existingImagePath = public_path('user_logos/' . $user->user_logo); + + // Verifica se o arquivo de imagem existente realmente existe no sistema de arquivos + if (File::exists($existingImagePath)) { + // Exclui o arquivo de imagem existente + File::delete($existingImagePath); + } + } + + // Move o novo arquivo de imagem para o diretório + $request->user_logo->move(public_path('user_logos'), $imageName); + + // Atualiza o campo user_logo do usuário com o nome do novo arquivo de imagem + $user->user_logo = $imageName; + } + + $user->user_name = $request->fullName; $user->email = $request->email; $user->user_phone = $request->phone; $user->user_nif = $request->nif; + $user->save(); - // $request->validate([ - // 'name' => 'required', - // 'email' => 'required|email|unique:users,email,' . $user->user_id, - // 'password' => 'nullable|min:8|confirmed', - // 'user_type' => 'required', - // 'user_phone' => 'required', - // 'user_nif' => 'required', - // ]); - - // $user->update([ - // 'name' => $request->get('name'), - // 'email' => $request->get('email'), - // 'password' => $request->filled('password') ? Hash::make($request->get('password')) : $user->password, - // 'user_type' => $request->get('user_type'), - // 'user_phone' => $request->get('user_phone'), - // 'user_nif' => $request->get('user_nif'), - // ]); - - return redirect('/users/listUsers')->with('success', 'Utilizadores atualizado com Sucesso!!'); + return back()->with('success', "Perfil actualizado com sucesso!"); } + public function UserProfile($id) { $user = User::find($id); @@ -109,7 +128,7 @@ public static function authenticateAndRedirect(Request $request) public function listCompanies() { $users = User::with('userType')->where('type_users', '=', 3)->get(); - + return view('Admin.CrudUsers.listCompany', compact('users')); } @@ -117,7 +136,7 @@ public function listCompanies() public function listUsers() { $users = User::with('userType')->where('type_users', '<>', 3)->get(); - + return view('Admin.CrudUsers.listUsers', compact('users')); } @@ -128,36 +147,38 @@ public function show($id) } public function edit($id) - { + { $user = User::findOrFail($id); - + return view('Admin.CrudUsers.editUsers', compact('user')); } public function update(Request $request, User $user) { - dump($request); - // $request->validate([ - // 'name' => 'required', - // 'email' => 'required|email|unique:users,email,' . $user->user_id, - // 'password' => 'nullable|min:8|confirmed', - // 'user_type' => 'required', - // 'user_phone' => 'required', - // 'user_nif' => 'required', - // ]); + // dump($request); - // $user->update([ - // 'name' => $request->get('name'), - // 'email' => $request->get('email'), - // 'password' => $request->filled('password') ? Hash::make($request->get('password')) : $user->password, - // 'user_type' => $request->get('user_type'), - // 'user_phone' => $request->get('user_phone'), - // 'user_nif' => $request->get('user_nif'), - // ]); + $request->validate([ + 'name' => 'required', + 'email' => 'required|email|unique:users,email,' . $user->user_id . ',user_id', + 'password' => 'nullable|min:8|confirmed', + 'user_type' => 'required', + 'user_phone' => 'required', + 'user_nif' => 'required', + ]); - // $userUpdate-> + $user->update([ + 'name' => $request->get('name'), + 'email' => $request->get('email'), + 'password' => $request->filled('password') ? Hash::make($request->get('password')) : $user->password, + 'user_type' => $request->get('user_type'), + 'user_phone' => $request->get('user_phone'), + 'user_nif' => $request->get('user_nif'), + ]); - return redirect('/users/listUsers')->with('success', 'Utilizadores atualizado com Sucesso!!'); + $user->save(); + + + return redirect('/users/listUsers')->with('success', 'Utilizador atualizado com Sucesso!!'); } diff --git a/app/Models/User.php b/app/Models/User.php index eadda4d3..45686ddb 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -27,7 +27,7 @@ class User extends Authenticatable * @var array */ - protected $fillable = ['user_name', 'email', 'password', 'user_phone', 'user_nif', 'type_users']; + protected $fillable = ['user_id','user_name', 'email', 'password', 'user_phone', 'user_nif', 'type_users']; /** diff --git a/public/user_logos/1696636614.png b/public/user_logos/1696636614.png new file mode 100644 index 00000000..e5f18688 Binary files /dev/null and b/public/user_logos/1696636614.png differ diff --git a/public/user_logos/1696759647.jpg b/public/user_logos/1696759647.jpg new file mode 100644 index 00000000..8fb40909 Binary files /dev/null and b/public/user_logos/1696759647.jpg differ diff --git a/public/user_logos/logoISPT4.0.jpg b/public/user_logos/logoISPT4.0.jpg new file mode 100644 index 00000000..6d603aec Binary files /dev/null and b/public/user_logos/logoISPT4.0.jpg differ diff --git a/resources/views/Admin/index.blade.php b/resources/views/Admin/index.blade.php index 350fb493..aa5eab8b 100755 --- a/resources/views/Admin/index.blade.php +++ b/resources/views/Admin/index.blade.php @@ -8,7 +8,7 @@
-

Dashboard

+

Dashboard

    @@ -48,7 +48,7 @@ class="info-box-number">{{ $CompanyProject->where('order_project', 1)->count() } @if ($project->order_project == 1)
    -
    {{ $project->company_project_description }}
    +
    {{ $project->company_project_description }}
    @@ -88,7 +88,7 @@ class="info-box-number">{{ $CompanyProject->where('order_project', 2)->count() } @if ($project->order_project == 2)
    -
    {{ $project->company_project_description }}
    +
    {{ $project->company_project_description }}
    @@ -127,7 +127,7 @@ class="info-box-number">{{ $CompanyProject->where('order_project', 3)->count() } @if ($project->order_project == 3)
    -
    {{ $project->company_project_description }}
    +
    {{ $project->company_project_description }}
    diff --git a/resources/views/Admin/profile.blade.php b/resources/views/Admin/profile.blade.php index b229d7d6..470eeb7e 100755 --- a/resources/views/Admin/profile.blade.php +++ b/resources/views/Admin/profile.blade.php @@ -1,164 +1,201 @@ @extends('Templates/templateAdmin') @section('Main-content') + @if (session('success')) + + + @endif -
    + @if ($errors->any()) +
    +
      + @foreach ($errors->all() as $error) +
    • {{ $error }}
      • + @endforeach +
    +
    + + @endif -
    -
    -
    - -

    -
    -
    -
    -
    -
    +
    - User Image -

    {{ $user->user_name }}

    -

    {{ $user->userType->type_user}}

    +
    +
    +
    + +

    +
    +
    +
    +
    +
    + + User Logo + +

    {{ $user->user_name }}

    +

    {{ $user->userType->type_user }}

    + +
    +
    -
    +
    -
    +
    +
    + +
      -
      -
      - -
        +
      • + +
        • -
      • - -
        • +
      • + +
        • -
      • - -
        • +
      +
      -
    -
    +
    -
    -
    -
    Nome e Apelido
    -
    {{$user->user_name}}
    + + +
    +
    Nome e Apelido
    +
    {{ $user->user_name }}
    +
    + +
    +
    Nif
    +
    {{ $user->user_nif }}
    +
    + +
    +
    Email
    +
    {{ $user->email }}
    +
    + +
    +
    Tipo de utilizador
    +
    {{ $user->type_users }}
    +
    + +
    +
    Telemóvel
    +
    {{ $user->user_phone }}
    +
    + +
    +
    Conta Criada em
    +
    {{ $user->created_at }}
    +
    -
    -
    Nif
    -
    {{$user->user_nif}}
    -
    +
    -
    -
    Email
    -
    {{$user->email}}
    -
    + +
    + @csrf + -
    -
    Tipo de utilizador
    -
    {{$user->type_users}}
    -
    - -
    -
    Telemóvel
    -
    {{$user->user_phone}}
    -
    - -
    -
    Conta Criada em
    -
    {{$user->created_at}}
    -
    -
    - -
    - - - - @csrf - - {{-- Quando for implementar a imagem ao Utilizador --}} - {{--
    - -
    - Profile -
    - - +
    + +
    + +
    -
    --}} - -
    - -
    - +
    + +
    + +
    -
    -
    - -
    - +
    + +
    + +
    -
    -
    - -
    - +
    + +
    + +
    -
    -
    - -
    - +
    + +
    + +
    -
    -
    - - -
    - +
    + -
    +
    + -
    +
    +
    + +
    + {{-- col-xl-8 --}}
    - {{-- col-xl-8 --}} -
    -
    +
    +
    + {{-- ./col-md-12 --}}
    - {{-- ./col-md-12 --}} -
    - {{-- ./row justify-content-center --}} + {{-- ./row justify-content-center --}} -
    - {{-- ./container-fluid" --}} -
    +
    + {{-- ./container-fluid" --}} +
    @endsection diff --git a/resources/views/Templates/templateAdmin.blade.php b/resources/views/Templates/templateAdmin.blade.php index c0e11059..9566d220 100755 --- a/resources/views/Templates/templateAdmin.blade.php +++ b/resources/views/Templates/templateAdmin.blade.php @@ -67,8 +67,12 @@ - + @@ -224,16 +235,18 @@ class="fas fa-bars">
    -
    - - User Image -
    -
    - @if (Auth::check()) + {{-- Verifica se esta logado , se estiver , busca os dados do utilizador atual. --}} + @if (Auth::check()) +
    + User Logo +
    +
    {{ Auth::user()->userType?->type_user }} - @endif -
    +
    + @endif
    @@ -356,10 +369,12 @@ class="d-block">{{ Auth::user()->userType?->type_user }} @@ -369,7 +384,6 @@ class="d-block">{{ Auth::user()->userType?->type_user }} - diff --git a/resources/views/Templates/templateWorkstations.blade.php b/resources/views/Templates/templateWorkstations.blade.php index d7361da7..0177e506 100644 --- a/resources/views/Templates/templateWorkstations.blade.php +++ b/resources/views/Templates/templateWorkstations.blade.php @@ -133,19 +133,19 @@ class="brand-image img-circle elevation-3" style="opacity: .8">

    - {{-- {{ $equipmentsTodoCount }} a iniciar --}} + {{ $equipmentsTodoCount }} a iniciar

    @@ -153,19 +153,19 @@ class="brand-image img-circle elevation-3" style="opacity: .8">

    - {{-- {{ $equipmentsReturnedCount }} retornadas --}} + {{ $equipmentsReturnedCount }} retornadas

    @@ -248,19 +248,19 @@ class="brand-image img-circle elevation-3" style="opacity: .8">

    - {{-- {{ $equipmentsDoneCount }} válvulas concluídas --}} + {{ $equipmentsDoneCount }} válvulas concluídas

    diff --git a/resources/views/projectsClients/articulated_2.blade.php b/resources/views/projectsClients/articulated_2.blade.php index 31c45a49..b58182f9 100755 --- a/resources/views/projectsClients/articulated_2.blade.php +++ b/resources/views/projectsClients/articulated_2.blade.php @@ -30,7 +30,6 @@ -
    @@ -59,16 +58,15 @@
    -
    -

    Criar Equipamentos Manualmente

    +
    +

    Criar Equipamentos Manualmente

    - +
    -
    +
    @@ -1058,16 +1056,15 @@ class="form-control card_inputs" id="PositionerSerialNumber"
    -
    -

    Selecionar Equipamentos

    +
    +

    Selecionar Equipamentos

    - +
    -
    +
    @@ -1143,7 +1140,7 @@ class="fas fa-plus"> class="btn btn-info">Baixar Template {{-- Baixar Template --}}
    - +
    Baixar Template
    -
    +
    -
    - -
    - - -
    -
    + @livewire('articulado.additonal-task', ['equipment' => $listEquipmentsProject], key($listEquipmentsProject->equipment_id))
    - - - {{-- ./description --}}
    {{-- ./card-body --}}
    @@ -2363,7 +2312,7 @@ class="form-control card_inputs"
    - @livewire('articulado.additonal-task',['equipment' => $listEquipmentsProject], key($listEquipmentsProject->equipment_id)) + @livewire('articulado.additonal-task', ['equipment' => $listEquipmentsProject], key($listEquipmentsProject->equipment_id))
    {{-- ./description --}} @@ -2944,7 +2893,7 @@ class="form-control card_inputs" - + TE11 Inspeção Final @@ -2965,11 +2914,11 @@ class="form-control card_inputs"
    -
    - {{-- @foreach ($taskExecutionOrders as $taskExecutionOrder) + {{--
    + @foreach ($taskExecutionOrders as $taskExecutionOrder)

    {}

    - @endforeach --}} + @endforeach
    -
    +
    --}} + + @livewire('articulado.additonal-task', ['equipment' => $listEquipmentsProject], key($listEquipmentsProject->equipment_id))
    - + {{--
    - +
    @@ -3020,7 +2971,7 @@ class="btn btn-outline-success ">Adicionar
    -
    +
    --}} {{-- ./description --}}
    {{-- ./card-body --}} @@ -3095,8 +3046,9 @@ class="btn btn-outline-success ">Adicionar
    - Anterior - Seguinte + + Anterior + Seguinte
    {{-- ./container-fluid --}} @@ -3390,41 +3342,6 @@ class="btn btn-outline-success ">Adicionar @endsection @section('scriptsTemplateAdmin') - {{-- --}} - - {{-- --}} - - - + + + {{-- --}} + + + @endsection diff --git a/resources/views/workstations/index.blade.php b/resources/views/workstations/start.blade.php similarity index 100% rename from resources/views/workstations/index.blade.php rename to resources/views/workstations/start.blade.php diff --git a/routes/web.php b/routes/web.php index 4e217899..99d1b1aa 100755 --- a/routes/web.php +++ b/routes/web.php @@ -111,7 +111,7 @@ Route::get('users/{id}/edit', 'edit')->name('users.edit'); Route::put('users/{user}', 'update')->name('users.update'); Route::delete('users/{user}', 'destroy')->name('users.destroy'); - Route::get('editProfile/{id}', 'EditProfile')->name('editProfile'); + Route::post('editProfile/{id}', 'EditProfile')->name('editProfile'); }); Route::controller(CreateProjectController::class) @@ -182,7 +182,6 @@ |Crud model for the application's projects, where both their creation and the indication of project statuses are handled. | */ - Route::get('/CreateUsers', [Pending_UserController::class, 'ListPendingUsers'])->name('CreateUsers'); Route::get('/CreateUsers/{id}', [Pending_UserController::class, 'ShowFormUser'])->name('ShowPendingUser'); Route::post('formulario/receive', [Pending_UserController::class, 'store'])->name('criarUser'); @@ -215,6 +214,7 @@ }); +Route::get('/CreateUsers', [Pending_UserController::class, 'ListPendingUsers'])->name('CreateUsers');