diff --git a/client/KnowledgeBank/completedProjects.ts b/client/KnowledgeBank/completedProjects.ts index 7a3a5eef9ef8159046938caa23852c659bdf1d51..9b59fd71f519579b59d4e17825d6f04992d6d0a8 100644 --- a/client/KnowledgeBank/completedProjects.ts +++ b/client/KnowledgeBank/completedProjects.ts @@ -116,9 +116,7 @@ export class projectCard { return ` <div class="totalExpandedOngoingWorkCard"> - <div style="cursor: default;" class="flex-container ongoingCard shadow" id="${ - this.projectId - }"> + <div style="cursor: default;" class="flex-container ongoingCard shadow" id="${this.projectId}"> <div class="ongoingCardImageContainer toSinglePage"> <div id="borderPinkFaded"> <div class = "flex-box ongoingCardImage toSinglePage"> @@ -136,26 +134,18 @@ export class projectCard { </div> <div class="div ongoingCardInfo toSinglePage"> <p class="toSinglePage" id="ongoingCardIdeaTitle">${this.title}</p> - <p class="toSinglePage" id="ongoingCardDepartment">${ - this.department - }</p> + <p class="toSinglePage" id="ongoingCardDepartment">${this.department}</p> <p class="toSinglePage" id="ongoingCardManager">${this.name}</p> <p class="toSinglePage" id="ongoingCardDatesCurrentProjects${this.projectId}" style="font-size: 13px; font-style: italic; margin-top: 5px;">${projectDates} </p> </div> - <button id="completed-page-button-${this.projectId}" data-project-id="${ - this.id - }" class="projectButton fs-6 text-white d-flex pb-2 pt-2" role="button" style="height: 10%; min-width: 15vw; white-space: nowrap; align-items: center; font-family:'Roboto', sans-serif;">Gå till Förbättringsarbetet</button> + <button id="completed-page-button-${this.projectId}" data-project-id="${this.id}" class="projectButton fs-6 text-white d-flex pb-2 pt-2" role="button" style="height: 10%; min-width: 15vw; white-space: nowrap; align-items: center; font-family:'Roboto', sans-serif;">Gå till Förbättringsarbetet</button> <div class="container ongoingSeeCardDetails toSinglePage"> <div class="ongoingSeeCardDetailsInner"> - <div id="completed-page-ongoingSeeDetailsButton${ - this.projectId - }" class = "moreInfoClass">> Mer information</div> + <div id="completed-page-ongoingSeeDetailsButton${this.projectId}" class = "moreInfoClass">> Mer information</div> </div> </div> </div> - <div class = "expandedOngoingWorkCard" id="expandedOngoingWorkCard${ - this.projectId - }" style="display: none;"> + <div class = "expandedOngoingWorkCard" id="expandedOngoingWorkCard${this.projectId}" style="display: none;"> <div class ="expandedTextOngoingWorkCard"> ${this.description} </div> @@ -167,7 +157,6 @@ export class projectCard { let projectCards: projectCard[] = []; let filteredImprovementWorks: any[] = []; - export async function loadPage(listenersLoaded: boolean) { const container = document.querySelector("#container-fluid"); @@ -233,6 +222,15 @@ export async function loadPage(listenersLoaded: boolean) { // Log all checked hospital IDs console.log("Checked hospitals:", checkedHospitalIds); + filteredImprovementWorks = await getFilteredImprovementWorks({ + patientRiskLevels: checkedPatientRiskLevels, + nolanStages: checkedNolanStages, + units: checkedUnitIds, + completed: true, + hospitalIds: checkedHospitalIds, + }); + removeCardsFromDiv("div.projectCardCardDiv"); + getProjects(container, listenersLoaded, filteredImprovementWorks); // Future change: Only clear the unitIds for unchecked hospitals! clearContent("unitSelection");