From d5440216d27b8ed44f3abdd65cf0191d54f64ad4 Mon Sep 17 00:00:00 2001 From: Manuel Tauber Date: Fri, 9 Feb 2024 12:36:39 +0100 Subject: [PATCH] border --- .../src/app/ntt-gantt/ntt-gantt.component.ts | 20 ++++++++++--------- frontend/src/index.html | 4 ++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index fa8c508..ceb9372 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -72,8 +72,8 @@ export class NttGanttComponent implements OnInit { /**############################### Default Variables /**###############################*/ public range = new FormGroup({ - start: new FormControl(new Date('12/01/2022')), - end: new FormControl(new Date('01/31/2024')), + start: new FormControl(new Date('12/01/2023')), + end: new FormControl(new Date('01/31/2025')), }); public data: any[] = []; @@ -82,8 +82,8 @@ export class NttGanttComponent implements OnInit { public userSupportGroup: string; public taskSettings: object = {}; public labelSettings: object = {}; - public projectStartDate: Date = new Date('12/01/2022'); - public projectEndDate: Date = new Date('01/31/2024'); + public projectStartDate: Date = new Date('12/01/2023'); + public projectEndDate: Date = new Date('01/31/2025'); public resourceFields: object ={}; public editSettings: object = {}; public tooltipSettings: object ={}; @@ -770,14 +770,16 @@ export class NttGanttComponent implements OnInit { */ public queryTaskbarInfo(args: any) { - if (args.taskbarType == 'Milestone') - { - args.taskbarElement.children[1].classList.add('e-gantt-milestone-border'); - } + if(args.data.taskData.isRes == false){ if(args.data.taskData.TaskID.includes("D2")){ - args.milestoneBorder = "black"; + //args.milestoneBorder = "black"; + if (args.taskbarType == 'Milestone') + { + args.taskbarElement.children[1].classList.add('e-gantt-milestone-border'); + } + //console.log(args.taskbarElement); if (args.data.taskData.resources[0].state == 0 ) { args.milestoneColor = "#f83200"; diff --git a/frontend/src/index.html b/frontend/src/index.html index 20a71e5..7fa1593 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -18,12 +18,12 @@