Merge Done

frontend/src/app/filter-dialog/filter-dialog.component.ts

@@ -96,7 +96,9 @@ export class FilterDialogComponent implements OnInit {
     }
 
     ngOnInit(): void {
-      this.userSupportGroup = this.dataService.getUserSupportGroup();
+      this.dataService.fetchUserSupportGroup().then((res:any)=>{
+        this.userSupportGroup = res.name;
+      });
       console.log(this.userSupportGroup);
       if(this.dataService.selectedLanguage == 'DE'){
         for (const state of this.dataService.getStates()) {
@@ -180,9 +182,9 @@ export class FilterDialogComponent implements OnInit {
     }
 
     applyFilter(){
-    let filter = []
+    let filterElement = []
     if(this.paketTypesFilter.length > 0){
-      filter.push({
+      filterElement.push({
         "column": "PackageType",
          "filter": "equals",
          "criteria": this.paketTypesFilter
@@ -192,7 +194,7 @@ export class FilterDialogComponent implements OnInit {
 
 
     if(this.statesFilter.length > 0){
-      filter.push({
+      filterElement.push({
         "column": "State",
          "filter": "equals",
          "criteria": this.statesFilter
@@ -201,29 +203,30 @@ export class FilterDialogComponent implements OnInit {
 
 
     if(this.contractsFilter.length > 0){
-      filter.push({
+      filterElement.push({
         "column": "Contract",
         "filter": "equals",
         "criteria": this.contractsFilter
         });
     }
     if(this.supportGroupsFilter.length > 0){
-      filter.push({
+      filterElement.push({
         "column": "SupportGroup",
         "filter": "equals",
         "criteria": this.supportGroupsFilter
         });
+        console.log(this.supportGroupsFilter);
     }else{
-      filter.push({
+      filterElement.push({
         "column": "SupportGroup",
         "filter": "equals",
-        "criteria": [this.dataService.userSupportGroup]
+        "criteria": [this.userSupportGroup]
         });
     }
 
 
     if(this.filterStartDate != null && this.filterEndDate != null){
-      filter.push({
+      filterElement.push({
         "column": "D2",
         "filter": "dateRange",
         "criteria": [new Date(this.filterStartDate), new Date(this.filterEndDate)]
@@ -231,12 +234,13 @@ export class FilterDialogComponent implements OnInit {
     }
 
     if(this.criteria != null && this.criteria != ""){
-      filter.push({
+      filterElement.push({
         "column": "ResourceName",
         "filter": "contains",
         "criteria": [this.criteria]
         });
     }
+    let filter = {filterElement: filterElement};
     console.log(filter);
     this.dialogRef.close(filter);
 

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

@@ -12,7 +12,6 @@ import * as $ from 'jquery';
 import { StateDialogComponent } from 'src/app/state-dialog/state-dialog.component';
 import { MatSnackBar, MatSnackBarHorizontalPosition, MatSnackBarVerticalPosition } from '@angular/material/snack-bar';
 import { MAT_DATE_FORMATS } from '@angular/material/core';
-import { PlanTimeBarComponent } from 'src/app/plan-time-bar/plan-time-bar.component';
 
 export const MY_DATE_FORMATS = {
   parse: {
@@ -39,7 +38,6 @@ export class NttGanttComponent implements OnInit {
   public ganttDefault!: GanttComponent;
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
-  @ViewChild('plantimeComponent')plantimeComponent!:PlanTimeBarComponent;
 
   public range = new FormGroup({
     start: new FormControl<Date | null>(new Date('12/01/2022')),
@@ -276,7 +274,9 @@ public logg(args){
         this.inputForTimeline = [this.splitterSettings, this.projectStartDate, this.projectEndDate];
       });
     });
-
+    this.dataService.fetchPlanTimes({filter: this.filterEnabled ? this.filters : {filterElement: [{column: "SupportGroup", filter: "equals", criteria: [this.userSupportGroup]}]}}, this.projectStartDate, this.projectEndDate).then((res:any[])=>{
+      console.log(res);
+    });
 
 
 
@@ -463,17 +463,9 @@ public logg(args){
       const found = this.allResources.find((resource) => {
         return resource.resourceId == args.data.taskData.resources[0].resourceId;
       });
-
+      this.dataService.updateDatePerChange(found);
-      this.dataService.updateDatePerChange(found).then((res:any)=>{
+      this.renderplanTime = false;
-        //console.log(args);
+      this.refreshData();
-        console.log(args.data.taskData.resources[0].plantime);
-        console.log(args.previousData.startDate);
-        console.log(args.editingFields.startDate);
-        this.plantimeComponent.movePlanTime(args.previousData.startDate, args.editingFields.startDate, args.data.taskData.resources[0].plantime)
-      });
-
-      //this.renderplanTime = false;
-      //this.refreshData();
     }
   }
 
@@ -1065,13 +1057,11 @@ public logg(args){
     {
       'sliceStart': this.sliceStart,
       'sliceEnd': this.sliceEnd,
-
       filter: this.filterEnabled ? this.filters : {filterElement: [{column: "SupportGroup", filter: "equals", criteria: [this.userSupportGroup]}]},
       sort: this.sortEnabled ? this.sort : {
         'column': 'ChangeNr',
         'mode': 'asc'
       },
-
     }
     return request;
   }