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

Hospital name, unit name and area are now displayed on all project pages in pgsa

parent 402effc7
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...,!114Hospital name, unit name and area are now displayed on all project pages in pgsa,!107Added autofill from database into text boxes, but now data is taken from wrong...
......@@ -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 {
......
......@@ -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>
......
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) {
......
......@@ -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>
......
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) {
......
......@@ -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">
......
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) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment