From 6c0143d419d230f5ee4349bd563fba600a81e06e Mon Sep 17 00:00:00 2001
From: Manuel Tauber <manuel.tauber@emeal.nttdata.com>
Date: Mon, 15 Apr 2024 14:49:14 +0200
Subject: [PATCH] Bug Fixes DONE

---
 frontend/src/app/data.service.ts              |  5 --
 .../app/ntt-gantt/ntt-gantt.component.html    |  9 ++-
 .../src/app/ntt-gantt/ntt-gantt.component.ts  | 73 ++++++++++++-------
 3 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts
index 9c63059..34a91f7 100644
--- a/frontend/src/app/data.service.ts
+++ b/frontend/src/app/data.service.ts
@@ -683,11 +683,6 @@ export class DataService {
               supportGroup: resp.supportGroup,
               tasks: tasks,
               supportGroupId: resp.supportGroupId,
-              implementerEdit: this.validateImplementerEdit(resp.state),
-              flagApproval: this.validateApproval(resp),
-              flagReject: this.validateApproval(resp),
-              flagCancel: this.validateCancel(resp.state),
-              flagPermit: this.validatePermit(resp.state),
               changeImplementerLogin: resp.changeImplementerLogin,
               packageName: resp.packageName,
               coordinatorSg: resp.coordinatorSg,
diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html
index c621e70..d819754 100644
--- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html
+++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html
@@ -55,11 +55,18 @@
 
   <button mat-basic-button *ngIf="isUserPreset" class="editButton" (click)="openRenameDialog()" color="" style="" ><mat-icon>edit</mat-icon></button>
   <button mat-basic-button *ngIf="isUserPreset" class="deleteButton" (click)="openDeleteDialog()" color="" style="" ><mat-icon>delete_forever</mat-icon></button>
+  <button  mat-raised-button style="margin-top: 5px; margin-left: 10px; height: 50px; margin-right: 5px;" aria-label="Refresh" (click)="refreshGanttwithPresets()">
+    <mat-icon >restart_alt</mat-icon>
+  </button>
   <h3 *ngIf="userId" style="font-family: Arial, Helvetica, sans-serif;"><mat-icon style="color: green;">verified_user</mat-icon>{{this.userId}}</h3>
   <h3 *ngIf="errorService.rsso" style="font-family: Arial, Helvetica, sans-serif;"><mat-icon style="color: red;">verified_user</mat-icon> RSSO Auth Failed</h3>
   <h3 *ngIf="!errorService.rsso &&rssoInit" style="font-family: Arial, Helvetica, sans-serif;"><mat-icon style="color: orange;">verified_user</mat-icon> RSSO: initializing</h3>
+
+
+
 </div>
 
+
 <div *ngIf="!errorService.rsso && !rssoInit" class="filterContainer">
   <button  mat-raised-button class="filterButton" aria-label="Filtern" (click)="openFilterDialog()">
     {{languageService.lMap.get('nttGanttFilterButton')}} <mat-icon style="color: #00a79d;">filter_alt</mat-icon>
@@ -184,7 +191,7 @@
       class="demo-paginator"
       (page)="handlePageEvent($event)"
       [length]="this.dataService.getTotalSize()"
-      [pageSize]="100"
+      [pageSize]="20"
       [disabled]="false"
       [showFirstLastButtons]="true"
       [pageSizeOptions]="[10, 20, 50, 70, 100, 200, 500]"
diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts
index 3fdcc9b..7d3c76f 100644
--- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts
+++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts
@@ -199,7 +199,7 @@ export class NttGanttComponent implements OnInit {
     this.renderGantt = false;
     this.firstLoad = true;
     this.sliceStart = 0;
-    this.sliceEnd = 100;
+    this.sliceEnd = 20;
 
     this.dataService.getUser().then((res: any)=>{
       console.log(res);
@@ -271,7 +271,7 @@ export class NttGanttComponent implements OnInit {
     };
 
     this.columns = [
-      { field: 'TaskName', headerText: 'Kurzbeschreibung', width: 230 },
+      { field: 'TaskName', headerText: 'Kurzbeschreibung', width: 350 },
       { field: 'stateName', headerText: 'Status', width: 250},
       { field: 'vertragName', headerText: 'Vertrag / Provider Cluster', width: 150 },
       { field: 'supportGroup', headerText: 'Gewählte Support Gruppe' },
@@ -454,7 +454,14 @@ export class NttGanttComponent implements OnInit {
     this.resources = this.allResources;
     for (const resource of this.resources) {
       for (const task of resource.tasks) {
-        this.data.push(task);
+        if(this.showDetails == false){
+          if(task.TaskID.includes("D2")){
+            this.data.push(task);
+          }
+        }else{
+          this.data.push(task);
+        }
+
       }
     }
   }
@@ -828,20 +835,12 @@ export class NttGanttComponent implements OnInit {
   public queryTaskbarInfo(args: any) {
     if (args.taskbarType == 'Milestone' && args.data.taskData.TaskID.includes("D2"))
     {
-      if(args.data.taskData.isFixed != true){
+      if(args.data.taskData.isFixed == false){
         args.taskbarElement.children[1].classList.add('e-gantt-milestone-border1');
       }else{
         args.taskbarElement.children[1].classList.remove('e-gantt-milestone-border1');
         args.taskbarElement.children[1].classList.add('e-gantt-milestone-border2');
       }
-    }
-    else{
-      if(args.taskbarType == 'Milestone'){
-           args.taskbarElement.children[1].classList.add('e-gantt-milestone-border');
-      }
-    }
-
-
       if(args.data.taskData.TaskID.includes("D2")){
         // console.log(args.data.taskData.resources[0]);
         if (args.data.taskData.resources[0].state == 0 ) {
@@ -885,24 +884,37 @@ export class NttGanttComponent implements OnInit {
         // console.log("\nMilestone Color ready:",args.milestoneColor);
 
       }
-
-      else{
-        if (args.data.taskData.TaskID.includes("D1")||args.data.taskData.TaskID.includes("D4")||args.data.taskData.TaskID.includes("D3")){
-          if(this.showDetails == false){
-             args.taskbarElement.innerHTML = "";
-          }else{
-            if(args.data.taskData.TaskID.includes("D1")){
-               args.milestoneColor = "#d4d4d4";
-            }
-            if(args.data.taskData.TaskID.includes("D4")){
-               args.milestoneColor = "#a1a1a1";
-            }
+    }
+    else{
+      if(args.taskbarType == 'Milestone' && !args.data.taskData.TaskID.includes("D2")){
+        args.taskbarElement.children[1].classList.add('e-gantt-milestone-border2');
+        if(this.showDetails == true){
+           if (args.data.taskData.TaskID.includes("D1")||args.data.taskData.TaskID.includes("D4")||args.data.taskData.TaskID.includes("D3")){
+              if(args.data.taskData.TaskID.includes("D1")){
+                 args.milestoneColor = "#d4d4d4";
+              }
+              if(args.data.taskData.TaskID.includes("D4")){
+                 args.milestoneColor = "#a1a1a1";
+              }
           }
+          if (args.data.taskData.TaskID.includes("D3")){
+             args.milestoneColor = "#bababa";
+          }
+        }else{
+          // console.log(args);
+          args.taskbarElement.innerHTML = null;
+          args.taskbarElement.classlist = null;
+
         }
-        if (args.data.taskData.TaskID.includes("D3")){
-           args.milestoneColor = "#bababa";
-        }
+
+
       }
+    }
+
+
+
+
+
 
 
 
@@ -1322,6 +1334,13 @@ export class NttGanttComponent implements OnInit {
       this.toolbar = [''];
       if(allTransition && !this.approvalPending){
         this.toolbar.push({text:this.languageService.lMap.get("stateChange"), id: "6"});
+
+        // console.log(document.getElementById("st6"));
+        // let element: any = document.querySelectorAll(".e-tbar-btn .e-tbtn-txt .e-control .e-btn .e-lib")[0];
+        // // element.setAttribute("style","background-color: red !important;");
+        // // element.style.backgroundColor = "red"
+        // console.log(document.querySelectorAll(".e-tbar-btn")[0]);
+
       }
       if(allApprove){
         this.toolbar.push({text: this.languageService.lMap.get("genehmigen"), id: "7"});