diff --git a/client/SidebarAndHeader/pageHandler.ts b/client/SidebarAndHeader/pageHandler.ts index c9e0357f3f60dc5148c542ebf29a79350fa03d33..9fccdc1626bbec0d23aa781d3fbe19a97e927329 100644 --- a/client/SidebarAndHeader/pageHandler.ts +++ b/client/SidebarAndHeader/pageHandler.ts @@ -177,24 +177,16 @@ function loadSuggestionPage() { suggestions.loadPage(); } -function loadInitiatePage(id: string) { +export function loadInitiatePage(id: string) { clearContent(); setTitle("Gör ditt förslag till ett förbättringsarbete!"); initiateIdea.loadPage(id); } + 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); -}); - - } function loadKnowledgeBank() { @@ -353,28 +345,12 @@ function loadMyProfile() { clearContent(); setTitle("Förbättringsportalen"); profile.loadPage(currentProjectsListenersAdded); //fix containers - 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 loadMyProfilePage() { clearContent(); setTitle("Din Profil"); profilePage.loadPage(currentProjectsListenersAdded); //fix containers - 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 loadSettings() { diff --git a/client/ideaBank/ideaBank.ts b/client/ideaBank/ideaBank.ts index 9db38aa41b00138616f869c2a178f7bfc3b51494..d563dc096fbbfde52f15a78add37baf1f5b24375 100644 --- a/client/ideaBank/ideaBank.ts +++ b/client/ideaBank/ideaBank.ts @@ -9,6 +9,7 @@ import { upvoteSuggestion, } from "../Database/database.js"; import { formatDate } from "../projectPage/projectPage.js"; +import { loadInitiatePage } from "../SidebarAndHeader/pageHandler.js"; import { hostname } from "os"; import { getEventListeners } from "events"; //import {loadInitiatePage} from "../SidebarAndHeader/pageHandler.js"; @@ -564,10 +565,13 @@ async function addListner( } } } + + if (target && target.className === "initiateProjectButton") { + const cardId = target.id.replace("initiateProjectFromCard", ""); + loadInitiatePage(cardId); + } - const upvoteButton = target.closest( - ".upvoteButton" - ) as HTMLButtonElement | null; + const upvoteButton = target.closest('.upvoteButton') as HTMLButtonElement | null; if (upvoteButton) { const cardIdStr = upvoteButton.id.replace("upvoteButton", ""); const cardId = parseInt(cardIdStr, 10); diff --git a/client/initiateForbattringsarbete/initiateIdea.ts b/client/initiateForbattringsarbete/initiateIdea.ts index e567667a1a4ea5137bcf669640c4f800094c9af9..875f783238f0218fd014fc4e18ff752ee0384ba2 100644 --- a/client/initiateForbattringsarbete/initiateIdea.ts +++ b/client/initiateForbattringsarbete/initiateIdea.ts @@ -12,9 +12,8 @@ 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 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