From 36f8490e85937ab1187e57416e2a8808b4b59b81 Mon Sep 17 00:00:00 2001
From: manueltauber <manuel.tauber@emea.nttdata.com>
Date: Tue, 20 Jun 2023 12:20:06 +0200
Subject: [PATCH] planTimesMergingPreperations

---
 .../calender/api/KalenderRestController.java  |  2 +-
 frontend/src/app/data.service.ts              | 20 +++++++++++++++++--
 frontend/src/main.ts                          |  2 +-
 frontend/src/ntt-gantt/ntt-gantt.component.ts |  4 +++-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java
index e17c2f6..d3387e3 100644
--- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java
+++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java
@@ -116,7 +116,7 @@ public class KalenderRestController {
     }
 
     @CrossOrigin("*")
-    @GetMapping("/api/getPlanTimes") 
+    @PostMapping("/api/fetchPlanTimes") 
     public ArrayList<CalendarWeek> getPlanTimes(@RequestBody PlanTimesRequest request) throws ARException, ValidationError {
         PlanTimes p = new PlanTimes(javaAPI);
         p.setPlanTimes(request);
diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts
index 7d5d3e1..d60cff5 100644
--- a/frontend/src/app/data.service.ts
+++ b/frontend/src/app/data.service.ts
@@ -200,7 +200,21 @@ export class DataService {
     return promise;
   }
 
-
+  public async fetchPlanTimes(filters: any, renderStartDate: Date, renderEndtDate: Date){
+    const promise = new Promise(resolve=>{
+      let obj = {filters : filters, renderStartDate : renderStartDate, renderEndDate: renderEndtDate };
+      let stringyfiedData = JSON.stringify(obj);
+      let dataJson = JSON.parse(stringyfiedData) as typeof stringyfiedData;
+       console.log(dataJson);
+      let res : any[] = [];
+      this.http.post('http://localhost:8080/api/fetchPlanTimes', dataJson)
+      .subscribe((response: any)=>{
+          console.log(response);
+        resolve(res);
+      })
+    })
+    return promise;
+  }
 
   public async fetchImplementers(change: any){
     const promise = new Promise(resolve=>{
@@ -244,12 +258,14 @@ export class DataService {
    * @returns promise for the fetched Changes Array
    */
   public async fetchChanges(reqestParams: any = null){
+
+    // let filter = {'filterElement': [reqestParams]};
     let stringyfiedData = JSON.stringify(reqestParams);
     let dataJson = JSON.parse(stringyfiedData) as typeof stringyfiedData;
     const promise = new Promise(resolve=>{
       let first : boolean = true;
       let res : any[] = [];
-      //console.log(dataJson);
+      console.log(dataJson);
       this.http.post('http://localhost:8080/api/getChanges', dataJson)
       .subscribe((response:any)=>{
        //console.log(response);
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 61c6cc9..93f6f62 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -3,7 +3,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import {registerLicense} from '@syncfusion/ej2-base'
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
-registerLicense("ORg4AjUWIQA/Gnt2VVhjQlFaclhJXGFWfVJpTGpQdk5xdV9DaVZUTWY/P1ZhSXxRd0djW39ZdXZRRWNfUkQ=");
+registerLicense("Mgo+DSMBaFt+QHJqVk1nQ1BBaV1CX2BZeVl1TWlceE4BCV5EYF5SRHBdQl1mSn5XcEVkXH0=;Mgo+DSMBPh8sVXJ1S0R+X1pDaV5HQmFJfFBmQmlad1R1c0U3HVdTRHRcQlthSX5WdUVnX39Xc3Y=;ORg4AjUWIQA/Gnt2VFhiQlJPcUBDWHxLflF1VWRTfFZ6cVJWESFaRnZdQV1lS35Tc0ZjXXlfcXVX;MjQ3MjE3NEAzMjMxMmUzMDJlMzBFaEtQQXlZRHpObnNVVWpaRXFlcmpVV1VxeTJsR1Eva2tKeE9KUUhjWjhJPQ==;MjQ3MjE3NUAzMjMxMmUzMDJlMzBialU5SlJFbDRnMHNnYitHSE5JNkQzNFdYdXluUXl6OXBoRk5uVTZRTnBRPQ==;NRAiBiAaIQQuGjN/V0d+Xk9HfVhdXGZWfFN0RnNedV14flBBcC0sT3RfQF5jT3xTdkBgWXtYcXNTRA==;MjQ3MjE3N0AzMjMxMmUzMDJlMzBXdnU5YjR3cHNpQlkrMHZNaWNKaE9VOUY0RkVMYjhQTGx5WVp6bGhVYUxRPQ==;MjQ3MjE3OEAzMjMxMmUzMDJlMzBhV09DN3NabFRmSWtkWGFmUDNmaXU1WGYyanhuRUJZci9pZ0VoTytBTkdrPQ==;Mgo+DSMBMAY9C3t2VFhiQlJPcUBDWHxLflF1VWRTfFZ6cVJWESFaRnZdQV1lS35Tc0ZjXXlceHRX;MjQ3MjE4MEAzMjMxMmUzMDJlMzBqcFdzc1ZRMFNQTVVZRms0eVZOejBvTUpnOG9tbXdlVUdlTFlUSjhFNTFZPQ==;MjQ3MjE4MUAzMjMxMmUzMDJlMzBPMHBQNW5ieGsyV21SVDNySktEbjdkWHhUYUJZN0xHdUZmWGhROTRJeWY0PQ==;MjQ3MjE4MkAzMjMxMmUzMDJlMzBXdnU5YjR3cHNpQlkrMHZNaWNKaE9VOUY0RkVMYjhQTGx5WVp6bGhVYUxRPQ==");
 if (environment.production) {
   enableProdMode();
 }
diff --git a/frontend/src/ntt-gantt/ntt-gantt.component.ts b/frontend/src/ntt-gantt/ntt-gantt.component.ts
index 27fea8a..8a56078 100644
--- a/frontend/src/ntt-gantt/ntt-gantt.component.ts
+++ b/frontend/src/ntt-gantt/ntt-gantt.component.ts
@@ -274,6 +274,7 @@ public logg(args){
         this.inputForTimeline = [this.splitterSettings, this.projectStartDate, this.projectEndDate];
       });
     });
+    this.dataService.fetchPlanTimes({'filterElement': this.filters}, this.projectStartDate, this.projectEndDate);
 
 
 
@@ -1054,7 +1055,8 @@ public logg(args){
     {
       'sliceStart': this.sliceStart,
       'sliceEnd': this.sliceEnd,
-      filter: this.filterEnabled ? this.filters : [{column: "SupportGroup", filter: "equals", criteria: [this.userSupportGroup]}],
+
+      filter: this.filterEnabled ? this.filters : {filterElement: [{column: "SupportGroup", filter: "equals", criteria: [this.userSupportGroup]}]},
       sort: this.sortEnabled ? this.sort : {
         'column': 'ChangeNr',
         'mode': 'asc'