From f3f1e6c8d0dc97f3b5b39cad627e16f2ac21ed03 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Tue, 12 May 2020 16:59:47 +0300 Subject: [PATCH] add fix ok button --- .../more-action-modal.component.html | 2 +- .../worklist-main-mr.component.html | 10 +- .../worklist-main-mr.component.ts | 10 +- .../worklist-main-po.component.html | 11 +- .../worklist-main-po.component.ts | 10 +- .../worklist-main-pr.component.html | 11 +- .../worklist-main-pr.component.ts | 10 +- .../worklist-main.component.html | 10 +- .../worklist-main/worklist-main.component.ts | 162 +++++++++--------- 9 files changed, 146 insertions(+), 90 deletions(-) diff --git a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html index 8aac3734..f05b1b65 100644 --- a/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html +++ b/Mohem/src/app/notification/more-action-modal/more-action-modal.component.html @@ -17,7 +17,7 @@ style="margin-right: -22px;margin-top: -10px;">
- + {{button.BUTTON_LABEL}} diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html index 697ea0fc..244a1b45 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.html @@ -16,7 +16,7 @@ - {{ts.trPK('worklistMain','itemReq')}} + {{'worklistMain , itemReq'| translate}} @@ -33,7 +33,7 @@ - {{ts.trPK('worklistMain','info')}} + {{'worklistMain , info'| translate}} @@ -646,6 +646,12 @@ + + + + {{close_label}} + + {{reject_label}} 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 dc6ea786..a00287ea 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 @@ -113,6 +113,8 @@ export class WorklistMainMRComponent implements OnInit { approve_label: any =""; reject_label: any=""; reqInfo_label: any=""; + close_label: any; + closeDis: boolean = false; constructor( @@ -154,6 +156,7 @@ export class WorklistMainMRComponent implements OnInit { this.approveDis = false; this.rejectDis = false; this.requestDis = false; + this.closeDis = false; this.moreDisabled = true; if (this.messageSuccess) { @@ -299,8 +302,13 @@ export class WorklistMainMRComponent implements OnInit { this.requestDis = true; } // if result == null + else if // if result == null + (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") { + this.close_label = this.notificationButtonRes[i].BUTTON_LABEL; + this.closeDis = true; + } else if( - this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") { this.moreDisabled = false; diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html index 9b2f7247..1d34620e 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.html @@ -15,7 +15,7 @@ - {{ts.trPK('worklistMain','line_details')}} + {{'worklistMain,line_details'| translate}} - {{ts.trPK('worklistMain','info')}} + {{'worklistMain, info'| translate}} @@ -778,6 +778,13 @@ {{approve_label}} + + + + + + {{close_label}} + 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 e4945d93..c459c4b0 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 @@ -125,6 +125,8 @@ export class WorklistMainPoComponent implements OnInit { approve_label: any; reject_label: any; reqInfo_label: any; + closeDis: boolean = false;; + close_label: any; constructor( public common: CommonService, @@ -158,6 +160,7 @@ export class WorklistMainPoComponent implements OnInit { this.approveDis = false; this.rejectDis = false; this.requestDis = false; + this.closeDis=false; this.moreDisabled = true; if (this.messageSuccess) { @@ -327,8 +330,13 @@ export class WorklistMainPoComponent implements OnInit { this.requestDis = true; } // if result == null + else if // if result == null + (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") { + this.close_label = this.notificationButtonRes[i].BUTTON_LABEL; + this.closeDis = true; + } else if ( - this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") { this.moreDisabled = false; diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html index 72926ad4..c071e44e 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.html @@ -15,7 +15,7 @@ - {{ts.trPK('worklistMain','itemReq')}} + {{'worklistMain, itemReq'| translate}} @@ -30,7 +30,7 @@ - {{ts.trPK('worklistMain','info')}} + {{'worklistMain, info'| translate}} @@ -492,6 +492,13 @@ + + + + {{close_label}} + + + 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 b3d01120..3cbbbcd4 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 @@ -110,6 +110,8 @@ export class WorklistMainPRComponent implements OnInit { approve_label: any; reject_label: any; reqInfo_label: any; + close_label: any; + closeDis: boolean = false; constructor( @@ -149,6 +151,7 @@ export class WorklistMainPRComponent implements OnInit { this.approveDis = false; this.rejectDis = false; this.requestDis = false; + this.closeDis =false; this.moreDisabled = true; if (this.messageSuccess) { @@ -328,8 +331,13 @@ export class WorklistMainPRComponent implements OnInit { this.requestDis = true; } // if result == null + else if // if result == null + (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") { + this.close_label = this.notificationButtonRes[i].BUTTON_LABEL; + this.closeDis = true; + } else if ( - this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") { this.moreDisabled = false; 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 11bd4ac3..a74401cf 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -15,7 +15,7 @@ - {{ts.trPK('worklistMain','details-emp')}} + {{'worklistMain, details-emp'| translate}} - {{ts.trPK('worklistMain','info')}} + {{'worklistMain, info'| translate}} @@ -513,6 +513,12 @@ {{approve_label}} + + + + + {{close_label}} + 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 1f8a42cc..6b31e493 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; @@ -101,9 +101,11 @@ export class WorklistMainComponent implements OnInit { public isPostNoLoad = true; public worklistNotifications: any; public totalRequestCount = 0; - approve_label: any=""; - reject_label: any=""; - reqInfo_label: any=""; + approve_label: any = ""; + reject_label: any = ""; + reqInfo_label: any = ""; + close_label: any; + closeDis: boolean = false; constructor( public worklistService: WorklistService, @@ -143,13 +145,13 @@ export class WorklistMainComponent implements OnInit { } //name=document.getElementById('notificationDynamicFields').value; - //removeElement('parentDiv', name);" + //removeElement('parentDiv', name);" - //var navbar = document.getElementById("notificationDynamicFields").value; + //var navbar = document.getElementById("notificationDynamicFields").value; // document.querySelector('svg .gauge.chart > text').remove(); // var inputValue = (document.getElementById("notificationDynamicFields")).value; - + console.log(" this.selEmp" + this.selEmp); this.intializeNotificationDetail(); @@ -165,10 +167,11 @@ export class WorklistMainComponent implements OnInit { this.rejectDis = false; this.requestDis = false; this.moreDisabled = true; + this.closeDis = false; // this.approve_label=""; // this.reject_label=""; // this.reqInfo_label=""; - + if (this.messageSuccess) { document.getElementById("notificationDynamicFields").innerHTML = ""; } @@ -177,10 +180,10 @@ export class WorklistMainComponent implements OnInit { HomeComponent.NOTIFICATION_DATA, false ); - - console.log("for next()"+ this.getPassNotificationDetails.ROW_NUM); - this.notificationArray=[] - this.subordinatesleaveList=[]; + + console.log("for next()" + this.getPassNotificationDetails.ROW_NUM); + this.notificationArray = [] + this.subordinatesleaveList = []; this.notificationArray = this.common.sharedService.getSharedData( HomeComponent.NOTIFICATION_ARR, false @@ -284,7 +287,7 @@ export class WorklistMainComponent implements OnInit { } handleWorkListBodyResult(result, Type) { - + if (this.common.validResponse(result)) { this.pInformation = result.P_INFORMATION; this.pQuestion = result.P_QUESTION; @@ -292,17 +295,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); - } + if (this.notificationBodyRes[0].Collection_Notification) { + console.log(this.notificationBodyRes[0].Collection_Notification); + } } } else if (Type == "ABSENCE") { if (result.GetAbsenceCollectionNotificationBodyList) { this.notificationBodyRes = - result.GetAbsenceCollectionNotificationBodyList ; - if(this.notificationBodyRes[0].Collection_Notification){ - console.log(this.notificationBodyRes[0].Collection_Notification); - } + 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) { @@ -325,7 +328,7 @@ export class WorklistMainComponent implements OnInit { getNotificationButtons(notificationButtonsObj) { - this.notificationButtonRes=[]; + this.notificationButtonRes = []; this.worklistMainService .getNotificationButtons(notificationButtonsObj) .subscribe((result: NotificatonButtonResponse) => { @@ -342,23 +345,26 @@ export class WorklistMainComponent implements OnInit { console.log("test" + this.notificationButtonRes.length); for (let i = 0; i < this.notificationButtonRes.length; i++) { if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED") { - this.approve_label=this.notificationButtonRes[i].BUTTON_LABEL; + this.approve_label = this.notificationButtonRes[i].BUTTON_LABEL; this.approveDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED") { - this.reject_label=this.notificationButtonRes[i].BUTTON_LABEL; + this.reject_label = this.notificationButtonRes[i].BUTTON_LABEL; this.rejectDis = true; } else if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") { - this.reqInfo_label=this.notificationButtonRes[i].BUTTON_LABEL; + this.reqInfo_label = this.notificationButtonRes[i].BUTTON_LABEL; this.requestDis = true; - } // if result == null - else if( - this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO") - { - this.moreDisabled = false; + } else if // if result == null + (this.notificationButtonRes[i].BUTTON_ACTION == "CLOSE") { + this.close_label = this.notificationButtonRes[i].BUTTON_LABEL; + this.closeDis = true; + } else if - } + (this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") { + this.moreDisabled = false; + + } } // valid it } } @@ -393,7 +399,7 @@ export class WorklistMainComponent implements OnInit { this.nextNotfification(); }, 5000); - + } } // valid it } @@ -404,7 +410,7 @@ export class WorklistMainComponent implements OnInit { // let itemNo = this.getPassNotificationDetails.ROW_NUM; // itemNo += 1; - + // if (itemNo > this.notificationArray.length) { // this.common.openNotificationPage(); // } else { @@ -425,36 +431,36 @@ export class WorklistMainComponent implements OnInit { public nextNotfification() { //let itemExist = false; - if( document.getElementById("notificationDynamicFields") != null){ - + if (document.getElementById("notificationDynamicFields") != null) { + document.getElementById("notificationDynamicFields").innerHTML = ""; - } + } let itemNo = this.getPassNotificationDetails.ROW_NUM; console.log(itemNo); let index = this.notificationArray.findIndex(x => x.ROW_NUM === itemNo); console.log(index); console.log(this.notificationArray); index += 1; - + if (index < this.notificationArray.length) { this.common.sharedService.setSharedData(this.notificationArray[index], HomeComponent.NOTIFICATION_DATA); - if(this.notificationArray[index].REQUEST_TYPE == "PO" ){ - this.common.openWorklistMainPOPage() - }else - if(this.notificationArray[index].REQUEST_TYPE == "PR" ){ - this.common.openWorklistMainPRPage() - } - else - if(this.notificationArray[index].REQUEST_TYPE == "MO" ){ - this.common.openWorklistMainMRPage() - }else{ - - this.intializeNotificationDetail(); - } + if (this.notificationArray[index].REQUEST_TYPE == "PO") { + this.common.openWorklistMainPOPage() + } else + if (this.notificationArray[index].REQUEST_TYPE == "PR") { + this.common.openWorklistMainPRPage() + } + else + if (this.notificationArray[index].REQUEST_TYPE == "MO") { + this.common.openWorklistMainMRPage() + } else { + + this.intializeNotificationDetail(); + } } - else{ + else { this.common.openNotificationPage(); } } @@ -462,7 +468,7 @@ export class WorklistMainComponent implements OnInit { sortArray(arrayToSort: any) { return arrayToSort.sort((a: any, b: any) => - new Date(b.BEGIN_DATE).getTime() - new Date(a.BEGIN_DATE).getTime() + new Date(b.BEGIN_DATE).getTime() - new Date(a.BEGIN_DATE).getTime() ); } @@ -485,7 +491,7 @@ export class WorklistMainComponent implements OnInit { } this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } - console.log("a"+ this.P_RESPOND_ATTRIBUTES_TBL); + console.log("a" + this.P_RESPOND_ATTRIBUTES_TBL); let repUserName = this.selEmployeeID; if (this.hideForwordEmployee && this.hideForwordEmployee.ATTRIBUTE_NAME) { @@ -496,8 +502,8 @@ export class WorklistMainComponent implements OnInit { this.P_RESPOND_ATTRIBUTES_TBL.push(obj); } - console.log( "b"+ this.P_RESPOND_ATTRIBUTES_TBL); - + console.log("b" + this.P_RESPOND_ATTRIBUTES_TBL); + if ( ButtonAction == "APPROVED" || ButtonAction == "REJECTED" || @@ -517,7 +523,7 @@ export class WorklistMainComponent implements OnInit { ButtonAction, WorklistMainComponent.PASS_ACTION_MODE ); - + this.common.sharedService.setSharedData( this.P_RESPOND_ATTRIBUTES_TBL, WorklistMainComponent.PASS_RES_ATTR @@ -548,7 +554,7 @@ export class WorklistMainComponent implements OnInit { this.ts.trPK('vacation-rule', 'confirmation'), this.confirmMsg) - // this.openApplyModal(this.WorkListActionObj); + // this.openApplyModal(this.WorkListActionObj); } @@ -621,7 +627,7 @@ export class WorklistMainComponent implements OnInit { this.P_RESPOND_ATTRIBUTES_TBL, WorklistMainComponent.PASS_RES_ATTR ); - console.log("c"+ this.P_RESPOND_ATTRIBUTES_TBL); + console.log("c" + this.P_RESPOND_ATTRIBUTES_TBL); // this.common.openWorklistRollReplacement(); this.openRepRolModal(); @@ -654,13 +660,13 @@ export class WorklistMainComponent implements OnInit { // submitAbsObjList: this.notificationBodyRes[0].Collection_Notification // }); //this.common.openConfirmAbsece(); - this.dirfromNotificationPage=true, - this.common.sharedService.setSharedData( - this.dirfromNotificationPage, - "dirfromNotificationPage" - ); + this.dirfromNotificationPage = true, + this.common.sharedService.setSharedData( + this.dirfromNotificationPage, + "dirfromNotificationPage" + ); this.common.sharedService.setSharedData( - this.notificationBodyRes[0].Collection_Notification, + this.notificationBodyRes[0].Collection_Notification, "submitAbsObjList" ); @@ -720,7 +726,7 @@ export class WorklistMainComponent implements OnInit { // this.sharedData.setSharedData(result, WorKListResponse.SHARED_DATA); this.NotRespondAttributeList = []; - result.NotificationGetRespondAttributesList; + result.NotificationGetRespondAttributesList; if ( result.NotificationRespondRolesList != "" && result.NotificationRespondRolesList[0].ATTRIBUTE_NAME != null && @@ -744,7 +750,7 @@ export class WorklistMainComponent implements OnInit { for (let i = 0; i < notificationAttr.length; i++) { if (notificationAttr[i].ATTRIBUTE_TYPE == "VARCHAR2") { this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, "", containerId, "", "", ""); - console.log(this.textArea ); + console.log(this.textArea); } else if (notificationAttr[i].ATTRIBUTE_TYPE == "ROLE") { } else if (notificationAttr[i].ATTRIBUTE_TYPE == "DATE") { @@ -798,7 +804,7 @@ export class WorklistMainComponent implements OnInit { getAttachmentNotification(WorkListAttachObj) { this.attachmentRes = [] - console.log(" this.P_PAGE_NUM: "+ this.P_PAGE_NUM); + console.log(" this.P_PAGE_NUM: " + this.P_PAGE_NUM); this.worklistAttachService.getAttach(WorkListAttachObj). subscribe((result: NotificationGetAttachResponse) => { @@ -817,8 +823,8 @@ export class WorklistMainComponent implements OnInit { getActionHistory(WorkListActionHistoryObj) { this.IsReachEnd = true; - this.actionHistoryRes =[]; - console.log(" this.P_PAGE_NUM: "+ this.P_PAGE_NUM); + this.actionHistoryRes = []; + console.log(" this.P_PAGE_NUM: " + this.P_PAGE_NUM); this.worklistService.getActionHistory(WorkListActionHistoryObj). subscribe((result: WorkListActionHistoryResponse) => { this.handleWorkListActionHistoryResult(result); @@ -827,7 +833,7 @@ export class WorklistMainComponent implements OnInit { } handleWorkListActionHistoryResult(result) { - console.log( "1"+ this.IsReachEnd); + console.log("1" + this.IsReachEnd); if (this.common.validResponse(result)) { if (this.common.hasData(result.GetActionHistoryList)) { this.actionHistoryRes = result.GetActionHistoryList; @@ -838,11 +844,11 @@ export class WorklistMainComponent implements OnInit { let lastitem = result.GetActionHistoryList[lastItemIndex]; if (lastitem.NO_OF_ROWS == lastitem.ROW_NUM) { this.IsReachEnd = true; - console.log( "2"+ this.IsReachEnd); + console.log("2" + this.IsReachEnd); } else { this.IsReachEnd = false; - console.log( "3"+ this.IsReachEnd); + console.log("3" + this.IsReachEnd); } } @@ -947,8 +953,8 @@ export class WorklistMainComponent implements OnInit { const request = new GetSubordinatesLeavesRequest(); - request.P_DATE_FROM = "/Date(" + Date.parse(from) + '+0300'+ ")/";//new Date(from); - request.P_DATE_TO = "/Date(" + Date.parse(to) + '+0300'+ ")/" //new Date(to); + request.P_DATE_FROM = "/Date(" + Date.parse(from) + '+0300' + ")/";//new Date(from); + request.P_DATE_TO = "/Date(" + Date.parse(to) + '+0300' + ")/" //new Date(to); request.P_SELECTED_EMPLOYEE_NUMBER = this.selEmp; // ="'/Date(" + Date.parse(from) + ")'" @@ -972,7 +978,7 @@ export class WorklistMainComponent implements OnInit { } getsubmitterInfo(notificationSubmitterInfoObj) { - this.submitterInfoRes=[]; + this.submitterInfoRes = []; this.worklistMainService.getSubmitterInfo(notificationSubmitterInfoObj). subscribe((result: WorklistsubmitterInfoResponse) => { this.handleSubmitterInfoResult(result);