diff --git a/client/KnowledgeBank/Nolans.css b/client/KnowledgeBank/Nolans.css
index c0b287f51f233ffe16d7814c874f9ec39342cee5..deab731c673f4d5cb0a5db79d887ea0457b999ad 100644
--- a/client/KnowledgeBank/Nolans.css
+++ b/client/KnowledgeBank/Nolans.css
@@ -57,6 +57,15 @@ font-size:15px;
padding-top: 5%;
}
+.projectPageNolandsModel {
+ width: 50%;
+ display: flex;
+ flex-direction: column; /* Stack children (e.g. the buttons) vertically*/
+ /* justify-content: center; */ /* Horizontal centering. align-items istead would be vertical centering. */
+ align-items: center;
+ /* padding-top: 5%; */
+ position: relative;
+}
.NolansButtons {
width: 50%;
@@ -96,7 +105,7 @@ font-size:15px;
/*Styling for the PGSA-circle */
.wrap {
- height: 350px;
+ height: 350px; /* varför 350?? */
width: 300px;
border-radius: 50%;
position: relative;
@@ -104,6 +113,11 @@ font-size:15px;
border: 2px solid #000; /* Add a 2px solid black border */
}
+.projectPageWrap{
+ height: 300px; /* ful lösning, men behövdes för att bägge sidor skulle bli snygga */
+
+}
+
.quart {
position: absolute;
height: 50%;
@@ -119,29 +133,27 @@ font-size:15px;
.quart:first-child {
top: 0;
- left: 0;
- background-color: #884582;
-
+ left: 50%;
+ background-color: #ffaaf8;
+
}
.quart:nth-child(2) {
- top: 0;
+ top: 50%;
left: 50%;
- background-color: #ffaaf8;
-
+ background-color: #ef7de6;
}
.quart:nth-child(3) {
top: 50%;
left: 0;
background-color: #bc60b4;
-
}
.quart:nth-child(4) {
- top: 50%;
- left: 50%;
- background-color: #ef7de6;
+ top: 0;
+ left: 0;
+ background-color: #884582;
}
.center {
diff --git a/client/KnowledgeBank/Nolans.html b/client/KnowledgeBank/Nolans.html
index 12d4193d2091132eeaeea42113ecabfc4398938f..878542bc4ea9b93fbe9ec71815eff4e39042ec19 100644
--- a/client/KnowledgeBank/Nolans.html
+++ b/client/KnowledgeBank/Nolans.html
@@ -110,10 +110,10 @@
<div class="arrow"></div>
<div class="wrap">
- <div id="nolans7" class="quart" onclick="redirectToPage('Nolans7.html')">Agera</div>
<div id="nolans4" class="quart" onclick="redirectToPage('Nolans4.html')">Planera</div>
- <div id="nolans6" class="quart" onclick="redirectToPage('Nolans6.html')">Studera</div>
<div id="nolans5" class="quart" onclick="redirectToPage('Nolans5.html')">Göra</div>
+ <div id="nolans6" class="quart" onclick="redirectToPage('Nolans6.html')">Studera</div>
+ <div id="nolans7" class="quart" onclick="redirectToPage('Nolans7.html')">Agera</div>
<div class="center">P G S A</div>
</div>
</div>
diff --git a/client/KnowledgeBank/completedProjects.ts b/client/KnowledgeBank/completedProjects.ts
index ca57fb5dd1cc7c439159160b5e6b3f5096bc182c..7a3a5eef9ef8159046938caa23852c659bdf1d51 100644
--- a/client/KnowledgeBank/completedProjects.ts
+++ b/client/KnowledgeBank/completedProjects.ts
@@ -21,7 +21,148 @@ import {
import { formatDate } from "../projectPage/projectPage.js";
-import { projectCard } from "../currentProjects/currentProjects.js"
+//import { projectCard } from "../currentProjects/currentProjects.js"
+
+export class projectCard {
+ public name: string; // Projectowner
+ public department: string;
+ public title: string;
+ public description: string;
+ public id: number;
+ public projectId: string;
+ public stage: any;
+ public dateStarted: any;
+ public endDate: any;
+ public completed: boolean;
+
+ constructor(
+ id: number,
+ name: string,
+ department: string,
+ title: string,
+ description: string,
+ projectId: string,
+ currentStage: string,
+ dateStarted: any,
+ endDate: any,
+ completed: boolean
+ ) {
+ this.name = name;
+ this.department = department;
+ this.title = title;
+ this.description = description;
+ this.id = id;
+ this.projectId = projectId;
+ this.stage = currentStage;
+ this.dateStarted = dateStarted;
+ this.endDate = endDate;
+ this.completed = completed;
+ }
+
+ showMoreInfo(blockId: string, thisTextId: string): void {
+ const blockElement = document.getElementById(blockId);
+ if (blockElement) {
+ blockElement.style.display = "flex";
+ }
+
+ const textElement = document.getElementById(thisTextId);
+ if (textElement) {
+ textElement.innerText = "^ Stäng detaljer";
+ }
+ }
+
+ closeMoreInfo(blockId: string, thisTextId: string): void {
+ const blockElement = document.getElementById(blockId) as HTMLSelectElement;
+ if (blockElement) {
+ blockElement.style.display = "none";
+ }
+ const textElement = document.getElementById(thisTextId);
+ if (textElement) {
+ textElement.innerText = "> Mer information";
+ }
+ }
+
+ loadInitiatePage() {
+ alert("The initiate project page should now be loaded");
+ }
+
+ generateHTML(): string {
+ // Set default styles for stageSymbol (P, D, S, A, Avslutat)
+ let stageSymbol = "";
+ let stageFontSize = "50px";
+ let stageMarginLeft = "35px";
+ let stageMarginTop = "10px";
+
+ // Set projectDates to dateStarted
+ let projectDates = formatDate(this.dateStarted);
+
+ if (this.completed) {
+ stageSymbol = "Avslutat";
+ stageFontSize = "25px";
+ stageMarginLeft = "5px";
+ stageMarginTop = "30px";
+
+ // Append endDate to projectDates
+ projectDates += " till " + formatDate(this.endDate);
+ } else if (this.stage == "Plan") {
+ stageSymbol = "P";
+ } else if (this.stage == "Do") {
+ stageSymbol = "G";
+ } else if (this.stage == "Study") {
+ stageSymbol = "S";
+ } else if (this.stage == "Act") {
+ stageSymbol = "A";
+ }
+
+ return `
+ <div class="totalExpandedOngoingWorkCard">
+ <div style="cursor: default;" class="flex-container ongoingCard shadow" id="${
+ this.projectId
+ }">
+ <div class="ongoingCardImageContainer toSinglePage">
+ <div id="borderPinkFaded">
+ <div class = "flex-box ongoingCardImage toSinglePage">
+ <div id="currentStageLetter${this.projectId}" style=
+ "font-size: ${stageFontSize};
+ margin-left: ${stageMarginLeft};
+ margin-top: ${stageMarginTop};
+ font-weight:
+ bolder;
+ color: #845380;
+ position: inherit;
+ ">${stageSymbol}</div>
+ </div>
+ </div>
+ </div>
+ <div class="div ongoingCardInfo toSinglePage">
+ <p class="toSinglePage" id="ongoingCardIdeaTitle">${this.title}</p>
+ <p class="toSinglePage" id="ongoingCardDepartment">${
+ this.department
+ }</p>
+ <p class="toSinglePage" id="ongoingCardManager">${this.name}</p>
+ <p class="toSinglePage" id="ongoingCardDatesCurrentProjects${this.projectId}" style="font-size: 13px; font-style: italic; margin-top: 5px;">${projectDates} </p>
+ </div>
+ <button id="completed-page-button-${this.projectId}" data-project-id="${
+ this.id
+ }" class="projectButton fs-6 text-white d-flex pb-2 pt-2" role="button" style="height: 10%; min-width: 15vw; white-space: nowrap; align-items: center; font-family:'Roboto', sans-serif;">Gå till Förbättringsarbetet</button>
+ <div class="container ongoingSeeCardDetails toSinglePage">
+ <div class="ongoingSeeCardDetailsInner">
+ <div id="completed-page-ongoingSeeDetailsButton${
+ this.projectId
+ }" class = "moreInfoClass">> Mer information</div>
+ </div>
+ </div>
+ </div>
+ <div class = "expandedOngoingWorkCard" id="expandedOngoingWorkCard${
+ this.projectId
+ }" style="display: none;">
+ <div class ="expandedTextOngoingWorkCard">
+ ${this.description}
+ </div>
+ </div>
+ </div> `;
+ }
+}
let projectCards: projectCard[] = [];
let filteredImprovementWorks: any[] = [];
@@ -309,11 +450,11 @@ function sortProjects(
// Loop through the saved array of cards and generate HTML for each card
for (const card of cardsToIterate) {
let cardHTML = card.generateHTML();
- addEventListener(listenersLoaded, card.projectId, card);
let div = document.createElement("div");
div.className = "projectCardCardDiv"; // Set the class name(s) here
div.innerHTML = cardHTML;
if (!selectElement) return;
+ addEventListener(listenersLoaded, card.projectId, card);
selectElement.appendChild(div); // Stop if the container isn't found
}
}
diff --git a/client/SidebarAndHeader/pageHandler.ts b/client/SidebarAndHeader/pageHandler.ts
index 91f0a9a0565acb8a80c15c1be41d758eff11b5f7..a8273e55875896d98ebc3a31e7cc1ca42b208a6c 100644
--- a/client/SidebarAndHeader/pageHandler.ts
+++ b/client/SidebarAndHeader/pageHandler.ts
@@ -351,7 +351,7 @@ function loadMyProfile() {
function loadMyProfilePage() {
clearContent();
setTitle("Din Profil");
- profilePage.loadPage(); //fix containers
+ profilePage.loadPage(currentProjectsListenersAdded); //fix containers
document.addEventListener("click", function (event) {
const target = event.target as HTMLElement;
//adds an event listener for the initiate page
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 eb58f580115f878cc26d3282035efdca11d69f86..a3bf7feb88612103371e3c6904152af8e0bc5381 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
@@ -538,7 +538,7 @@ 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/ideaBank/ideaCard.css b/client/ideaBank/ideaCard.css
index 6ecbb7a29a8d10f82cd4751fb482c4794f572f91..d7b7e05e8d0151f232130badc0f1526b42d216f9 100644
--- a/client/ideaBank/ideaCard.css
+++ b/client/ideaBank/ideaCard.css
@@ -4,6 +4,7 @@
overflow: hidden;
text-overflow: ellipsis;
font-size: 13px;
+ color: black;
}
.ideaCardFontComments {
font-family: "Roboto", sans-serif;
diff --git a/client/profilePage.ts b/client/profilePage.ts
index 9aabacee1b3d1c023b2f5d1c231ec023af2395a2..d4d55da9393ef4f1177979e490c4416621e143cd 100644
--- a/client/profilePage.ts
+++ b/client/profilePage.ts
@@ -1,7 +1,19 @@
import { onAuthStateChanged } from "firebase/auth";
import { auth } from "./Database/database.js";
import { logout } from "./Database/authentication.js";
-import { getUsers, getSuggestions, getImprovementWorks, getUnits, getObjectById, getImprovementWorksForUser } from "../client/Database/database.js";
+import { getUsers, getSuggestions, getImprovementWorks, getImprovementWorkResponsible, getUnits, getObjectById, getImprovementWorksForUser } from "../client/Database/database.js";
+import { formatDate } from "./projectPage/projectPage.js";
+import {
+ loadProjectPageP,
+ loadProjectPageA,
+ loadProjectPageG,
+ loadProjectPageS,
+} from "./SidebarAndHeader/pageHandler.js";
+import { projectCard, addEventListener } from "./currentProjects/currentProjects.js";
+
+import {
+ getProjects
+} from "./homePage.js"
function logoutUser(event : Event) {
event.preventDefault();
@@ -192,7 +204,7 @@ async function createNewIdeaCard(
container.appendChild(div);
}
- export async function loadPage() {
+ export async function loadPage(listenersLoaded: boolean) {
const container = document.querySelector('#container-fluid');
@@ -247,7 +259,7 @@ async function createNewIdeaCard(
}
const projectContainer = document.getElementById("project-container");
if(projectContainer) {
- await getProjects(projectContainer, user.id);
+ await getProjects(projectContainer, listenersLoaded, user.id);
}
})
@@ -287,112 +299,79 @@ async function createNewIdeaCard(
});
}
-
- async function getProjects (selectElement : HTMLElement, /*listenersLoaded:boolean,*/ userHsaId: string) {
- const data = await getImprovementWorksForUser(userHsaId);
- let id = 0;
- data.forEach(async(project) => {
- let title = project.name;
- let department = await getObjectById('unit', project.unitId);
- if(department) {
- let name = "Ansvarig"; //Waiting for backend fix
- let description = project.content;
- let i = id;
- let card = new projectCard(i, name, department.name, title, description, project.id);
- projectCards[i] = card;
- let cardHTML = card.generateHTML();
- //addEventListener(listenersLoaded, project.id, card);
- let div = document.createElement('div');
- div.className = 'homePageProjectCardDiv'; // Set the class name(s) here
- div.innerHTML = cardHTML;
- if (!selectElement) return;
- selectElement.appendChild(div); // Stop if the container isn't found
- id ++;
- } else {
- console.log(project.unitId + " is not a unit"); //Unit Ids on improvement work that do not exist
- }
- });
- }
-
-
-
-
- let projectCards: { [key: number]: projectCard } = {};
-
-class projectCard {
- private name: string; // Projectowner
- private department: string;
- private title: string;
- private description: string;
- private id: number;
- private projectId: string;
-
- constructor(id: number, name: string, department: string, title: string, description: string, projectId: string) {
- this.name = name;
- this.department = department;
- this.title = title;
- this.description = description;
- this.id = id;
- this.projectId = projectId;
- }
-
- showMoreInfo(blockId: string, thisTextId: string): void {
- const blockElement = document.getElementById(blockId);
- if (blockElement) {
- blockElement.style.display = "flex";
- }
-
- const textElement = document.getElementById(thisTextId);
- if (textElement) {
- textElement.innerText = '^ Stäng detaljer';
- }
- }
-
- closeMoreInfo(blockId: string, thisTextId: string): void {
- const blockElement = document.getElementById(blockId) as HTMLSelectElement;
- if (blockElement) {
- blockElement.style.display = "none";
- }
- const textElement = document.getElementById(thisTextId);
- if (textElement) {
- textElement.innerText = '> Mer information';
- }
- }
+ 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);
- loadInitiatePage() {
- alert('The initiate project page should now be loaded');
- }
-
+ // // Display end date for completed projects
+ // if (improvementWork.completed) {
+ // const datesDiv = document.getElementById(
+ // "ongoingCardDatesCurrentProjects" + improvementWork.id
+ // );
+ // if (datesDiv) {
+ // datesDiv.innerText +=
+ // " till " + formatDate(improvementWork.endDate);
+ // }
+ // }
-
- generateHTML(): string {
- return `<div class="homeTotalExpandedOngoingWorkCard">
- <div style="cursor: pointer;" class="flex-container ongoingCard" id="${this.projectId}">
- <div class="ongoingCardImageContainer toSinglePage">
- <div class = "flex-box ongoingCardImage toSinglePage" id="pinkFaded"></div>
- </div>
- <div class="div ongoingCardInfo toSinglePage">
- <p class="toSinglePage" id="ongoingCardManager">${this.name}</p>
- <p class="toSinglePage" id="ongoingCardDepartment">${this.department}</p>
- <p class="toSinglePage" id="ongoingCardIdeaTitle">${this.title}</p>
- </div>
-
- <!--<button data-project-id="${this.id}" class="projectButton" role="button">Gå till projektsidan</button>-->
-
-
- <div class="container ongoingSeeCardDetails toSinglePage">
- <div class="ongoingSeeCardDetailsInner">
-
- </div>
- </div>
- </div>
- <div class = "expandedOngoingWorkCard" id="expandedOngoingWorkCard${this.projectId}" style="display: none;">
- <div class ="expandedTextOngoingWorkCard">
- ${this.description}
- </div>
- </div>
- </div> `
- }
-}
+ // // 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
+ // }
+ // });
+ // }
//<p id="ongoingSeeDetailsButton${this.projectId}" class = "moreInfoClass">> Mer information</p>
\ No newline at end of file
diff --git a/client/projectPage/addMemberModal.html b/client/projectPage/addMemberModal.html
index a9be95d8284201f8513f68aad619f0bd0c1ca70e..d3b794b231a7d82e30d08c0d93e0ab335f45acee 100644
--- a/client/projectPage/addMemberModal.html
+++ b/client/projectPage/addMemberModal.html
@@ -1,8 +1,8 @@
<!-- addMemberModal.html -->
<!DOCTYPE html>
<html lang="en">
-<head>
- <link rel="stylesheet" href="../ideaBank/ideaBank.css" />
+<head>
+ <link rel="stylesheet" href="../ideaBank/ideaBank.css" />
<link rel="stylesheet" href="../ideaBank/ideideaCard.css" />
<link rel="stylesheet" href="../initiateForbattringsarbete/initiateIdea.css" />
<meta charset="UTF-8">
@@ -25,9 +25,9 @@
<!-- Modal -->
<div class="modal fade" id="addMemberModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
- <div class="modal-content">
+ <div class="modal-content" style = "color: black;">
<div class="modal-header">
- <h5 class="modal-title" id="exampleModalLongTitle">Ändra medlemmar kopplade till projektet</h5>
+ <h5 class="modal-title" id="exampleModalLongTitle" style = "color : black">Ändra medlemmar kopplade till projektet</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" id="upperCloseMemberModal">
<span aria-hidden="true">×</span>
</button>
@@ -65,8 +65,8 @@
<div class="selectedEmployees" id="selectedEmployees"></div>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-dismiss="modal" id="lowerCloseMemberModal">Close</button>
- <button type="button" class="btn btn-primary" id="selectEmployeeSaveButton">Save changes</button>
+ <button type="button" class="btn btn-secondary" style = "width: 150px;" data-dismiss="modal" id="lowerCloseMemberModal">Stäng</button>
+ <button type="button" class="btn btn-secondary" style = "width: 150px;"id="selectEmployeeSaveButton">Spara Ändringar</button>
</div>
</div>
</div>
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/projectPage.ts b/client/projectPage/projectPage.ts
index e0afe031899a3979bdba65bd9438faede7598fc3..6a7c5cd27e3ae5765539eeef1ca6c12bd5711c15 100644
--- a/client/projectPage/projectPage.ts
+++ b/client/projectPage/projectPage.ts
@@ -501,11 +501,15 @@ function getDivWithIdFromHTML(
export async function loadMemberModal(projectId: string) {
const modalContent = await getDivWithIdFromHTML('../projectPage/addMemberModal.html', '#addMemberModal');
+ var link = document.createElement('link');
+ link.rel = 'stylesheet';
+ link.type = 'text/css';
+ link.href = '../initiateForbattringsarbete/initiateIdea.css';
- //clear selected employees
setSelectedEmployeesEmpty();
if (modalContent) {
+ $('#container-fluid').append(link);
$('#container-fluid').append(modalContent);
($(modalContent) as any).modal('show');
diff --git a/client/projectPage/projectPageA.html b/client/projectPage/projectPageA.html
index e0346bf6efdb39b747c9bbb40718e95c955855d2..a672f645da566473feb38ff5a6c6a090ce498cf8 100644
--- a/client/projectPage/projectPageA.html
+++ b/client/projectPage/projectPageA.html
@@ -25,7 +25,7 @@
<p style="margin-right: 5px;">Medlemmar:</p>
<p id="pMembers"><p class="loadingIndicator" style="display: none">Laddar medlemmar...</p></p>
</div>
- <button id="projectButton2">+ Lägg till medlem</button>
+ <button id="addMemberButton">+ Lägg till medlem</button>
<button id="projectButton">Redigera</button>
</div>
@@ -87,17 +87,18 @@
<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>
- <div id="NolansModel" style="margin:3%; width: 30%;">
- <div class="wrap">
- <div class="quart" id="nolansToP" data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen" >1. Planera </div>
- <div class="quart" id="nolansToG"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">2. Göra</div>
- <div class="quart"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">4. Agera</div>
- <div class="quart" id="nolansToS"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">3. Studera</div>
- <div class="center">PGSA</div>
+ <div id="projectPageNolandsModel" style="margin:3%; width: 30%;">
+ <div class="wrap projectPageWrap">
+ <div class="quart" id="nolansToP" data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen" >Planera </div>
+ <div class="quart" id="nolansToG"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">Göra</div>
+ <div class="quart" id="nolansToS"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">Studera</div>
+ <div class="quart"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">Agera</div>
+
+ <div class="center">P G S A</div>
</div>
<article class="infoText">
<h1>Sista steget</h1>
@@ -124,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/projectPageG.html b/client/projectPage/projectPageG.html
index efd64ceb9415a42a7e41f5c38ef28ed19c2f0f04..38dc2bc6c6468a277f8868ee4da6012b300729f2 100644
--- a/client/projectPage/projectPageG.html
+++ b/client/projectPage/projectPageG.html
@@ -26,7 +26,7 @@
<p style="margin-right: 5px;">Medlemmar:</p>
<p id="pMembers"><p class="loadingIndicator" style="display: none">Laddar medlemmar...</p></p>
</div>
- <button id="projectButton2">+ Lägg till medlem</button>
+ <button id="addMemberButton">+ Lägg till medlem</button>
<button id="projectButton">Redigera</button>
</div>
@@ -94,15 +94,15 @@
<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>
- <div id="NolansModel" style="margin:3%; width: 30%;">
- <div class="wrap">
- <div class="quart" id="nolansToP"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">1. Planera</div>
- <div class="quart"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">2. Göra</div>
- <div class="center">PGSA</div>
+ <div class="projectPageNolandsModel" style="margin:3%; width: 30%;">
+ <div class="wrap projectPageWrap">
+ <div class="quart" id="nolansToP"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">Planera</div>
+ <div class="quart"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">Göra</div>
+ <div class="center">P G S A</div>
</div>
<article class="infoText">
<h1>Nästa steg</h1>
@@ -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 ca3dad90d10d210166ae6de29bdb9ab9bcb9b032..4319d8f0a5098d4fdcc6628e013df3c2df1983c7 100644
--- a/client/projectPage/projectPageP.html
+++ b/client/projectPage/projectPageP.html
@@ -101,16 +101,16 @@
<img src="../images/info.png" style="height: 3vh; margin-left: 3px;" data-toggle="tooltip" title="FÖRTYDLIGANDE INFO HÄR">
</div>
<textarea id="p7" class="textArea" name="answer6" rows="5" cols="50" placeholder="Svara på frågan här..." required></textarea>
- </form>
+ </form>
<div class="saveEditDiv">
- <button id="saveEditBtnP" class="saveBtn">Spara</button>
+ <button id="saveEditBtnP" class="btn btn-secondary">Spara</button>
</div>
</div>
- <div id="NolansModel" style="margin:3%; width: 30%;">
- <div class="wrap">
- <div class="quart" data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen" >1. Planera</div>
- <div class="center">PGSA</div>
+ <div class ="projectPageNolandsModel" style="margin:3%; width: 30%;">
+ <div class="wrap projectPageWrap"> <!-- double class because of different heights -->
+ <div class="quart" data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen" >Planera</div>
+ <div class="center">P G S A</div>
</div>
<article class="infoText">
<h1>Nästa steg</h1>
@@ -118,9 +118,7 @@
</article>
<button id="toG" data-project-id="${this.id}" class="btn btn-primary" role="button">Nästa steg</button>
-
-
- </div>
+ </div>
<div style="width: 25%;">
<div class="sideTitle">Dokument</div>
<div class="documentsContainer">
@@ -140,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 e7526ec9eb7faf23b2983f8f1769cc8567a9defc..241d0e122717e8794014ecb9caeb459c958d477a 100644
--- a/client/projectPage/projectPageS.html
+++ b/client/projectPage/projectPageS.html
@@ -24,7 +24,7 @@
<p style="margin-right: 5px;">Medlemmar:</p>
<p id="pMembers"><p class="loadingIndicator" style="display: none">Laddar medlemmar...</p></p>
</div>
- <button id="projectButton2">+ Lägg till medlem</button>
+ <button id="addMemberButton">+ Lägg till medlem</button>
<button id="projectButton">Redigera</button>
</div>
@@ -80,17 +80,16 @@
<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>
- <div id="NolansModel" style="margin:3%; width: 30%;">
- <div class="wrap">
- <div class="quart" id="nolansToP"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">1. Planera</div>
- <div class="quart" id="nolansToG"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">2. Göra</div>
- <div></div>
- <div class="quart"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">3. Studera</div>
- <div class="center">PGSA</div>
+ <div id="projectPageNolandsModel" style="margin:3%; width: 30%;">
+ <div class="wrap projectPageWrap">
+ <div class="quart" id="nolansToP"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">Planera</div>
+ <div class="quart" id="nolansToG"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">Göra</div>
+ <div class="quart"data-toggle="tooltip" title="Klicka för att komma till detta steg av modellen">Studera</div>
+ <div class="center">P G S A</div>
</div>
<article class="infoText">
<h1>Nästa steg</h1>
@@ -120,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>