diff --git a/client/homePage.ts b/client/homePage.ts index eb58f580115f878cc26d3282035efdca11d69f86..6064f4554d817c5479fe50bf7d41d479088496b8 100644 --- a/client/homePage.ts +++ b/client/homePage.ts @@ -485,7 +485,7 @@ async function improvementWorkInfo(departmentContainer: any, user: any) { } } -async function getProjects( +export async function getProjects( selectElement: HTMLElement, listenersLoaded: boolean, userHsaId: string diff --git a/client/profilePage.ts b/client/profilePage.ts index 1f616a4f062915cd0c3f9127e2a983fa885272c2..d4d55da9393ef4f1177979e490c4416621e143cd 100644 --- a/client/profilePage.ts +++ b/client/profilePage.ts @@ -11,6 +11,10 @@ import { } from "./SidebarAndHeader/pageHandler.js"; import { projectCard, addEventListener } from "./currentProjects/currentProjects.js"; +import { + getProjects +} from "./homePage.js" + function logoutUser(event : Event) { event.preventDefault(); alert('logout') @@ -297,77 +301,77 @@ async function createNewIdeaCard( let projectCards: projectCard[] = []; - async function getProjects( - selectElement: Element, - listenersLoaded: boolean, - improvementWorks: any[] - ) { - let id = 0; - projectCards = []; - improvementWorks.forEach(async (improvementWork) => { - let title = improvementWork.name; - let department = await getObjectById("unit", improvementWork.unitId); - let projectLeader = await getImprovementWorkResponsible(improvementWork.id); - if (department) { - let card = new projectCard( - id, - projectLeader.firstName + " " + projectLeader.lastName, - department.name, - title, - improvementWork.content, - improvementWork.id, - improvementWork.currentStage, - improvementWork.dateStarted, - improvementWork.endDate, - improvementWork.completed, - ); - projectCards.push(card); - let cardHTML = card.generateHTML(); - let div = document.createElement("div"); - div.className = "projectCardCardDiv"; // Set the class name(s) here - div.innerHTML = cardHTML; - if (!selectElement) return; - selectElement.appendChild(div); // Stop if the container isn't found - addEventListener(improvementWork.id, card); + // async function getProjects( + // selectElement: Element, + // listenersLoaded: boolean, + // improvementWorks: any[] + // ) { + // let id = 0; + // projectCards = []; + // improvementWorks.forEach(async (improvementWork) => { + // let title = improvementWork.name; + // let department = await getObjectById("unit", improvementWork.unitId); + // let projectLeader = await getImprovementWorkResponsible(improvementWork.id); + // if (department) { + // let card = new projectCard( + // id, + // projectLeader.firstName + " " + projectLeader.lastName, + // department.name, + // title, + // improvementWork.content, + // improvementWork.id, + // improvementWork.currentStage, + // improvementWork.dateStarted, + // improvementWork.endDate, + // improvementWork.completed, + // ); + // projectCards.push(card); + // let cardHTML = card.generateHTML(); + // let div = document.createElement("div"); + // div.className = "projectCardCardDiv"; // Set the class name(s) here + // div.innerHTML = cardHTML; + // if (!selectElement) return; + // selectElement.appendChild(div); // Stop if the container isn't found + // addEventListener(improvementWork.id, card); - // Display end date for completed projects - if (improvementWork.completed) { - const datesDiv = document.getElementById( - "ongoingCardDatesCurrentProjects" + improvementWork.id - ); - if (datesDiv) { - datesDiv.innerText += - " till " + formatDate(improvementWork.endDate); - } - } + // // Display end date for completed projects + // if (improvementWork.completed) { + // const datesDiv = document.getElementById( + // "ongoingCardDatesCurrentProjects" + improvementWork.id + // ); + // if (datesDiv) { + // datesDiv.innerText += + // " till " + formatDate(improvementWork.endDate); + // } + // } - // Display "Avslutat" for completed projects - const stageDiv = document.getElementById( - "currentStageLetter" + improvementWork.id - ); - if (stageDiv) { - if (improvementWork.completed) { - stageDiv.innerText = "Avslutat"; - stageDiv.style.fontSize = "25px"; - stageDiv.style.marginLeft = "5px"; - stageDiv.style.marginTop = "30px"; - } else if (improvementWork.currentStage == "Plan") { - console.log("hej"); - stageDiv.innerHTML = "P"; - } else if (improvementWork.currentStage == "Do") { - stageDiv.innerHTML = "D"; - } else if (improvementWork.currentStage == "Study") { - stageDiv.innerText = "S"; - } else if (improvementWork.currentStage == "Act") { - stageDiv.innerText = "A"; - } - } + // // Display "Avslutat" for completed projects + // const stageDiv = document.getElementById( + // "currentStageLetter" + improvementWork.id + // ); + // if (stageDiv) { + // if (improvementWork.completed) { + // stageDiv.innerText = "Avslutat"; + // stageDiv.style.fontSize = "25px"; + // stageDiv.style.marginLeft = "5px"; + // stageDiv.style.marginTop = "30px"; + // } else if (improvementWork.currentStage == "Plan") { + // console.log("hej"); + // stageDiv.innerHTML = "P"; + // } else if (improvementWork.currentStage == "Do") { + // stageDiv.innerHTML = "D"; + // } else if (improvementWork.currentStage == "Study") { + // stageDiv.innerText = "S"; + // } else if (improvementWork.currentStage == "Act") { + // stageDiv.innerText = "A"; + // } + // } - id++; - } else { - console.log(improvementWork.unitId + " is not a unit"); //Unit Ids on improvement work that do not exist - } - }); - } + // id++; + // } else { + // console.log(improvementWork.unitId + " is not a unit"); //Unit Ids on improvement work that do not exist + // } + // }); + // } //<p id="ongoingSeeDetailsButton${this.projectId}" class = "moreInfoClass">> Mer information</p> \ No newline at end of file