From 0768e8e438dd79981c59352157b49b15ed900b92 Mon Sep 17 00:00:00 2001
From: Niklas Knagenhielm-Karlsson <nikkn051@student.liu.se>
Date: Wed, 6 Dec 2023 11:35:15 +0100
Subject: [PATCH] Buttons are hidden when avslutade. Not unit tested
---
client/projectPage/projectPageA.html | 4 ----
client/projectPage/projectPageA.ts | 31 +++++++++++++++++++++++++---
2 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/client/projectPage/projectPageA.html b/client/projectPage/projectPageA.html
index 139715d5..e0346bf6 100644
--- a/client/projectPage/projectPageA.html
+++ b/client/projectPage/projectPageA.html
@@ -103,10 +103,6 @@
<h1>Sista steget</h1>
<p>Agera-steget är det sista steget i modellen. Du kan nu avsluta projektet eller låta förbättringsarbetet gå ienom en till iteration avd PGDA.</p>
</article>
-
- <button id="toCurrentProjects" data-project-id="${this.id}" class="btn btn-primary" role="button">Avsluta förbättringsarbete</button>
- <button id="toCurrentProjects" data-project-id="${this.id}" class="btn btn-primary" role="button">En till iteration</button>
-
</div>
<div style="width: 25%;">
<div class="sideTitle">Dokument</div>
diff --git a/client/projectPage/projectPageA.ts b/client/projectPage/projectPageA.ts
index d2865a6b..e5cd495f 100644
--- a/client/projectPage/projectPageA.ts
+++ b/client/projectPage/projectPageA.ts
@@ -47,9 +47,7 @@ export async function loadPage (projectId : string) {
const target = event.target as HTMLElement; // Type assertion
const pdfInput = document.getElementById('pdfInput') as HTMLInputElement;
const pdfLinkContainer = document.getElementById('pdfLink');
- if (target.id === 'toCurrentProjects') {
- checkInputFields(projectId, "formPageA");
- } else if(target.id === 'nolansToP'){
+ if(target.id === 'nolansToP'){
loadProjectPageP(projectId);
} else if(target.id === 'nolansToG'){
loadProjectPageG(projectId);
@@ -139,6 +137,7 @@ async function loadImprovementWorkDataPageA(projectId:string) {
}
}
loadProjectHeader(improvementWork);
+ loadInitiateAndFinalizeBtn(projectId, improvementWork.completed);
}
@@ -187,4 +186,30 @@ async function checkInputFields(projectId: string, formId: string) {
}
}
+function loadInitiateAndFinalizeBtn(projectId : string, completed : boolean) {
+ const nolanModelElement = document.getElementById("NolansModel") as HTMLElement;
+
+ //Creates buttons with classname, id, attribute and text
+ const finalizeButton = document.createElement("button");
+ const iterationButton = document.createElement("button");
+ if (nolanModelElement) {
+ finalizeButton.id = "toCurrentProjects";
+ iterationButton.id = "toCurrentProjects";
+ finalizeButton.classList.add("btn", "btn-primary");
+ iterationButton.classList.add("btn", "btn-primary");
+ iterationButton.setAttribute('role', 'button');
+ finalizeButton.setAttribute('role', 'button');
+ finalizeButton.textContent = 'Avsluta Förbättringsarbete';
+ iterationButton.textContent = 'En till iteration';
+ }
+ //Append buttons to html
+ nolanModelElement.append(iterationButton);
+ nolanModelElement.append(finalizeButton);
+
+ //Eventlistener for button
+ finalizeButton.addEventListener('click', function() {
+ checkInputFields(projectId, "formPageA");;
+ });
+}
+
--
GitLab