Skip to content
Snippets Groups Projects
Commit 402effc7 authored by Emil Svevar's avatar Emil Svevar
Browse files

Merge branch 'getInfoPGSA' into 'dev'

IR7: Hospital name, unit name and area are now showing on the 'A' page

See merge request !113
parents ca8347a9 9ba100e0
No related branches found
No related tags found
4 merge requests!139The members of the project should be showing now in pgsa pages, but there are...,!134The members of the project should be showing now in pgsa pages, but there are...,!113IR7: Hospital name, unit name and area are now showing on the 'A' page,!107Added autofill from database into text boxes, but now data is taken from wrong...
Pipeline #110245 passed
This commit is part of merge request !107. Comments created here will be created in the context of that merge request.
......@@ -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">
......
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)");
}
}
......
......@@ -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) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment