diff --git a/client/KnowledgeBank/completedProjects.ts b/client/KnowledgeBank/completedProjects.ts
index 602b4250474def082b41b025bdd9bfb338762bc9..7a3a5eef9ef8159046938caa23852c659bdf1d51 100644
--- a/client/KnowledgeBank/completedProjects.ts
+++ b/client/KnowledgeBank/completedProjects.ts
@@ -107,7 +107,7 @@ export class projectCard {
} else if (this.stage == "Plan") {
stageSymbol = "P";
} else if (this.stage == "Do") {
- stageSymbol = "D";
+ stageSymbol = "G";
} else if (this.stage == "Study") {
stageSymbol = "S";
} else if (this.stage == "Act") {
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/currentProjects/currentProjects.ts b/client/currentProjects/currentProjects.ts
index f06ca70c99ab0dbd23d7855c1597f85a33159ea7..434867874b8f049e39b9449a255ed50fd38ec02a 100644
--- a/client/currentProjects/currentProjects.ts
+++ b/client/currentProjects/currentProjects.ts
@@ -108,7 +108,7 @@ export class projectCard {
} else if (this.stage == "Plan") {
stageSymbol = "P";
} else if (this.stage == "Do") {
- stageSymbol = "D";
+ stageSymbol = "G";
} else if (this.stage == "Study") {
stageSymbol = "S";
} else if (this.stage == "Act") {
diff --git a/client/homePage.ts b/client/homePage.ts
index 104a540f4de6036744f4b333b7c5e9ea557e4b86..6c622a127011167cdae964b4d45d661c1ff46505 100644
--- a/client/homePage.ts
+++ b/client/homePage.ts
@@ -556,7 +556,7 @@ export async function getProjects(
} else if (project.currentStage == "Plan") {
stageDiv.innerHTML = "P";
} else if (project.currentStage == "Do") {
- stageDiv.innerHTML = "D";
+ stageDiv.innerHTML = "G";
} else if (project.currentStage == "Study") {
stageDiv.innerText = "S";
} else if (project.currentStage == "Act") {
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/projectPage.css b/client/projectPage/projectPage.css
index 45ffd21b783eb3632e692969438ef4a1d3e85ce7..828582b639ed5ffabc61d7b4e83461f6e9c40966 100644
--- a/client/projectPage/projectPage.css
+++ b/client/projectPage/projectPage.css
@@ -346,4 +346,34 @@ body{
.flexDirectionRow{
display: flex;
flex-direction: row;
-}
\ No newline at end of file
+}
+#startPauseButton{
+ background-color: #845380;
+ border: none;
+ padding: 6px;
+ color: #fffafa;
+ font-weight: 1700;
+ border-radius: 8px;
+ font-family: "Roboto", sans-serif;
+ font-weight: 400;
+ font-size: medium;
+ text-align: center;
+ margin-left: 0%;
+ margin-top: 1%;
+ width: 20vh;
+}
+
+#uploadButton{
+ width: 11vw;
+ background-image: linear-gradient(to right, #845380, #303866);
+ border: none;
+ border-radius: 8px;
+ color: white;
+ font-family: "Roboto", sans-serif;
+ font-weight: 400;
+ font-size: medium;
+ text-align: center;
+ background-color: #6c757d;
+ vertical-align: middle;
+
+}
diff --git a/client/projectPage/projectPageA.html b/client/projectPage/projectPageA.html
index 88fb8e9be2a51e6327b3cb4b847ce7446ce8ff65..a672f645da566473feb38ff5a6c6a090ce498cf8 100644
--- a/client/projectPage/projectPageA.html
+++ b/client/projectPage/projectPageA.html
@@ -87,7 +87,7 @@
<textarea id="a4" class="textArea" name="answer4" rows="7" cols="50" placeholder="Svara på frågan här..." required></textarea>
</form>
<div class="saveEditDiv">
- <button id="saveEditBtnA" class="saveBtn">Spara</button>
+ <button class="btn btn-secondary"id="saveEditBtnA" >Spara</button>
</div>
</div>
@@ -104,10 +104,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>
@@ -129,7 +125,7 @@
<ul id="tasksA" class="documentList taskList">
</ul>
</div>
- <button id="new-task-button-a" style="margin-top: 1vh;">+ Ny aktivitet</button>
+ <button class ="btn btn-secondary"id="new-task-button-a" style="margin-top: 1vh;">+ Ny aktivitet</button>
</div>
</div>
diff --git a/client/projectPage/projectPageA.ts b/client/projectPage/projectPageA.ts
index d2865a6b3f48d53bcd5c6e05ffccb39f1ad500cb..7dd13a0483dd3bf4003d70d1e80fd5e67e453057 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,35 @@ async function checkInputFields(projectId: string, formId: string) {
}
}
+function loadInitiateAndFinalizeBtn(projectId : string, completed : boolean) {
+ alert("hej");
+ if(!completed) {
+ alert("not completed");
+ const nolanModelElement = document.getElementById("projectPageNolandsModel") as HTMLElement;
+
+ //Creates buttons with classname, id, attribute and text
+ const finalizeButton = document.createElement("button");
+ const iterationButton = document.createElement("button");
+ if (nolanModelElement) {
+ alert("finds element");
+ 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");;
+ });
+ }
+}
+
diff --git a/client/projectPage/projectPageG.html b/client/projectPage/projectPageG.html
index 58f6c3dce40a66400eef8f05ea0c6ec00e173f66..a9c885d62341b98e762b8418656663a59c53da11 100644
--- a/client/projectPage/projectPageG.html
+++ b/client/projectPage/projectPageG.html
@@ -94,7 +94,7 @@
<textarea id="g5" class="textArea" name="answer5" rows="5" cols="50" placeholder="Svara på frågan här..." required></textarea>
</form>
<div class="saveEditDiv">
- <button id="saveEditBtnG" class="saveBtn">Spara</button>
+ <button id="saveEditBtnG" class="btn btn-secondary">Spara</button>
</div>
</div>
@@ -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>
@@ -133,7 +133,7 @@
<ul id="tasksG" class="documentList taskList">
</ul>
</div>
- <button id="new-task-button-g" style="margin-top: 1vh;">+ Ny aktivitet</button>
+ <button class ="btn btn-secondary"id="new-task-button-g" style="margin-top: 1vh;">+ Ny aktivitet</button>
</div>
</div>
diff --git a/client/projectPage/projectPageP.html b/client/projectPage/projectPageP.html
index a39b830ed4037322fd5c90e5ef76ea82c4e87a4e..b22b598299fa20059f07f2514e02204f776bbaec 100644
--- a/client/projectPage/projectPageP.html
+++ b/client/projectPage/projectPageP.html
@@ -103,7 +103,7 @@
<textarea id="p7" class="textArea" name="answer6" rows="5" cols="50" placeholder="Svara på frågan här..." required></textarea>
</form>
<div class="saveEditDiv">
- <button id="saveEditBtnP" class="saveBtn">Spara</button>
+ <button id="saveEditBtnP" class="btn btn-secondary">Spara</button>
</div>
</div>
@@ -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>
@@ -138,7 +138,7 @@
<ul id="tasksP" class="documentList taskList">
</ul>
</div>
- <button id="new-task-button-p" style="margin-top: 1vh;">+ Ny aktivitet</button>
+ <button class ="btn btn-secondary"id="new-task-button-p" style="margin-top: 1vh;">+ Ny aktivitet</button>
</div>
</div>
diff --git a/client/projectPage/projectPageP.ts b/client/projectPage/projectPageP.ts
index 295beee0b51f93ebe3cc33190f1481bf5d940c65..d1541e535b3ac3fab6f378628d6af8935ad668f5 100644
--- a/client/projectPage/projectPageP.ts
+++ b/client/projectPage/projectPageP.ts
@@ -120,6 +120,7 @@ export function loadPauseRestartButton(projectId : string, ongoing : boolean, di
//Creates button with classname and text
const pauseRestartButton = document.createElement("button");
+ pauseRestartButton.id = 'startPauseButton'
if (ongoing) {
pauseRestartButton.textContent = "Pausa förbättringsarbete";
pauseRestartButton.className = "pause-button"
diff --git a/client/projectPage/projectPageS.html b/client/projectPage/projectPageS.html
index c7d221232a6feb8a7bc3a0a2e21c93310cd9f691..82115985b3276a24b91a26b68de019e9eb902ef4 100644
--- a/client/projectPage/projectPageS.html
+++ b/client/projectPage/projectPageS.html
@@ -80,7 +80,7 @@
<textarea id="s3" class="textArea" name="answer3" rows="7" cols="50" placeholder="Svara på frågan här..." required></textarea>
</form>
<div class="saveEditDiv">
- <button id="saveEditBtnS" class="saveBtn">Spara</button>
+ <button id="saveEditBtnS" class="btn btn-secondary">Spara</button>
</div>
</div>
@@ -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>
@@ -119,7 +119,7 @@
<ul id="tasksS" class="documentList taskList">
</ul>
</div>
- <button id="new-task-button-s" style="margin-top: 1vh;">+ Ny aktivitet</button>
+ <button class ="btn btn-secondary"id="new-task-button-s" style="margin-top: 1vh;">+ Ny aktivitet</button>
</div>
</div>