From 649aa951aa9c615c957a311f15f5c54a2ced91ef Mon Sep 17 00:00:00 2001 From: Manuel Tauber Date: Thu, 7 Mar 2024 15:09:02 +0100 Subject: [PATCH] Rautenfarben --- frontend/src/app/data.service.ts | 2 ++ .../src/app/ntt-gantt/ntt-gantt.component.ts | 21 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts index 2ace95f..f7c2ecc 100644 --- a/frontend/src/app/data.service.ts +++ b/frontend/src/app/data.service.ts @@ -376,6 +376,8 @@ export class DataService { let res : any[] = []; this.http.get('http://localhost:8080/api/getStates') .subscribe((response: any)=>{ + console.log("###\n"); + console.log(response); response.forEach(state => { res.push(state) }); diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index b2c98ae..9fde64a 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -836,22 +836,29 @@ export class NttGanttComponent implements OnInit { args.taskbarElement.children[1].classList.add('e-gantt-milestone-border'); } - //console.log(args.taskbarElement); + console.log(args.data.taskData.resources[0]); if (args.data.taskData.resources[0].state == 0 ) { - args.milestoneColor = "#f83200"; + args.milestoneColor = "#f83200"; //red } if (args.data.taskData.resources[0].state == 1 ) { - args.milestoneColor = "#f98700"; + args.milestoneColor = "#f98700"; //orange } if (args.data.taskData.resources[0].state == 3 ) { - args.milestoneColor = "#f1b521"; + args.milestoneColor = "#ff9248"; //light orange } if (args.data.taskData.resources[0].state == 6 ) { - args.milestoneColor = "#89c341"; + args.milestoneColor = "#ffff00"; //yellow } - if (args.data.taskData.resources[0].state >= 10 ) { - args.milestoneColor = "lightgrey"; + if (args.data.taskData.resources[0].state == 10 && args.data.taskData.resources[0].statusReason != "") { + args.milestoneColor = "#32CD32"; //lightgreen } + if (args.data.taskData.resources[0].state == 10 ) { + args.milestoneColor = "##008B45"; //lightgreen + } + if (args.data.taskData.resources[0].state == 11 ) { + args.milestoneColor = "#ffffff"; //white + } + }else{ if (args.data.taskData.TaskID.includes("D1")||args.data.taskData.TaskID.includes("D4")){ if(this.showDetails == false){