diff --git a/frontend/src/app/filter-dialog/filter-dialog.component.ts b/frontend/src/app/filter-dialog/filter-dialog.component.ts index f751823..5439b8d 100644 --- a/frontend/src/app/filter-dialog/filter-dialog.component.ts +++ b/frontend/src/app/filter-dialog/filter-dialog.component.ts @@ -207,7 +207,7 @@ export class FilterDialogComponent implements OnInit { if(this.dataService.getStates().find((item)=> {return item.stateNameEN == state;})){ this.statesFilter.push(this.dataService.getStates().find((item)=> {return item.stateNameEN == state;}).stateNameEN); } - // //console.log(this.statesFilter); + console.log(this.statesFilter); } } this.statesFilter = [...new Set(this.statesFilter)]; diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index 2c62ba7..e10d4ac 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -810,17 +810,22 @@ export class NttGanttComponent implements OnInit { */ public queryTaskbarInfo(args: any) { - if (args.taskbarType == 'Milestone' && args.data.taskData.TaskID.includes("D2") && args.data.taskData.isFixed == false) + if (args.taskbarType == 'Milestone' && args.data.taskData.TaskID.includes("D2")) { + if(args.data.taskData.isFixed == true){ + args.taskbarElement.children[1].classList.add('e-gantt-milestone-border2'); + }else{ + args.taskbarElement.children[1].classList.add('e-gantt-milestone-border1'); + } // console.log(args.taskbarElement.children[1].style.add); - args.taskbarElement.children[1].classList.add('e-gantt-milestone-border1'); + // console.log(args.taskbarElement.children[1]); // args.taskbarElement.children[1].children[0].classList.add('e-gantt-milestone-border'); // args.taskbarElement.children[1].children[1].classList.add('e-gantt-milestone-border'); } else{ if(args.taskbarType == 'Milestone'){ - args.taskbarElement.children[1].classList.add('e-gantt-milestone-border') + args.taskbarElement.children[1].classList.add('e-gantt-milestone-border'); } } diff --git a/frontend/src/index.html b/frontend/src/index.html index bbe6410..55ce30a 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -45,6 +45,17 @@ cursor: grab; } + + .e-gantt-milestone-border2 { + /* border: 2px solid red !important; */ + border-radius: 30%; + /* border-top-width: 1px; */ + color: red; + background-color: #9e9e9b !important; + cursor: not-allowed; + + } +