diff --git a/client/projectPage/projectPageA.html b/client/projectPage/projectPageA.html index 41d1748bc82085a98591fd4eb413e2827813581c..bac9f144576ce5ad798d2b92952ab7fb25b9c418 100644 --- a/client/projectPage/projectPageA.html +++ b/client/projectPage/projectPageA.html @@ -26,9 +26,12 @@ <!-- Right content --> <div> <p>Sjukhus: </p> + <p id="aHospital"></p> <p>Enhet: </p> + <p id="aUnit"></p> <p>Område: </p> -</div> + <p id="aArea"></p> + </div> </div> <article class="infoText"> diff --git a/client/projectPage/projectPageA.ts b/client/projectPage/projectPageA.ts index fc526133ce2353bf9b137ffd47b7721c0e77614e..12f792c8baecbfd90ffc63df3bb72f0f261a15f9 100644 --- a/client/projectPage/projectPageA.ts +++ b/client/projectPage/projectPageA.ts @@ -1,5 +1,5 @@ import { loadCurrentProjects } from "../SidebarAndHeader/pageHandler.js"; -import {getObjectById, finalizeImprovementWork, updateInstance } from "../Database/database.js"; +import {getObjectById, finalizeImprovementWork, updateInstance, getUnits, getHospitals} from "../Database/database.js"; import { updateDoc, doc } from "firebase/firestore"; import { loadProjectPageP, loadProjectPageS,loadProjectPageG, loadProjectPageA } from "../SidebarAndHeader/pageHandler.js"; @@ -70,6 +70,44 @@ async function loadImprovementWorkDataPageA(projectId:string) { a2.value = improvementWork.a2; a3.value = improvementWork.a3; a4.value = improvementWork.a4; + + const aAreaElement = document.getElementById("aUnit") 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("aArea") 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("aHospital") as HTMLParagraphElement; + aHospitalElement.textContent = hospitalName; + } catch (error) { + console.error("Error loading the hospital. (catch)"); + } + } catch (error) { + console.error("Error loading the unit. (catch)"); + } + } diff --git a/client/projectPage/projectPageP.ts b/client/projectPage/projectPageP.ts index 380b479b31a933156bafa2b6d97b2086b42b77eb..0edda516fde168bd6c9e082b5d7814b44d2d45c0 100644 --- a/client/projectPage/projectPageP.ts +++ b/client/projectPage/projectPageP.ts @@ -84,6 +84,7 @@ async function loadImprovementWorkDataPageP(projectId:string) { p5.value = improvementWork.p5; p6.value = improvementWork.p6; p7.value = improvementWork.p7; + } async function saveImprovementWorkEditP(projectId:string) {