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/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 6064f4554d817c5479fe50bf7d41d479088496b8..a3bf7feb88612103371e3c6904152af8e0bc5381 100644 --- a/client/homePage.ts +++ b/client/homePage.ts @@ -538,7 +538,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/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..946c280f6d4a9d769c3f81f1c1333a95b8985af8 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> @@ -129,7 +129,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 58f6c3dce40a66400eef8f05ea0c6ec00e173f66..38dc2bc6c6468a277f8868ee4da6012b300729f2 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> @@ -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..4319d8f0a5098d4fdcc6628e013df3c2df1983c7 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> @@ -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..241d0e122717e8794014ecb9caeb459c958d477a 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> @@ -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>