From 921df2548782b2daf91a5abb8d5fd22e0e07ac5c Mon Sep 17 00:00:00 2001 From: ashwaq Date: Mon, 6 Apr 2020 14:20:17 +0300 Subject: [PATCH] fix submit in replacment , reset info with skip option --- .../authentication/login/login.component.ts | 5 +++ .../sms-page/sms-page.page.html | 10 +++++- .../authentication/sms-page/sms-page.page.ts | 3 +- .../work-list-replacement-roll.component.html | 20 +++++++++-- .../work-list-replacement-roll.component.ts | 8 ++--- .../worklist-main-mr.component.ts | 14 ++++---- .../worklist-main-po.component.ts | 20 ++++++----- .../worklist-main-pr.component.ts | 13 +++---- .../worklist-main.component.html | 11 ++++-- .../worklist-main/worklist-main.component.ts | 36 +++++++++++++------ 10 files changed, 98 insertions(+), 42 deletions(-) diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 08179d5e..751360df 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -23,6 +23,7 @@ import { PushService } from 'src/app/hmg-common/services/push/push.service'; styleUrls: ['./login.component.scss'] }) export class LoginComponent implements OnInit, OnDestroy { + deviceToken1: any; constructor( public cs: CommonService, @@ -127,6 +128,10 @@ export class LoginComponent implements OnInit, OnDestroy { }); this.deviceToken = localStorage.getItem('devicyeToken'); + this.deviceToken1 =this.cs.getDeviceToken(); + console.log('lngOnInit localStorage: ' + this.deviceToken1); + console.log('lngOnInit getDeviceToken: ' + this.deviceToken); + if (this.deviceToken) { console.log('login enabled first time: ' + this.deviceToken); } else { diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index 654adc99..9208b5fd 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -18,7 +18,15 @@

{{'verificationcode,verificationcode' | translate}}


-

{{'verificationcode,title' | translate}}{{'verificationcode,verificationcode' | translate}} {{'verificationcode,by' | translate}}{{'verificationcode,sms' | translate}}{{'verificationcode,instruct' | translate}}{{'general,submit' | translate}}

+

{{'verificationcode,title' | translate}} + {{'verificationcode,verificationcode' | translate}} + {{'verificationcode,by' | translate}} + {{'verificationcode,sms' | translate}} + whatsapp + + {{'verificationcode,instruct' | translate}} + {{'general,submit' | translate}}

diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index 20a94df0..50e558de 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -81,6 +81,7 @@ export class SmsPageComponent implements OnInit { public smc_code: any = []; code: any; user_name: string; + loginType: any; constructor( @@ -124,7 +125,7 @@ export class SmsPageComponent implements OnInit { this.loginData= this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); console.log("loginData : "+ this.loginData); - + // this.loginType=this.loginTypeData.loginType; this.deviceToken= this.common.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); if(this.deviceToken == undefined){ 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 ce745423..628eb276 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 @@ -1,7 +1,10 @@ - {{ 'replacementRoll, title' | translate}} + {{ 'replacementRoll, title' | translate}} + + + @@ -52,7 +55,18 @@ --> - +
+ {{"replacementRoll, question" | translate}} : + {{pQuestion}} ? + {{"replacementRoll, answer" | translate}} + + {{"replacementRoll, enterNote" | translate}} + + + + +
+
@@ -133,7 +147,7 @@ -
+
{{"replacementRoll, question" | translate}} : {{pQuestion}} ? {{"replacementRoll, answer" | 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 e456a8b8..a86f32cd 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 @@ -270,10 +270,10 @@ export class WorkListReplacementRollComponent implements OnInit { // here must send response attr // this.modalCtrl.dismiss(); - // this.workListMainService.actionButton(this.WorkListActionObj). - // subscribe((result: any) => { - // this.handleApplayActionResult(result); - // }); + this.workListMainService.actionButton(this.WorkListActionObj). + subscribe((result: any) => { + this.handleApplayActionResult(result); + }); } else { let msg: string = this.ts.trPK("replacementRoll", "enterNote"); this.cs.showErrorMessageDialog(() => { 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 d293d77d..437939a0 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 @@ -127,7 +127,7 @@ export class WorklistMainMRComponent implements OnInit { this.direction = TranslatorService.getCurrentLanguageName() //this.getPassNotificationDetails = this.common.sharedService.getSharedData('passNotificationInfo'); this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; // this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; } @@ -167,7 +167,7 @@ export class WorklistMainMRComponent implements OnInit { this.WorkListBodyObj.P_TRANSACTION_ID = this.TransactionID; this.WorkListBodyObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM;; + this.WorkListBodyObj.P_PAGE_NUM = 1; this.WorkListBodyObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListButtonsObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -178,7 +178,7 @@ export class WorklistMainMRComponent implements OnInit { this.WorkListActionObj.P_COMMENTS = ''; this.WorkListActionObj.P_APPROVER_INDEX = null; - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -260,6 +260,7 @@ export class WorklistMainMRComponent implements OnInit { getNotificationButtons(notificationButtonsObj) { + this.notificationButtonRes=[]; this.worklistMainService .getNotificationButtons(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -368,7 +369,7 @@ export class WorklistMainMRComponent implements OnInit { this.common.openWorklistMainPRPage(); } else - if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + if(this.notificationArray[index].REQUEST_TYPE == "MO" ){ this.intializeNotificationDetail(); }else{ @@ -611,7 +612,7 @@ export class WorklistMainMRComponent implements OnInit { getNotificationResAttr(notificationButtonsObj) { console.log("getNotificationResAttr"); - + this.NotRespondAttributeList=[]; this.worklistMainService .notificationResponseAttr(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -708,7 +709,7 @@ export class WorklistMainMRComponent implements OnInit { getAttachmentNotification(WorkListAttachObj) { - + this.attachmentRes=[]; this.worklistAttachService.getAttach(WorkListAttachObj). subscribe((result: NotificationGetAttachResponse) => { this.handleWorkListAttachResult(result); @@ -726,6 +727,7 @@ export class WorklistMainMRComponent implements OnInit { getActionHistory(WorkListActionHistoryObj) { this.IsReachEnd = true; + this.actionHistoryRes=[]; this.worklistService.getActionHistory(WorkListActionHistoryObj). subscribe((result: WorkListActionHistoryResponse) => { this.handleWorkListActionHistoryResult(result); 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 2cd68a18..874a4bd0 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 @@ -62,8 +62,8 @@ export class WorklistMainPoComponent implements OnInit { getPassNotificationDetails: any; public static PASS_RES_ATTR = "passResAttr"; TransactionID: number = -999; - notificationBodyRes: any; - actionHistoryRes: any; + notificationBodyRes : any =[]; + actionHistoryRes: any =[]; notificationButtonRes: any; actionMode: any; pInformation: string = ""; @@ -138,7 +138,7 @@ export class WorklistMainPoComponent implements OnInit { ) { this.direction = TranslatorService.getCurrentLanguageName() this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; } @@ -172,7 +172,7 @@ export class WorklistMainPoComponent implements OnInit { this.WorkListBodyObj.P_TRANSACTION_ID = this.TransactionID; this.WorkListBodyObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM;; + this.WorkListBodyObj.P_PAGE_NUM = 1; this.WorkListBodyObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListButtonsObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -183,7 +183,7 @@ export class WorklistMainPoComponent implements OnInit { this.WorkListActionObj.P_COMMENTS = ""; this.WorkListActionObj.P_APPROVER_INDEX = null; - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -215,7 +215,7 @@ export class WorklistMainPoComponent implements OnInit { } handleWorkListBodyResult(result, Type) { - this.notificationBodyRes = {}; + this.notificationBodyRes = []; if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; @@ -399,7 +399,7 @@ export class WorklistMainPoComponent implements OnInit { this.common.openWorklistMainPRPage() } else - if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + if(this.notificationArray[index].REQUEST_TYPE == "MO" ){ this.common.openWorklistMainMRPage() }else{ this.common.openWorklistMainPage(); @@ -480,7 +480,7 @@ export class WorklistMainPoComponent implements OnInit { this.common.confirmAlertDialogAction( () => { - // this.applyAction(this.WorkListActionObj); + this.applyAction(this.WorkListActionObj); }, this.ts.trPK('general', 'ok'), () => { }, this.ts.trPK('general', 'cancel'), this.ts.trPK('vacation-rule', 'confirmation'), @@ -651,6 +651,7 @@ export class WorklistMainPoComponent implements OnInit { getNotificationResAttr(notificationButtonsObj) { console.log("getNotificationResAttr"); + this.NotRespondAttributeList = []; this.worklistMainService .notificationResponseAttr(notificationButtonsObj) @@ -748,7 +749,7 @@ export class WorklistMainPoComponent implements OnInit { getAttachmentNotification(WorkListAttachObj) { - + this.attachmentRes =[]; this.worklistAttachService.getAttach(WorkListAttachObj). subscribe((result: NotificationGetAttachResponse) => { this.handleWorkListAttachResult(result); @@ -766,6 +767,7 @@ export class WorklistMainPoComponent implements OnInit { getActionHistory(WorkListActionHistoryObj) { this.IsReachEnd = true; + this.actionHistoryRes=[]; this.worklistService.getActionHistory(WorkListActionHistoryObj). subscribe((result: WorkListActionHistoryResponse) => { this.handleWorkListActionHistoryResult(result); 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 d581b7e7..c3f1febd 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 @@ -124,7 +124,7 @@ export class WorklistMainPRComponent implements OnInit { this.direction = TranslatorService.getCurrentLanguageName() //this.getPassNotificationDetails = this.common.sharedService.getSharedData('passNotificationInfo'); this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; // this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; } @@ -164,7 +164,7 @@ export class WorklistMainPRComponent implements OnInit { this.WorkListBodyObj.P_TRANSACTION_ID = this.TransactionID; this.WorkListBodyObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM;; + this.WorkListBodyObj.P_PAGE_NUM = 1; this.WorkListBodyObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListButtonsObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -175,7 +175,7 @@ export class WorklistMainPRComponent implements OnInit { this.WorkListActionObj.P_COMMENTS = ''; this.WorkListActionObj.P_APPROVER_INDEX = null; - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -245,7 +245,7 @@ export class WorklistMainPRComponent implements OnInit { } handleWorkListBodyResult(result, Type) { - this.notificationBodyRes = {}; + this.notificationBodyRes = []; if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; @@ -396,7 +396,7 @@ export class WorklistMainPRComponent implements OnInit { this.intializeNotificationDetail(); } else - if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + if(this.notificationArray[index].REQUEST_TYPE == "MO" ){ this.common.openWorklistMainMRPage() }else{ this.common.openWorklistMainPage(); @@ -740,7 +740,7 @@ export class WorklistMainPRComponent implements OnInit { getAttachmentNotification(WorkListAttachObj) { - + this.attachmentRes = []; this.worklistAttachService.getAttach(WorkListAttachObj). subscribe((result: NotificationGetAttachResponse) => { this.handleWorkListAttachResult(result); @@ -758,6 +758,7 @@ export class WorklistMainPRComponent implements OnInit { getActionHistory(WorkListActionHistoryObj) { this.IsReachEnd = true; + this.actionHistoryRes = []; this.worklistService.getActionHistory(WorkListActionHistoryObj). subscribe((result: WorkListActionHistoryResponse) => { this.handleWorkListActionHistoryResult(result); diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index fd34b96c..aeea095b 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -38,7 +38,6 @@
{{pInformation}}
-
@@ -47,11 +46,18 @@ --> + +
+

{{ 'general, empty' | translate}}

+
+
+ + @@ -66,7 +72,8 @@
-
Employee will also on leave
+
+ Employee will also on leave
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 44c227a5..e083c6be 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -53,8 +53,8 @@ export class WorklistMainComponent implements OnInit { getPassNotificationDetails: any; public static PASS_RES_ATTR = "passResAttr"; TransactionID: number = -999; - notificationBodyRes: any; - actionHistoryRes: any; + notificationBodyRes: any =[]; + actionHistoryRes: any =[]; notificationButtonRes: any; actionMode: any; pInformation: string = ""; @@ -70,7 +70,7 @@ export class WorklistMainComponent implements OnInit { P_RESPOND_ATTRIBUTES_TBL: any; selEmployeeID: any; actionType: string = ""; - notificationArray: any; + notificationArray: any =[]; notificationDynamicAttributeArr: any; private textInput: TextInput; private textArea: TextAreaInput; @@ -80,7 +80,7 @@ export class WorklistMainComponent implements OnInit { notificationCount: any; activeSegment: any = "item-req"; lines_note_limit: any = 24; - attachmentRes: any; + attachmentRes: any =[]; private WorkListActionHistoryObj: WorkListActionHistoryRequest; IsReachEnd: boolean = true; notiActionBtnMore: any = []; @@ -88,7 +88,7 @@ export class WorklistMainComponent implements OnInit { confirmMsg: string; newArr: any = []; selEmp: any; - subordinatesleaveList: any; + subordinatesleaveList: any =[]; private WorkListSubmitterInfoObj: WorkListSubmitterInfoRequest; submitterInfoRes: any; approveDis: boolean = false; @@ -119,7 +119,7 @@ export class WorklistMainComponent implements OnInit { ) { this.direction = TranslatorService.getCurrentLanguageName() this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; } @@ -168,6 +168,8 @@ export class WorklistMainComponent implements OnInit { ); console.log("for next()"+ this.getPassNotificationDetails.ROW_NUM); + this.notificationArray=[] + this.subordinatesleaveList=[]; this.notificationArray = this.common.sharedService.getSharedData( HomeComponent.NOTIFICATION_ARR, false @@ -192,7 +194,7 @@ export class WorklistMainComponent implements OnInit { this.WorkListActionObj.P_COMMENTS = ""; this.WorkListActionObj.P_APPROVER_INDEX = null; - this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.WorkListActionHistoryObj.P_PAGE_NUM = 1; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; this.WorkListAttachObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; @@ -253,6 +255,7 @@ export class WorklistMainComponent implements OnInit { } getEITNotificationDetails(notificationBodyObj) { + this.notificationBodyRes = [] this.worklistMainService .getEITNotificationBody(notificationBodyObj) .subscribe((result: EITNotificatonBodyResponse) => { @@ -261,6 +264,7 @@ export class WorklistMainComponent implements OnInit { } getAbsenceNotificationDetails(notificationBodyObj) { + this.notificationBodyRes = []; this.worklistMainService .getAbsencesNotificationBody(notificationBodyObj) .subscribe((result: AbsenceNotificatonBodyResponse) => { @@ -269,7 +273,7 @@ export class WorklistMainComponent implements OnInit { } handleWorkListBodyResult(result, Type) { - this.notificationBodyRes = {}; + if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; @@ -277,11 +281,17 @@ export class WorklistMainComponent implements OnInit { if (result.GetEITCollectionNotificationBodyList) { this.notificationBodyRes = result.GetEITCollectionNotificationBodyList; + if(this.notificationBodyRes[0].Collection_Notification){ + console.log(this.notificationBodyRes[0].Collection_Notification); + } } } else if (Type == "ABSENCE") { if (result.GetAbsenceCollectionNotificationBodyList) { this.notificationBodyRes = - result.GetAbsenceCollectionNotificationBodyList; + result.GetAbsenceCollectionNotificationBodyList ; + if(this.notificationBodyRes[0].Collection_Notification){ + console.log(this.notificationBodyRes[0].Collection_Notification); + } // getDimensions(this.notificationBodyRes) { let obj = (this.notificationBodyRes[0].Collection_Notification).filter(function (list) { @@ -304,6 +314,7 @@ export class WorklistMainComponent implements OnInit { getNotificationButtons(notificationButtonsObj) { + this.notificationButtonRes=[]; this.worklistMainService .getNotificationButtons(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -422,7 +433,7 @@ export class WorklistMainComponent implements OnInit { this.common.openWorklistMainPRPage() } else - if(this.notificationArray[index].REQUEST_TYPE == "MR" ){ + if(this.notificationArray[index].REQUEST_TYPE == "MO" ){ this.common.openWorklistMainMRPage() }else{ @@ -773,6 +784,8 @@ export class WorklistMainComponent implements OnInit { // } getAttachmentNotification(WorkListAttachObj) { + this.attachmentRes = [] + console.log(" this.P_PAGE_NUM: "+ this.P_PAGE_NUM); this.worklistAttachService.getAttach(WorkListAttachObj). subscribe((result: NotificationGetAttachResponse) => { @@ -791,6 +804,8 @@ export class WorklistMainComponent implements OnInit { getActionHistory(WorkListActionHistoryObj) { this.IsReachEnd = true; + this.actionHistoryRes =[]; + console.log(" this.P_PAGE_NUM: "+ this.P_PAGE_NUM); this.worklistService.getActionHistory(WorkListActionHistoryObj). subscribe((result: WorkListActionHistoryResponse) => { this.handleWorkListActionHistoryResult(result); @@ -944,6 +959,7 @@ export class WorklistMainComponent implements OnInit { } getsubmitterInfo(notificationSubmitterInfoObj) { + this.submitterInfoRes=[]; this.worklistMainService.getSubmitterInfo(notificationSubmitterInfoObj). subscribe((result: WorklistsubmitterInfoResponse) => { this.handleSubmitterInfoResult(result);