From 85a5087b44c8925f168977b8e505fbaf701bdcaf Mon Sep 17 00:00:00 2001 From: ashwaq Date: Sun, 1 Mar 2020 11:38:05 +0300 Subject: [PATCH] fix worklist --- .../confirm-login/confirm-login.component.ts | 2 +- Mohem/src/app/authentication/login/login.component.ts | 2 +- .../view-replacement-modal.component.html | 2 +- .../work-list-replacement-roll.component.html | 2 +- .../work-list-replacement-roll.component.ts | 8 +++++++- .../work-list-rfc/work-list-rfc.component.html | 2 +- .../notification/work-list-rfc/work-list-rfc.component.ts | 4 ++++ .../worklist-main-mr/worklist-main-mr.component.ts | 2 +- .../worklist-main-po/worklist-main-po.component.ts | 2 +- .../worklist-main-pr/worklist-main-pr.component.ts | 2 +- .../notification/worklist-main/worklist-main.component.ts | 3 ++- 11 files changed, 21 insertions(+), 10 deletions(-) diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index 5c2853a9..63ed03d6 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -790,7 +790,7 @@ export class ConfirmLoginComponent implements OnInit { request.DeviceType= this.cs.getDeviceType(); - request.DeviceToken="5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36";//this.deviceToken; + request.DeviceToken=this.deviceToken;//"5ca8a69cf1804db55264c349edffb99b9d63acd9fa9b6b18956bcb2ad3f2ba36";//this.deviceToken; //request.TokenID= diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 48ce155c..98cc7058 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -300,7 +300,7 @@ export class LoginComponent implements OnInit, OnDestroy { console.log(result); this.loginData.LogInTokenID = result.LogInTokenID; this.loginData.P_USER_NAME = this.username; - this.loginData.EmployeeName =result.MemberLoginList[0].EMPLOYEE_NAME; + // this.loginData.EmployeeName =result.MemberLoginList[0].EMPLOYEE_NAME; this.cs.sharedService.setSharedData(this.loginData.P_USER_NAME, LoginRequest.SHARED_DATA); this.sharedData.setSharedData(this.loginData, AuthenticationService.LOGIN_DATA); diff --git a/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.html b/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.html index 72e7916b..267d0a85 100644 --- a/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.html +++ b/Mohem/src/app/notification/view-replacement-modal/view-replacement-modal.component.html @@ -25,7 +25,7 @@ --> - + {{RepList.USER_NAME}} {{RepList.EMPLOYEE_DISPLAY_NAME}} diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index af4562cd..b4edfb82 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -8,7 +8,7 @@ - + {{'replacementRoll, searchBy' | translate}} diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index 1ef4b3dd..12b0d317 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -199,7 +199,6 @@ export class WorkListReplacementRollComponent implements OnInit { } submitAction() { - this.selEmp if (this.selEmp && this.isAnswer == false) { // this.selectedUserInf = this.ReplacementList[this.selEmp]; @@ -212,6 +211,7 @@ export class WorkListReplacementRollComponent implements OnInit { this.WorkListActionObj.P_FORWARD_TO_USER_NAME = this.selectedUserInf.USER_NAME; this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode; this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr + this.modalCtrl.dismiss(); this.workListMainService.actionButton(this.WorkListActionObj). subscribe((result: any) => { @@ -233,6 +233,7 @@ export class WorkListReplacementRollComponent implements OnInit { this.WorkListActionObj.P_FORWARD_TO_USER_NAME = null; this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode; this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr + this.modalCtrl.dismiss(); this.workListMainService.actionButton(this.WorkListActionObj). subscribe((result: any) => { @@ -252,10 +253,15 @@ export class WorkListReplacementRollComponent implements OnInit { handleApplayActionResult(result) { if (this.cs.validResponse(result)) { + if (result.MessageStatus == 1) { + // let msg=this.translate.translate("general.success"); // this.cs.showAlert(msg); // this.navCtrl.push("HomePage"); + // here show succsfull msg this.cs.openNotificationPage(); + } + } // valid it } diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html index 708c0462..f07a3e27 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html @@ -22,7 +22,7 @@ - +
diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts index c22eba21..a257adbb 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.ts @@ -100,6 +100,8 @@ export class WorkListRfcComponent implements OnInit { this.WorkListActionObj.P_ACTION_MODE = "RFC"; this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr this.WorkListActionObj.P_APPROVER_INDEX = this.seqNo; + this.modalCtrl.dismiss(); + this.workListMainService.actionButton(this.WorkListActionObj). subscribe((result: any) => { this.handleApplayActionResult(result); @@ -126,6 +128,8 @@ export class WorkListRfcComponent implements OnInit { // this.common.showAlert(msg); // this.navCtrl.push("HomePage"); // this.cs.openHome(); + // here show succsfull msg + this.cs.openNotificationPage(); } } // valid it diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index ea228809..edffe2f5 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -326,7 +326,7 @@ export class WorklistMainMRComponent implements OnInit { actionButton(action) { console.log("actionButton" + action); - alert("don't forget"); + // alert("don't forget"); //let ButtonAction: string = this.actionType; let ButtonAction: string = action; var responseAttrDic = this.notExampleJsonObject; diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index 73abbf7c..ed8fb3f2 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -362,7 +362,7 @@ export class WorklistMainPoComponent implements OnInit { actionButton(action) { console.log("actionButton" + action); - alert("don't forget"); + // alert("don't forget"); //let ButtonAction: string = this.actionType; let ButtonAction: string = action; diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts index a71d4621..56cd4054 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts @@ -361,7 +361,7 @@ export class WorklistMainPRComponent implements OnInit { actionButton(action) { console.log("actionButton" + action); - alert("don't forget"); + //alert("don't forget"); //let ButtonAction: string = this.actionType; let ButtonAction: string = action; diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 938e09aa..916d0c59 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -322,6 +322,7 @@ export class WorklistMainComponent implements OnInit { } // End handleWorkListButtonsResult applyAction(WorkListActionObj) { + console.log("MemberLoginList"); this.worklistMainService .actionButton(WorkListActionObj) .subscribe((result: any) => { @@ -411,7 +412,7 @@ export class WorklistMainComponent implements OnInit { this.WorkListActionObj.P_FORWARD_TO_USER_NAME = ""; this.WorkListActionObj.P_ACTION_MODE = ButtonAction; this.WorkListActionObj.P_COMMENTS = ""; - // this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL; + this.WorkListActionObj.RespondAttributeList = this.P_RESPOND_ATTRIBUTES_TBL; this.common.sharedService.setSharedData( this.getPassNotificationDetails,