diff --git a/client/projectPage/projectPageA.ts b/client/projectPage/projectPageA.ts index 12f792c8baecbfd90ffc63df3bb72f0f261a15f9..ede5383fb6ca5ca7839cebc96b62802d3ea00e8b 100644 --- a/client/projectPage/projectPageA.ts +++ b/client/projectPage/projectPageA.ts @@ -71,7 +71,7 @@ async function loadImprovementWorkDataPageA(projectId:string) { a3.value = improvementWork.a3; a4.value = improvementWork.a4; - const aAreaElement = document.getElementById("aUnit") as HTMLParagraphElement; + const aAreaElement = document.getElementById("aArea") as HTMLParagraphElement; aAreaElement.textContent = improvementWork.area; try { @@ -85,7 +85,7 @@ async function loadImprovementWorkDataPageA(projectId:string) { const aUnit = aUnitArray[0]; const unitName = aUnit.name; - const aUnitElement = document.getElementById("aArea") as HTMLParagraphElement; + const aUnitElement = document.getElementById("aUnit") as HTMLParagraphElement; aUnitElement.textContent = unitName; try { diff --git a/client/projectPage/projectPageG.html b/client/projectPage/projectPageG.html index 648ececc293569da62763f3dc4a35fefdf930d47..98ec9c2ac7d4136341d2245f3cb5910ab6e6f4e5 100644 --- a/client/projectPage/projectPageG.html +++ b/client/projectPage/projectPageG.html @@ -26,9 +26,12 @@ <!-- Right content --> <div> - <p>Sjukhus: </p> - <p>Enhet: </p> - <p>Område: </p> + <p>Sjukhus: </p> + <p id="gHospital"></p> + <p>Enhet: </p> + <p id="gUnit"></p> + <p>Område: </p> + <p id="gArea"></p> </div> </div> diff --git a/client/projectPage/projectPageG.ts b/client/projectPage/projectPageG.ts index 98d05654ef0e1add2b00aa96649fcb501ae05149..06866c38129bf455318e3b4526187b3b8b674300 100644 --- a/client/projectPage/projectPageG.ts +++ b/client/projectPage/projectPageG.ts @@ -1,5 +1,5 @@ import { loadProjectPageP, loadProjectPageS } from "../SidebarAndHeader/pageHandler.js"; -import {getObjectById, updateInstance } from "../Database/database.js"; +import {getObjectById, updateInstance, getHospitals, getUnits } from "../Database/database.js"; async function updateStage(stage : string, id : string){ updateInstance("improvementWork", id, {currentStage:stage}) @@ -68,6 +68,43 @@ async function loadImprovementWorkDataPageG(projectId:string) { g3.value = improvementWork.g3; g4.value = improvementWork.g4; g5.value = improvementWork.g5; + + const aAreaElement = document.getElementById("gArea") as HTMLParagraphElement; + aAreaElement.textContent = improvementWork.area; + + try { + const aUnitArray = await getUnits({ unitId: improvementWork.unitId }); + + if (aUnitArray.length === 0) { + console.log("Error loading the units.") + return; + } + + const aUnit = aUnitArray[0]; + const unitName = aUnit.name; + + const aUnitElement = document.getElementById("gUnit") as HTMLParagraphElement; + aUnitElement.textContent = unitName; + + try { + const hospitalArray = await getHospitals({ hospitalId: aUnit.hospitalId }); + + if (hospitalArray.length === 0) { + console.log("Error loading the hospitals.") + return; + } + + const aHospital = hospitalArray[0]; + const hospitalName = aHospital.name; + + const aHospitalElement = document.getElementById("gHospital") as HTMLParagraphElement; + aHospitalElement.textContent = hospitalName; + } catch (error) { + console.error("Error loading the hospital. (catch)"); + } + } catch (error) { + console.error("Error loading the unit. (catch)"); + } } async function saveImprovementWorkEditG(projectId:string) { diff --git a/client/projectPage/projectPageP.html b/client/projectPage/projectPageP.html index 6df4b25f7445c4c57e1780412b5a64b69adef716..1157fb8457ad0b37bcfecb6e0d17b6fc347cb1de 100644 --- a/client/projectPage/projectPageP.html +++ b/client/projectPage/projectPageP.html @@ -22,9 +22,12 @@ <!-- Right content --> <div> - <p>Sjukhus: </p> - <p>Enhet: </p> - <p>Område: </p> + <p>Sjukhus: </p> + <p id="pHospital"></p> + <p>Enhet: </p> + <p id="pUnit"></p> + <p>Område: </p> + <p id="pArea"></p> </div> </div> diff --git a/client/projectPage/projectPageP.ts b/client/projectPage/projectPageP.ts index 0edda516fde168bd6c9e082b5d7814b44d2d45c0..6f377e9fad9b33fabec838b04b402f2524cae43d 100644 --- a/client/projectPage/projectPageP.ts +++ b/client/projectPage/projectPageP.ts @@ -1,5 +1,5 @@ import { loadProjectPageG } from "../SidebarAndHeader/pageHandler.js"; -import {getObjectById, updateInstance } from "../Database/database.js"; +import {getObjectById, updateInstance, getHospitals, getUnits} from "../Database/database.js"; async function updateStage(stage : string, id : string){ updateInstance("improvementWork", id, {currentStage:stage}) @@ -85,6 +85,42 @@ async function loadImprovementWorkDataPageP(projectId:string) { p6.value = improvementWork.p6; p7.value = improvementWork.p7; + const aAreaElement = document.getElementById("pArea") as HTMLParagraphElement; + aAreaElement.textContent = improvementWork.area; + + try { + const aUnitArray = await getUnits({ unitId: improvementWork.unitId }); + + if (aUnitArray.length === 0) { + console.log("Error loading the units.") + return; + } + + const aUnit = aUnitArray[0]; + const unitName = aUnit.name; + + const aUnitElement = document.getElementById("pUnit") as HTMLParagraphElement; + aUnitElement.textContent = unitName; + + try { + const hospitalArray = await getHospitals({ hospitalId: aUnit.hospitalId }); + + if (hospitalArray.length === 0) { + console.log("Error loading the hospitals.") + return; + } + + const aHospital = hospitalArray[0]; + const hospitalName = aHospital.name; + + const aHospitalElement = document.getElementById("pHospital") as HTMLParagraphElement; + aHospitalElement.textContent = hospitalName; + } catch (error) { + console.error("Error loading the hospital. (catch)"); + } + } catch (error) { + console.error("Error loading the unit. (catch)"); + } } async function saveImprovementWorkEditP(projectId:string) { diff --git a/client/projectPage/projectPageS.html b/client/projectPage/projectPageS.html index f374a448ad4b02d944c327a99a14ebd725c20242..4903c7227f9524a59d68acd667720a36342391bf 100644 --- a/client/projectPage/projectPageS.html +++ b/client/projectPage/projectPageS.html @@ -24,10 +24,13 @@ <!-- Right content --> <div> - <p>Sjukhus: </p> - <p>Enhet: </p> - <p>Område: </p> -</div> + <p>Sjukhus: </p> + <p id="sHospital"></p> + <p>Enhet: </p> + <p id="sUnit"></p> + <p>Område: </p> + <p id="sArea"></p> + </div> </div> <article class="infoText"> diff --git a/client/projectPage/projectPageS.ts b/client/projectPage/projectPageS.ts index acfdd179d10528d233c539fa277626ccda682809..57d310ca75ba6732998e54e5895e3bb9a2609514 100644 --- a/client/projectPage/projectPageS.ts +++ b/client/projectPage/projectPageS.ts @@ -1,5 +1,5 @@ import { loadProjectPageA,loadProjectPageP,loadProjectPageG, loadProjectPageS } from "../SidebarAndHeader/pageHandler.js"; -import {getObjectById, updateInstance } from "../Database/database.js"; +import {getObjectById, updateInstance, getHospitals, getUnits } from "../Database/database.js"; async function updateStage(stage : string, id : string){ updateInstance("improvementWork", id, {currentStage:stage}) @@ -63,6 +63,43 @@ async function loadImprovementWorkDataPageS(projectId:string) { s1.value = improvementWork.s1; s2.value = improvementWork.s2; s3.value = improvementWork.s3; + + const aAreaElement = document.getElementById("sArea") as HTMLParagraphElement; + aAreaElement.textContent = improvementWork.area; + + try { + const aUnitArray = await getUnits({ unitId: improvementWork.unitId }); + + if (aUnitArray.length === 0) { + console.log("Error loading the units.") + return; + } + + const aUnit = aUnitArray[0]; + const unitName = aUnit.name; + + const aUnitElement = document.getElementById("sUnit") as HTMLParagraphElement; + aUnitElement.textContent = unitName; + + try { + const hospitalArray = await getHospitals({ hospitalId: aUnit.hospitalId }); + + if (hospitalArray.length === 0) { + console.log("Error loading the hospitals.") + return; + } + + const aHospital = hospitalArray[0]; + const hospitalName = aHospital.name; + + const aHospitalElement = document.getElementById("sHospital") as HTMLParagraphElement; + aHospitalElement.textContent = hospitalName; + } catch (error) { + console.error("Error loading the hospital. (catch)"); + } + } catch (error) { + console.error("Error loading the unit. (catch)"); + } } async function saveImprovementWorkEditS(projectId:string) {