Rautenfarben

frontend/src/app/ntt-gantt/ntt-gantt.component.html

@@ -128,50 +128,7 @@
     (expanding)="onExpand($event)"
 
   >
-  <!-- <e-columns>
-    <e-column headerText="Kurzbeschreibung" field="TaskName" width="250">
-      <ng-template #headerTemplate>
-        Kurzbeschreibung
-        <div class="square"><mat-icon>arrow_downward</mat-icon></div>
-      </ng-template>
-    </e-column>
 
-    <e-column headerText="Kurzbeschreibung" field="stateName" width="250">
-      <ng-template #headerTemplate>
-        <div class="square"><mat-icon>arrow_downward</mat-icon></div>
-      </ng-template>
-    </e-column>
-
-    <e-column headerText="Kurzbeschreibung" field="vertragName" width="250">
-      <ng-template #headerTemplate>
-        <div class="square"><mat-icon>arrow_downward</mat-icon></div>
-      </ng-template>
-    </e-column>
-
-    <e-column headerText="Kurzbeschreibung" field="supportGroup" width="250">
-      <ng-template #headerTemplate>
-        <div class="square"><mat-icon>arrow_downward</mat-icon></div>
-      </ng-template>
-    </e-column>
-
-    <e-column headerText="Kurzbeschreibung" field="StartDate" width="250">
-      <ng-template #headerTemplate>
-        <div class="square"><mat-icon>arrow_downward</mat-icon></div>
-      </ng-template>
-    </e-column>
-
-    <e-column headerText="Kurzbeschreibung" field="plantime" width="250">
-      <ng-template #headerTemplate>
-        <div class="square"><mat-icon>arrow_downward</mat-icon></div>
-      </ng-template>
-    </e-column>
-
-    <e-column headerText="Kurzbeschreibung" field="changeNr" width="250">
-      <ng-template #headerTemplate>
-        <div class="square"><mat-icon>arrow_downward</mat-icon></div>
-      </ng-template>
-    </e-column>
-  </e-columns> -->
 
   <ng-template #tooltipSettingsTaskbar let-data>
     <div>

frontend/src/app/ntt-gantt/ntt-gantt.component.ts

@@ -811,73 +811,84 @@ 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 != true){
-        args.taskbarElement.children[1].classList.add('e-gantt-milestone-border2');
-      }else{
         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');
       }
-    // console.log(args.taskbarElement.children[1].style.add);
-
-    // 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');
       }
     }
 
-    if(args.data.taskData.isRes == false){
-      if(args.data.taskData.TaskID.includes("D2")){
-        //args.milestoneBorder = "black";
-        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 ) {
           args.milestoneColor = "#f83200"; //red
+          console.log("red");
         }
         if (args.data.taskData.resources[0].state == 1 ) {
           args.milestoneColor = "#f98700"; //orange
+          console.log("orange");
         }
         if (args.data.taskData.resources[0].state == 3 ) {
           args.milestoneColor = "#ff9248"; //light orange
+          console.log("light orange");
         }
-        if (args.data.taskData.resources[0].state == 6 ) {
+        if (args.data.taskData.resources[0].state >= 6 ) {
           args.milestoneColor = "#ffff00"; //yellow
+          console.log("yellow");
+        }
+        if (args.data.taskData.resources[0].state == 7 ) {
+          args.milestoneColor = "#ffff00"; //yellow
+          console.log("yellow");
         }
         if (args.data.taskData.resources[0].state == 10 && args.data.taskData.resources[0].statusReason != "") {
           args.milestoneColor = "#32CD32"; //lightgreen
+          console.log("lightgreen");
         }
         if (args.data.taskData.resources[0].state == 10 ) {
-          args.milestoneColor = "##008B45"; //lightgreen
+          args.milestoneColor = "#008B45"; //lightgreen
+          console.log("lightgreen");
         }
         if (args.data.taskData.resources[0].state == 11 ) {
           args.milestoneColor = "#ffffff"; //white
+          console.log("white");
         }
-        console.log(args.milestoneColor);
+        console.log("\n###############");
+        console.log("\nisFixed:"+args.data.taskData.isFixed);
+        console.log("\nArgs:", args);
+        console.log("\nBorder",args.taskbarElement.children[1].classList)
+        console.log("\nisRes: ", args.data.taskData.isRes);
+        console.log("\nisD2", args.data.taskData.TaskID.includes("D2"));
+        console.log("\nMilestone Color ready:",args.milestoneColor);
 
-      }else{
+      }
-        if (args.data.taskData.TaskID.includes("D1")||args.data.taskData.TaskID.includes("D4")){
+
+      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 = "";
+             args.taskbarElement.innerHTML = "";
           }else{
             if(args.data.taskData.TaskID.includes("D1")){
-              args.milestoneColor = "#d4d4d4";
+               args.milestoneColor = "#d4d4d4";
             }
             if(args.data.taskData.TaskID.includes("D4")){
-              args.milestoneColor = "#a1a1a1";
+               args.milestoneColor = "#a1a1a1";
             }
           }
         }
         if (args.data.taskData.TaskID.includes("D3")){
-          args.milestoneColor = "#bababa";
+           args.milestoneColor = "#bababa";
         }
       }
-    }
+
+
+
   }
 
   /**

frontend/src/index.html

@@ -28,31 +28,29 @@
 
 
    .e-gantt-milestone-border {
-    /* border: 2px solid red !important; */
      border-radius: 50%;
-     /* border-top-width: 1px; */
      color: red;
      background-color: transparent !important;
      cursor: not-allowed;
 
+
     }
 
     .e-gantt-milestone-border1 {
-     /* border: 2px solid red !important; */
      border-radius: 30%;
      color: red;
      background-color: #9e9e9b !important;
      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;
+     cursor: not-allowed !important;
+
 
     }