diff --git a/client/SidebarAndHeader/pageHandler.ts b/client/SidebarAndHeader/pageHandler.ts index a8273e55875896d98ebc3a31e7cc1ca42b208a6c..68b54f81de1c5f4fe2f311bbbd6afb681070e670 100644 --- a/client/SidebarAndHeader/pageHandler.ts +++ b/client/SidebarAndHeader/pageHandler.ts @@ -171,15 +171,15 @@ export function loadIdeaBank() { clearContent(); setTitle("Förbättringsförslag"); ideaBank.loadPage(); + + $(".initiateProjectButton").off('click').on('click', function (e) { + e.preventDefault(); + const target = e.target as HTMLElement; + const cardId = target.id.replace("initiateProjectFromCard", ""); + loadInitiatePage(cardId); +}); + - document.addEventListener("click", function (event) { - const target = event.target as HTMLElement; - //adds an event listener for the initiate page - if (target && target.className === "initiateProjectButton") { - const cardId = target.id.replace("initiateProjectFromCard", ""); - loadInitiatePage(cardId); - } - }); } function loadKnowledgeBank() { diff --git a/client/initiateForbattringsarbete/initiateIdea.ts b/client/initiateForbattringsarbete/initiateIdea.ts index 0ed9e69688b1bb75d9edc3a4f81b8668f7bc3ee0..d02a51ad8abb3ed86db859afdf7970af70effcf2 100644 --- a/client/initiateForbattringsarbete/initiateIdea.ts +++ b/client/initiateForbattringsarbete/initiateIdea.ts @@ -5,10 +5,12 @@ import { loadCurrentProjects } from "../SidebarAndHeader/pageHandler.js"; let selectedEmployees: string[] = []; export async function loadEmployees() { + console.log("nu körs koden") const selectProjectLeaderHTML = $('#projectLeader'); // loads the select type from html const selectEmployeeHTML = $('#selectEmployee'); // loads the select type from html const allUsers = await getUsers({}); const allProjectLeaders = await getUsers({}); //here you can put constraints + allUsers.forEach(user => { const optionElement = $('<option>').addClass('ideaCardFont') @@ -29,6 +31,7 @@ export async function loadEmployees() { const selectUnitHTML = $('#selectDepartment'); // loads the select type from html const allHospitals = await getHospitals({}); const allUnits = await getUnits({}); //here you can put constraints + console.log(allHospitals) allHospitals.forEach(user => { const optionElement = $('<option>').addClass('ideaCardFont') .val(user.id) diff --git a/client/projectPage/projectPageG.html b/client/projectPage/projectPageG.html index 38dc2bc6c6468a277f8868ee4da6012b300729f2..a9c885d62341b98e762b8418656663a59c53da11 100644 --- a/client/projectPage/projectPageG.html +++ b/client/projectPage/projectPageG.html @@ -109,7 +109,7 @@ <p>Nästa steg är steg S(Studera) i PGSA modellen. Se till se att du har svarat på alla frågor på sidan, klicka sedan på knappen nedan för att gå till nästa steg.</p> </article> - <button id="toS" data-project-id="${this.id}" class="btn btn-primary" role="button">Nästa steg</button> + <button id="toS" data-project-id="${this.id}" class="btn btn-secondary" role="button">Nästa steg</button> </div> diff --git a/client/projectPage/projectPageP.html b/client/projectPage/projectPageP.html index 4319d8f0a5098d4fdcc6628e013df3c2df1983c7..b22b598299fa20059f07f2514e02204f776bbaec 100644 --- a/client/projectPage/projectPageP.html +++ b/client/projectPage/projectPageP.html @@ -117,7 +117,7 @@ <p>Nästa steg är steg G(Göra) i PGSA modellen. Se till se att du har svarat på alla frågor på sidan, klicka sedan på knappen nedan för att gå till nästa steg.</p> </article> - <button id="toG" data-project-id="${this.id}" class="btn btn-primary" role="button">Nästa steg</button> + <button id="toG" data-project-id="${this.id}" class="btn btn-secondary" role="button">Nästa steg</button> </div> <div style="width: 25%;"> <div class="sideTitle">Dokument</div> diff --git a/client/projectPage/projectPageS.html b/client/projectPage/projectPageS.html index 241d0e122717e8794014ecb9caeb459c958d477a..82115985b3276a24b91a26b68de019e9eb902ef4 100644 --- a/client/projectPage/projectPageS.html +++ b/client/projectPage/projectPageS.html @@ -96,7 +96,7 @@ <p>Nästa steg är steg A(Agera) i PGSA modellen. Se till se att du har svarat på alla frågor på sidan, klicka sedan på knappen nedan för att gå till nästa steg.</p> </article> - <button id="toA" data-project-id="${this.id}" class="btn btn-primary" role="button">Nästa steg</button> + <button id="toA" data-project-id="${this.id}" class="btn btn-secondary" role="button">Nästa steg</button> </div>