From 74f7d6b77b1e0525bed903601397a852143feb90 Mon Sep 17 00:00:00 2001
From: manueltauber <manuel.tauber@emea.nttdata.com>
Date: Tue, 8 Aug 2023 12:33:02 +0200
Subject: [PATCH] approval fix

---
 frontend/src/app/data.service.ts                | 17 ++++++++++-------
 .../src/app/ntt-gantt/ntt-gantt.component.ts    |  8 ++++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/data.service.ts b/frontend/src/app/data.service.ts
index 44d32e8..1490aac 100644
--- a/frontend/src/app/data.service.ts
+++ b/frontend/src/app/data.service.ts
@@ -399,10 +399,10 @@ export class DataService {
               }
             );
           }
-          let approval = this.validateApproval(resp.approvalStatus);
+          //let approval = this.validateApproval(resp.approvalStatus);
             res.push({
               resourceId: resp.resourceId,
-              approvalStatus: this.validateApproval(resp.approvalStatus),
+              approvalStatus: resp.approvalStatus,
               statusReason: resp.statusReason,
               changeNr: resp.changeNr,
               resourceName: resp.resourceName,
@@ -416,8 +416,8 @@ export class DataService {
               tasks: tasks,
               supportGroupId: resp.supportGroupId,
               implementerEdit: this.validateImplementerEdit(resp.state),
-              flagApproval: approval,
-              flagReject: approval,
+              flagApproval: this.validateApproval(resp),
+              flagReject: this.validateApproval(resp),
               flagCancel: this.validateCancel(resp.state),
               flagPermit: this.validatePermit(resp.state),
               changeImplementerLogin: resp.changeImplementerLogin,
@@ -441,7 +441,7 @@ export class DataService {
   * @returns true or false for a boolean flag
   */
   private validateImplementerEdit(state):boolean{
-    if(state == 1 || state == 3 || state == 6){
+    if(state == 3 || state == 6){
       return true;
     }else{
       return false;
@@ -479,8 +479,11 @@ export class DataService {
   * @param state approvalString
   * @returns true or false for a boolean flag
   */
-  private validateApproval(approval):boolean{
-    if(approval!=""){
+  private validateApproval(resp):boolean{
+    console.log(resp.changeNr);
+    console.log(resp.approvalStatus);
+    console.log('\n');
+    if(resp.approvalStatus!=undefined && resp.approvalStatus!="0"){
       return true;
     }else{
       return false;
diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts
index 6edf079..5f36296 100644
--- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts
+++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts
@@ -418,6 +418,7 @@ export class NttGanttComponent implements OnInit {
         }
         let dialogRef = StateDialogComponent;
         this.matDialog.open(dialogRef,{data : data}).afterClosed().subscribe((res)=>{
+          console.log(res);
           if(res == "Success"){
             this.refreshData();
           }
@@ -717,6 +718,9 @@ export class NttGanttComponent implements OnInit {
           if(allStates){
             allStates = true;
           }
+          else{
+            allStates = false;
+          }
           this.selectedRescourceIds.push(change.taskData.resourceId);
           }else{
             allStates = false;
@@ -755,7 +759,7 @@ export class NttGanttComponent implements OnInit {
 
       if(allStates){
         this.toolbar = [];
-        if(allTransition){
+        if(allTransition && !this.approvalPending){
           this.toolbar.push({text:this.languageService.lMap.get("stateChange"), id: "6"});
         }
         if(allPermit){
@@ -859,7 +863,7 @@ export class NttGanttComponent implements OnInit {
       }
       if(allStates){
         this.toolbar = [];
-        if(allTransition){
+        if(allTransition&&!this.approvalPending){
           this.toolbar.push({text:this.languageService.lMap.get("stateChange"), id: "6"});
         }
         if(allPermit){