diff --git a/Mohem/src/app/notification/item-history/item-history.component.html b/Mohem/src/app/notification/item-history/item-history.component.html index 7f71778a..c68df82b 100644 --- a/Mohem/src/app/notification/item-history/item-history.component.html +++ b/Mohem/src/app/notification/item-history/item-history.component.html @@ -37,8 +37,8 @@ - + {{itemHistory.OU_NAME}}--> + diff --git a/Mohem/src/app/notification/item-history/item-history.component.ts b/Mohem/src/app/notification/item-history/item-history.component.ts index f943fc80..6c2c109b 100644 --- a/Mohem/src/app/notification/item-history/item-history.component.ts +++ b/Mohem/src/app/notification/item-history/item-history.component.ts @@ -20,7 +20,7 @@ export class ItemHistoryComponent implements OnInit { itemHistoryRes: any; IsReachEnd: boolean = false; P_PAGE_NUM: number = 1; - P_PAGE_LIMIT: number = 50; + P_PAGE_LIMIT: number = 100; POItemHistoryReq:any; getPassItemHistoreyList: any; constructor( diff --git a/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts b/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts index ed1946e0..0f68605d 100644 --- a/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts +++ b/Mohem/src/app/notification/qutation-analysis/qutation-analysis.component.ts @@ -19,7 +19,7 @@ import { QuotationAnalysisResponse } from '../models/quotationAnalysisRes'; export class QutationAnalysisComponent implements OnInit { IsReachEnd: boolean = false; P_PAGE_NUM: number = 1; - P_PAGE_LIMIT: number = 50; + P_PAGE_LIMIT: number = 100; POQuotationHISReq: QuotationAnalysisRequest; getPassPOItemID: any; getPassPOHeaderID: any; @@ -30,9 +30,9 @@ export class QutationAnalysisComponent implements OnInit { private ts: TranslatorService, private modalCtrl: ModalController, public worklistService: WorklistService) { - this.getPassPOItemID = this.cs.sharedService.getSharedData('passPOInfo'); - this.getPassPOHeaderID = this.cs.sharedService.getSharedData('passPOHeader'); - this.getPassItemHistoreyList = this.cs.sharedService.getSharedData('passItemHisList'); + this.getPassPOItemID = this.cs.sharedService.getSharedData('passPOInfo',false); + this.getPassPOHeaderID = this.cs.sharedService.getSharedData('passPOHeader',false); + this.getPassItemHistoreyList = this.cs.sharedService.getSharedData('passItemHisList',false); //itemHistoryRes console.log("getPassPOItemID: "+this.getPassPOItemID); console.log("getPassPOItemID: "+this.getPassPOHeaderID); @@ -59,7 +59,7 @@ console.log("getPassPOItemID: "+this.getPassPOHeaderID); const request = new QuotationAnalysisRequest(); request.P_ITEM_ID=parseInt(itemID); request.P_PO_HEADER_ID=headerID; - request.P_PAGE_LIMIT=50; + request.P_PAGE_LIMIT=100; request.P_PAGE_NUM=1; this.worklistMainService.getQutationAnalysis(request). subscribe((result: QuotationAnalysisResponse) => { @@ -92,10 +92,9 @@ console.log("getPassPOItemID: "+this.getPassPOHeaderID); doInfinite(infiniteScroll) { - console.log("hello"); if (!this.IsReachEnd) { this.getQutationAnalysis.P_PAGE_NUM = this.P_PAGE_NUM; - this.worklistService.getActionHistory(this.getQutationAnalysis). + this.worklistMainService.getQutationAnalysis(this.getQutationAnalysis). subscribe((result: any) => { if (this.cs.validResponse(result)) { if (result.GetQuotationAnalysisList != undefined) { diff --git a/Mohem/src/app/notification/work-list-action-history/work-list-action-history.component.ts b/Mohem/src/app/notification/work-list-action-history/work-list-action-history.component.ts index 286f70c9..ef10dcf4 100644 --- a/Mohem/src/app/notification/work-list-action-history/work-list-action-history.component.ts +++ b/Mohem/src/app/notification/work-list-action-history/work-list-action-history.component.ts @@ -19,7 +19,7 @@ export class WorkListActionHistoryComponent implements OnInit { actionHistoryRes: any; IsReachEnd: boolean = false; P_PAGE_NUM: number = 1; - P_PAGE_LIMIT: number = 50; + P_PAGE_LIMIT: number = 100; constructor(private cs: CommonService, private ts: TranslatorService, private modalCtrl: ModalController, public worklistService: WorklistService) { this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo'); 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 ce4e110a..56e32a62 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 @@ -28,7 +28,7 @@ export class WorkListRfcComponent implements OnInit { userNote: any; getpassResAttr: any = []; P_PAGE_NUM: number = 1; - P_PAGE_LIMIT: number = 50; + P_PAGE_LIMIT: number = 100; constructor(public worklistService: WorklistService, private cs: CommonService, private ts: TranslatorService, public workListMainService: WorklistMainService) { this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo'); 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 3ce0bf61..886bf8d7 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 @@ -6,7 +6,7 @@ - + @@ -34,152 +34,151 @@ - - - -
{{pInformation}}
+ +
{{pInformation}}
- - - - - - - -
- - -
-
- - - - -
+ + + + + - + +
+
- - - -
+ + + +
- - -
-
- - - -
- - - -
-
- - - -
- - - -
-
- - - -
- - - -
-
+ +
+
- - - -
+ + + +
- - -
-
+ +
+
+ + + +
- + + +
+
+ + + +
-
+ + + + + + + +
- - + + +
+
+ - +
- + +
-
-
+ +
+ + - -
- - -
{{totalH}}
-
{{valueH}}
- -
- -
{{taxH}}
-
{{taxvalueH}}
+ + +
+
-
+
+ + + +
+ + +
{{totalH}}
+
{{valueH}}
+
+ +
{{taxH}}
+
{{taxvalueH}}
- +
+
- +
+
- -
-
-
+ + -
- -
- - + + + + - -
-

{{ 'general, empty' | translate}}

-
- +
+

{{ 'general, empty' | translate}}

+
+ + -
- - -
+ + +
- - - - - - - - - - -
- - {{notificationList.ITEM_CODE}} -
- - - - -
- - {{notificationList.UOM}} -
-
- + {{notificationList.UOM}} + + + - - - -
- - {{notificationList.QUANTITY}} + {{notificationList.QUANTITY}} -
- + +
{{notificationList.DATE_REQUIRED}}
-
- + + + - - - - -
- - {{notificationList.LINE_STATUS}} -
+ {{notificationList.LINE_STATUS}} + - + -
- - {{notificationList.STATUS_DATE}} -
+ {{notificationList.STATUS_DATE}} +
-
+ - - + - - -
- - {{notificationList.TRANSACTION_TYPE_NAME}} -
+ {{notificationList.TRANSACTION_TYPE_NAME}} + - +
- {{notificationList.ORGANIZATION_NAME}} -
-
- - - + {{notificationList.ORGANIZATION_NAME}} + + + + - - + + +
- {{notificationList.FROM_LOCATOR}} -
- + {{notificationList.FROM_LOCATOR}} +
+ + +
+ + - - - - - +
- {{notificationList.TO_LOCATOR}} -
- + {{notificationList.TO_LOCATOR}} +
-
- + - + - - + + + +
+ + + + - - -
-

{{ 'general, empty' | translate}}

-
-
- -
- + + -
- - +
+

{{ 'general, empty' | translate}}

+
+
+ +
+ -
+
+ + - -
- + -
--> + +
+ - [ngClass]="{'bg-blue-dot' : actionHistory.ACTION === 'Submitted' || actionHistory.ACTION === 'Submit' ,'bg-orange-dot' : actionHistory.ACTION === 'Pending' ,'bg-red-dot' : actionHistory.ACTION === 'Rejected','bg-green-dot' : actionHistory.ACTION != 'Pending' && actionHistory.ACTION != 'Rejected' && actionHistory.ACTION != 'Submitted' && actionHistory.ACTION != 'Submit'}" - class="timeline-thumb timeline-icon"> +
+
-
- - {{actionHistory.ACTION}} - {{actionHistory.NAME}} - + + {{actionHistory.ACTION}} + {{actionHistory.NAME}} + + + {{actionHistory.NOTIFICATION_DATE| dateString }} + + +
+ +
- {{actionHistory.NOTIFICATION_DATE| dateString }} - -
-
-
-
-
-
+ + +
+ - - -
-

{{ 'general, notAttch' | translate}}

-
-
- - -
- - -
- -
-
-
-
- -
-
- -
- - {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} -
- -
-
+ +
- - -
- - - +
+ + + + + + + + + + + + diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss index e69de29b..db039aed 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss @@ -0,0 +1,8 @@ +.itemHISBtn{ + padding: 5px; + color: var(--light); + background: var(--darkgray); + border-radius: 3px; + width: 85%; + height: 40px; +} \ No newline at end of file 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 14423f3c..e142000d 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 @@ -74,7 +74,7 @@ export class WorklistMainMRComponent implements OnInit { PRLines:any;//change the tpye later IsReachEnd: boolean = false; P_PAGE_NUM: number = 1; - P_PAGE_LIMIT: number = 50; + P_PAGE_LIMIT: number = 100; headerTotal: any; totalH: any; valueH: any; @@ -697,6 +697,8 @@ export class WorklistMainMRComponent implements OnInit { } doInfinite(infiniteScroll) { + console.log("doInfinite action history MR"); + if (!this.IsReachEnd) { this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; this.worklistService.getActionHistory(this.WorkListActionHistoryObj). @@ -776,4 +778,115 @@ export class WorklistMainMRComponent implements OnInit { } + + + doInfiniteNotificationBody(infiniteScroll) { + console.log("doInfiniteNotificationBody MR"); + if (!this.IsReachEnd) { + this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.worklistMainService.getMONotificationBody(this.WorkListActionHistoryObj). + subscribe((result: any) => { + if (this.common.validResponse(result)) { + if (result.GetMoNotificationBodyList != undefined) { + this.P_PAGE_NUM++; + (result.GetMoNotificationBodyList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.notificationBodyRes.push(element); + }, (Error) => console.log(Error), () => infiniteScroll.target.complete()); + }// if list length >0 + else { + this.IsReachEnd = true; + } + }// if response == 1 + //this.pageNum++; + infiniteScroll.target.complete(); + + }); + } else { + if (infiniteScroll) + infiniteScroll.target.complete(); + } + }//end infiniteScroll + + + + + loadMoreNotificationBody() { + console.log("loadMoreNotificationBody MR"); + if (!this.IsReachEnd) { + console.log("this.IsReachEnd"+ this.IsReachEnd); + + this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.worklistMainService.getMONotificationBody(this.WorkListBodyObj). + subscribe((result: any) => { + if (this.common.validResponse(result)) { + if (result.GetMoNotificationBodyList != undefined) { + this.P_PAGE_NUM++; + (result.GetMoNotificationBodyList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.notificationBodyRes.push(element); + }, (Error) => console.log(Error), () => + //infiniteScroll.target.complete() + console.log("test") + ); + }// if list length >0 + else { + this.IsReachEnd = true; + } + }// if response == 1 + //this.pageNum++; + // infiniteScroll.target.complete(); + + }); + } else { + // if (infiniteScroll) + // infiniteScroll.target.complete(); + } + }//end infiniteScroll + loadMoreActionHistory() { + console.log("doInfinite action history MR"); + + if (!this.IsReachEnd) { + this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.worklistService.getActionHistory(this.WorkListActionHistoryObj). + subscribe((result: any) => { + if (this.common.validResponse(result)) { + if (result.GetActionHistoryList != undefined) { + this.P_PAGE_NUM++; + (result.GetActionHistoryList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.actionHistoryRes.push(element); + }, (Error) => console.log(Error), () => + //infiniteScroll.target.complete() + console.log("TEST")); + }// if list length >0 + else { + this.IsReachEnd = true; + } + }// if response == 1 + //this.pageNum++; + // infiniteScroll.target.complete(); + + }); + } else { + //if (infiniteScroll) + //infiniteScroll.target.complete(); + } + }//end infiniteScroll + + + + } 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 a8a2ce33..b29116a2 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 @@ -6,13 +6,13 @@ - + {{ts.trPK('worklistMain','info')}} - {{ts.trPK('worklistMain','itemReq')}} + {{ts.trPK('worklistMain','line_details')}} @@ -42,13 +42,13 @@ - + + + @@ -56,7 +56,7 @@
- +
@@ -77,7 +77,7 @@
- + @@ -114,7 +114,7 @@
- + @@ -122,145 +122,150 @@
- +
- +
-
- - - -
- - -
-
+ + + + +
+ + +
+
- - -
+ + +
- -
+ +

- +
-
+
- +
-
- - - -
- - -
-
- - - -
- - -
-
- - - -
- - -
-
- - - -
- - -
-
- - - -
- - -
-
- - - -
- - -
-
- - - -
- - -
-
- - - -
- - -
-
- - - -
- - -
-
+ + + + +
- - - -
- - -
-
- - - -
- - -
-
- - - -
- - -
-
- - - - - -
- - -
-
- - - - -
- - -
-
- + + @@ -334,7 +344,7 @@
- + @@ -344,22 +354,22 @@ -
-

{{ 'general, empty' | translate}}

-
- +
+

{{ 'general, empty' | translate}}

+
+ + +
+ -
- + +
- -
- - + @@ -367,56 +377,58 @@
- + {{Lines.ITEM_CODE}}

- + {{Lines.MFG}} *
- - + + - +
- + {{Lines.LINE_TYPE}}

- + {{Lines.UOM}}
- - + +

- + {{Lines.UNIT_PRICE}}
- +
- + {{Lines.LINE_AMOUNT}}
- - + +
@@ -424,20 +436,20 @@
- + {{Lines.QUANTITY}}

- + {{Lines.LINE_DISC_PERCENTAGE}}
- - + +
@@ -445,41 +457,43 @@
- + {{Lines.NEED_BY_DATE}}
- +
- + {{Lines.PROMISED_DATE}}
- - + +
- +
- + {{Lines.DELIVER_TO_LOCATION}}

- + {{Lines.PR_NUM}}
- - + +
@@ -488,7 +502,7 @@
- + {{Lines.REQUESTOR}} @@ -499,9 +513,9 @@ --> - - + +
@@ -511,8 +525,9 @@
-
- - + +
-
+ - -
- - + + @@ -580,15 +597,14 @@
-
+
{{actionHistory.ACTION}} + [ngClass]="{'bg-blue-txt' : actionHistory.ACTION === 'Submitted' || actionHistory.ACTION === 'Submit' ,'bg-orange-txt' : actionHistory.ACTION === 'Pending' ,'bg-red-txt' : actionHistory.ACTION === 'Rejected','bg-green-txt' : actionHistory.ACTION != 'Pending' && actionHistory.ACTION != 'Rejected' && actionHistory.ACTION != 'Submitted' && actionHistory.ACTION != 'Submit'}" + class=""> {{actionHistory.ACTION}} {{actionHistory.NAME}} @@ -598,10 +614,13 @@
+ +
-
+
+ @@ -609,7 +628,7 @@

{{ 'general, notAttch' | translate}}

- +
@@ -632,12 +651,12 @@ {{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} - +
- +
@@ -647,7 +666,7 @@
- +
@@ -663,7 +682,7 @@ - + {{'actionHis, action' | translate}} 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 430383fe..fd803635 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 @@ -80,7 +80,7 @@ export class WorklistMainPoComponent implements OnInit { PRLines:any;//change the tpye later IsReachEnd: boolean = false; P_PAGE_NUM: number = 1; - P_PAGE_LIMIT: number = 50; + P_PAGE_LIMIT: number = 100; headerTotal: any; totalH: any; valueH: any; @@ -722,6 +722,7 @@ export class WorklistMainPoComponent implements OnInit { } doInfinite(infiniteScroll) { + console.log("doInfinite action history"); if (!this.IsReachEnd) { this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; this.worklistService.getActionHistory(this.WorkListActionHistoryObj). @@ -772,7 +773,7 @@ export class WorklistMainPoComponent implements OnInit { this.IsReachEnd = false; const request = new POItemHistoryRequest(); request.P_ITEM_ID=parseInt(itemID); - request.P_PAGE_LIMIT=50; + request.P_PAGE_LIMIT=100; request.P_PAGE_NUM=1; this.worklistMainService.getPOItemHistory(request). subscribe((result: POItemHistoryRes) => { @@ -785,28 +786,24 @@ export class WorklistMainPoComponent implements OnInit { WorklistMainPoComponent.PASS_PO_INFO ); //open page - this.common.openItemHistoryPage(); - //this.handleItemHistoryResult(result); + // this.common.openItemHistoryPage(); + this.handleItemHistoryResult(result); }); } handleItemHistoryResult(result) { if (this.common.validResponse(result)) { - if (this.common.hasData(result.GetItemHistoryList)) { - this.itemHistoryRes = result.GetItemHistoryList; - this.P_PAGE_NUM++; - let lastItemIndex = this.itemHistoryRes.length - 1; - if (result.GetItemHistoryList[lastItemIndex]) { - let lastitem = result.GetItemHistoryList[lastItemIndex]; - if (lastitem.NO_OF_ROWS == lastitem.ROW_NUM) { - this.IsReachEnd = true; - } else { - this.IsReachEnd = false; - } - } + if (this.common.hasData(result.GetPoItemHistoryList)) { + this.common.openItemHistoryPage(); + } } + else{ + this.common.presentAlert( + this.ts.trPK("general", "empty") + ); } + } getQutationAnalysis(headerID,itemID) { @@ -815,7 +812,7 @@ export class WorklistMainPoComponent implements OnInit { const request = new QuotationAnalysisRequest(); request.P_ITEM_ID=parseInt(itemID); request.P_PO_HEADER_ID=headerID; - request.P_PAGE_LIMIT=50; + request.P_PAGE_LIMIT=100; request.P_PAGE_NUM=1; this.worklistMainService.getQutationAnalysis(request). subscribe((result: QuotationAnalysisResponse) => { @@ -858,12 +855,86 @@ export class WorklistMainPoComponent implements OnInit { // } }//hasData else{ - alert("No DATA") - } + this.common.presentAlert( + this.ts.trPK("general", "empty") + ); } } } -//infinite scrolling + loadMoreNotificationBody() { + console.log("loadMoreNotificationBody PO"); + if (!this.IsReachEnd) { + console.log("this.IsReachEnd"+ this.IsReachEnd); + + this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.worklistMainService.getPONotificationBody(this.WorkListBodyObj). + subscribe((result: any) => { + if (this.common.validResponse(result)) { + if (result.GetPoNotificationBodyList != undefined) { + this.P_PAGE_NUM++; + (result.GetPoNotificationBodyList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.notificationBodyRes.push(element); + }, (Error) => console.log(Error), () => + //infiniteScroll.target.complete() + console.log("test") + ); + }// if list length >0 + else { + this.IsReachEnd = true; + } + }// if response == 1 + //this.pageNum++; + // infiniteScroll.target.complete(); + + }); + } else { + // if (infiniteScroll) + // infiniteScroll.target.complete(); + } + }//end infiniteScroll + + loadMoreActionHistory() { + console.log("doInfinite action history MR"); + + if (!this.IsReachEnd) { + this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.worklistService.getActionHistory(this.WorkListActionHistoryObj). + subscribe((result: any) => { + if (this.common.validResponse(result)) { + if (result.GetActionHistoryList != undefined) { + this.P_PAGE_NUM++; + (result.GetActionHistoryList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.actionHistoryRes.push(element); + }, (Error) => console.log(Error), () => + //infiniteScroll.target.complete() + console.log("TEST")); + }// if list length >0 + else { + this.IsReachEnd = true; + } + }// if response == 1 + //this.pageNum++; + // infiniteScroll.target.complete(); + + }); + } else { + //if (infiniteScroll) + //infiniteScroll.target.complete(); + } + }//end infiniteScroll + + + } 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 ebf8c840..d3b32a89 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 @@ -6,7 +6,7 @@
- + @@ -168,6 +168,7 @@ + @@ -324,15 +325,14 @@ -
+
{{actionHistory.ACTION}} + [ngClass]="{'bg-blue-txt' : actionHistory.ACTION === 'Submitted' || actionHistory.ACTION === 'Submit' ,'bg-orange-txt' : actionHistory.ACTION === 'Pending' ,'bg-red-txt' : actionHistory.ACTION === 'Rejected','bg-green-txt' : actionHistory.ACTION != 'Pending' && actionHistory.ACTION != 'Rejected' && actionHistory.ACTION != 'Submitted' && actionHistory.ACTION != 'Submit'}" + class=""> {{actionHistory.ACTION}} {{actionHistory.NAME}} @@ -342,6 +342,9 @@ + + + diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss index a1d96baf..db039aed 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss @@ -1,306 +1,8 @@ -// .colorBG{ -// --background: #f0efef; -// } -// .footerSearchBtn{ -// padding: 0px !important; -// background: #f0efef !important; -// } - -// .actionList{ -// // position: fixed; -// // bottom: 0px; -// width: 215px; -// border-top-left-radius: 7px; -// border-top-right-radius: 7px -// } -// .cardContent{ -// width:100%; -// margin-top: 33px -// } -// .colItemReq{ -// color: var(--dark); -// font-weight: bold; -// font-size: 15px; -// text-align: left; - -// } - -// .colItemReqHeader{ -// text-align: left; -// color: var(--primary); -// font-weight: bold; -// } -// .labelTotal{ -// color: var(--danger); -// font-weight: bold; -// font-size: 17px; - - -// } -// .labelAction{ -// color:var(--customnavy) !important; -// font-weight:bold; -// } - -// .segmentPR{ - -// // --background-hover: rgba(var(--ion-color-contrast-rgb),0.04); -// // --background-activated: var(--danger); -// // --color: rgba(--primary); -// --color-checked: var(--dark); -// --indicator-color-checked: var(--secondary); -// --background: #f0efef; -// --background-activated: #f0efef; -// --background-hover:#f0efef; -// --background-activated:#f0efef; -// --background-checked:#f0efef; - - - -// } - -// .ion-modal#ion-overlay-1 { -// width: 90%; -// height: 50%; -// top: 20%; -// left: 5%; -// right: 5%; -// bottom: 5%; -// border: solid 1px red; - -// } - -// // .swiper-pagination.swiper-pagination-bullets{ -// // top: 6px; -// // bottom: inherit; -// // } - - - -// // .swiper-pagination.swiper-pagination-bullets { -// // top: 6px !important; -// // bottom: 0px !important; -// // } - -// // .swiper-pagination { -// // top: 6px; -// // } - - -// .bar-stable { -// background-color: var(--cusgray) !important; -// } -// .tabs{ -// background-color: var(--cusgray) !important; -// } -// .icon-size-lg { -// font-size: 40px; -// } - -// /*Timeline*/ - -// .pos-absolute-right { -// position: absolute; -// right: 8px; -// } - -// .timeline { -// position: relative; -// margin: 15px 0 0 0; -// } - -// .timeline:before { - -// content: ''; -// position: absolute; -// top: 0; -// bottom: 0; -// width: 4px; -// background: #e4e4e4; -// z-index: 1; -// left: 66px; -// /* margin-left: -10px; */ -// /* z-index: 1; */ -// } - -// .timeline .timeline-thumb { - -// border-radius: 500px; -// width: 40px !important; -// z-index: 2; -// position: absolute; -// left: 48px; -// // :root[dir="ltr"]{ -// // left: 37px; -// // } -// // :root[dir="rtl"]{ -// // right: 37px; -// // } -// float: right; -// top: 9px; -// } - -// .timeline .timeline-thumb.timeline-icon { -// height: 40px; -// // text-align: center; -// // color: white; -// // border: 5px solid #CBD0D3; -// // transform: scale(0.2); -// } - - - -// .timeline .timeline-item { -// width: 50px; - -// } - -// .timeline .timeline-stats { -// position: relative; -// font-size: 12px; -// color: var(--darkgray); - -// } - - -// .divider-title { -// background: #e4e4e4; -// padding: 5px 15px; -// } - - -// .color-red { -// color: var(--danger) !important; -// } - -// .bg-color-dot { - -// background: var(--gray); - -// /* background: linear-gradient(45deg, var(--primary) 0%, #19a163 36%, var(--secondary) 59%, var(--customnavy) 100%); */ -// // border: var(--secondary) solid 1px; -// // background-color: #ff3b30 !important; -// // background: var(--primary); -// //background: -moz-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); -// //background: -webkit-linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); -// //background: linear-gradient(45deg, var(--primary) 0%, var(--secondary) 36%,var(--secondary) 59%, var(--customnavy) 100%); - - -// } - -// .bg-blue-dot { - -// border: var(--blue) solid 1px; -// background: var(--gray); - -// } -// .bg-orange-dot { - -// border: var(--orange) solid 1px; -// background: var(--gray); -// } -// .bg-red-dot { - -// border: var(--red) solid 1px; -// background: var(--gray); - -// } -// .bg-green-dot { - -// border: var(--green) solid 1px; -// background: var(--gray); -// } - - -// .bg-blue-txt { - -// color: var(--blue) !important; -// font-weight:bold; - -// } -// .bg-orange-txt { -// font-weight:bold; - -// color: var(--orange) !important; -// } -// .bg-red-txt { -// font-weight:bold; - -// color: var(--red) !important; - - -// } -// .bg-green-txt { -// font-weight:bold; - -// color: var(--green) !important; -// } - - - - - -// .notification-list{ -// ion-item{ -// // margin-top: 5px; -// // margin-bottom: 5px; - -// background-color: transparent; -// .item-date{ -// width: 55px; -// font-size: 14px; -// font-weight: bold; - -// text-align: center; -// padding: 0; -// margin: 0; - -// position: absolute; -// left: 0; -// top: 0; -// } -// ion-label , [item-end]{ - -// white-space: normal; -// font-size: 14px; -// // :root[dir="ltr"]{ -// // margin-left: 10px; -// // } -// // :root[dir="rtl"]{ -// // margin-right: 10px; -// // } - -// } - -// } -// } -// .input-wrapper { -// --flex:none; -// } -// ion-input ,ion-datetime{ -// border-bottom: #dedede 1px solid; -// } -// .left { -// .timeline:before{ -// left: 66px; -// } -// .notification-list ion-item{ -// padding-left: 3px; -// } -// .timeline-thumb{ -// left: 37px; -// } -// } -// .right { -// .timeline:before{ -// right: 62px; -// } -// .notification-list ion-item{ -// padding-right: 3px; -// } -// .timeline-thumb{ -// right: 37px; -// } -// } - - +.itemHISBtn{ + padding: 5px; + color: var(--light); + background: var(--darkgray); + border-radius: 3px; + width: 85%; + height: 40px; +} \ No newline at end of file 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 884f5521..34ad0028 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 @@ -40,7 +40,7 @@ export class WorklistMainPRComponent implements OnInit { private WorkListActionObj: WorkListActionRequest; private WorkListActionHistoryObj: WorkListActionHistoryRequest; private WorkListAttachObj: WorkListButtonRequest; - private PRList:PRNotificatonBodyList + private PRList: PRNotificatonBodyList public static PASS_NOTIFICATION_INFO = "passNotificationInfo"; public static PASS_ACTION_MODE = "passActionMode"; getPassNotificationDetails: any; @@ -64,16 +64,16 @@ export class WorklistMainPRComponent implements OnInit { selEmployeeID: any; actionType: string = ""; notificationArray: any; - notificationDynamicAttributeArr:any; + notificationDynamicAttributeArr: any; private textInput: TextInput; private textArea: TextAreaInput; notificationCount: any; - attachmentRes:any; - PRHeader:any;//change the tpye later - PRLines:any;//change the tpye later + attachmentRes: any; + PRHeader: any;//change the tpye later + PRLines: any;//change the tpye later IsReachEnd: boolean = false; P_PAGE_NUM: number = 1; - P_PAGE_LIMIT: number = 50; + P_PAGE_LIMIT: number = 100; headerTotal: any; totalH: any; valueH: any; @@ -97,12 +97,12 @@ export class WorklistMainPRComponent implements OnInit { public worklistService: WorklistService ) { - //this.getPassNotificationDetails = this.common.sharedService.getSharedData('passNotificationInfo'); + //this.getPassNotificationDetails = this.common.sharedService.getSharedData('passNotificationInfo'); this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; - // this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; - } + // this.WorkListActionHistoryObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; + } ngOnInit() { this.WorkListAttachObj = new WorkListButtonRequest(); @@ -111,41 +111,41 @@ export class WorklistMainPRComponent implements OnInit { let segment = document.querySelector('ion-segment'); let slides = document.querySelector('ion-slides'); - + segment.addEventListener('ionChange', (ev) => onSegmentChange(ev)); slides.addEventListener('ionSlideDidChange', (ev) => onSlideDidChange(ev)); - + // On Segment change slide to the matching slide function onSegmentChange(ev) { - console.log("ev.detail.value"+ev.detail.value); + console.log("ev.detail.value" + ev.detail.value); slideTo(ev.detail.value); } - + function slideTo(index) { - console.log("index: "+index); + console.log("index: " + index); slides.slideTo(index); } - + // On Slide change update segment to the matching value async function onSlideDidChange(ev) { var index = await slides.getActiveIndex(); - console.log("index: "+index); + console.log("index: " + index); clickSegment(index); } - + function clickSegment(index) { segment.value = index; } - + } - + intializeNotificationDetail() { - document.getElementById("notificationDynamicFields").innerHTML=""; + document.getElementById("notificationDynamicFields").innerHTML = ""; console.log("intializeNotificationDetail"); this.getPassNotificationDetails = this.common.sharedService.getSharedData( HomeComponent.NOTIFICATION_DATA, @@ -189,38 +189,38 @@ export class WorklistMainPRComponent implements OnInit { this.getEITNotificationDetails(this.WorkListBodyObj); } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { this.getAbsenceNotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PO"){ - this.getPONotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "MO"){ + } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PO") { + this.getPONotificationDetails(this.WorkListBodyObj); + } else if (this.getPassNotificationDetails.REQUEST_TYPE == "MO") { this.getMONotificationDetails(this.WorkListBodyObj); - } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PR"){ - this.getPRNotificationDetails(this.WorkListBodyObj); + } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PR") { + this.getPRNotificationDetails(this.WorkListBodyObj); } } - getPRNotificationDetails(notificationBodyObj){ + getPRNotificationDetails(notificationBodyObj) { this.worklistMainService - .getPRNotificationBody(notificationBodyObj) - .subscribe((result: PRNotificatonBodyResponse) => { - this.handleWorkListBodyResult(result, "PR"); - }); + .getPRNotificationBody(notificationBodyObj) + .subscribe((result: PRNotificatonBodyResponse) => { + this.handleWorkListBodyResult(result, "PR"); + }); } - - getMONotificationDetails(notificationBodyObj){ - this.worklistMainService + + getMONotificationDetails(notificationBodyObj) { + this.worklistMainService .getMONotificationBody(notificationBodyObj) .subscribe((result: MONotificatonBodyResponse) => { //this.handleWorkListBodyResult(result, "MO"); }); - } - - getPONotificationDetails(notificationBodyObj){ + } + + getPONotificationDetails(notificationBodyObj) { this.worklistMainService - .getPONotificationBody(notificationBodyObj) - .subscribe((result: PONotificatonBodyResponse) => { - console.log(result.GetPoNotificationBodyList.POHeader[0].BUYER); - this.handleWorkListBodyResult(result, "PO"); - }); + .getPONotificationBody(notificationBodyObj) + .subscribe((result: PONotificatonBodyResponse) => { + console.log(result.GetPoNotificationBodyList.POHeader[0].BUYER); + this.handleWorkListBodyResult(result, "PO"); + }); } getEITNotificationDetails(notificationBodyObj) { @@ -255,27 +255,27 @@ export class WorklistMainPRComponent implements OnInit { this.notificationBodyRes = result.GetAbsenceCollectionNotificationBodyList; } - }else if (Type == "PR") { + } else if (Type == "PR") { if (result.GetPrNotificationBodyList) { console.log("PR"); - this.PRHeader=result.GetPrNotificationBodyList.PRHeader; - this.PRLines=result.GetPrNotificationBodyList.PRLines; - for( var i = 0; i < this.PRHeader.length; i++){ - if(this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Requisition Total'){ - this.totalH=this.PRHeader[i].HDR_ATTRIBUTE_NAME; - this.valueH=this.PRHeader[i].HDR_ATTRIBUTE_VALUE; + this.PRHeader = result.GetPrNotificationBodyList.PRHeader; + this.PRLines = result.GetPrNotificationBodyList.PRLines; + for (var i = 0; i < this.PRHeader.length; i++) { + if (this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Requisition Total') { + this.totalH = this.PRHeader[i].HDR_ATTRIBUTE_NAME; + this.valueH = this.PRHeader[i].HDR_ATTRIBUTE_VALUE; - //this. header.HDR_ATTRIBUTE_NAME != 'Non-Recoverable Tax'" - } - if(this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Non-Recoverable Tax'){ - this.taxH=this.PRHeader[i].HDR_ATTRIBUTE_NAME; - this.taxvalueH=this.PRHeader[i].HDR_ATTRIBUTE_VALUE; + //this. header.HDR_ATTRIBUTE_NAME != 'Non-Recoverable Tax'" + } + if (this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Non-Recoverable Tax') { + this.taxH = this.PRHeader[i].HDR_ATTRIBUTE_NAME; + this.taxvalueH = this.PRHeader[i].HDR_ATTRIBUTE_VALUE; + + } + // HDR_ATTRIBUTE_VALUE } - - // HDR_ATTRIBUTE_VALUE - } this.notificationBodyRes = result.GetPrNotificationBodyList; } @@ -284,7 +284,7 @@ export class WorklistMainPRComponent implements OnInit { } //End handleWorkListBodyResult - + getNotificationButtons(notificationButtonsObj) { this.worklistMainService .getNotificationButtons(notificationButtonsObj) @@ -352,7 +352,7 @@ export class WorklistMainPRComponent implements OnInit { let ButtonAction: string = this.actionType; var responseAttrDic = this.notExampleJsonObject; this.P_RESPOND_ATTRIBUTES_TBL = []; - for (let i=0;i { this.applyAction(this.WorkListActionObj); - }, this.ts.trPK('general', 'ok'), - () => {}, this.ts.trPK('general', 'cancel'), + }, this.ts.trPK('general', 'ok'), + () => { }, this.ts.trPK('general', 'cancel'), this.ts.trPK('vacation-rule', 'confirmation'), - this.confirmMsg); + this.confirmMsg); + + - - // alert.onDidDismiss((data) => { // if (data == true) { // this.continueDelete(attach); // } // }); - + //this.openApplyModal(this.WorkListActionObj); - - + + ////////////this.applyAction(this.WorkListActionObj); } @@ -590,29 +590,29 @@ export class WorklistMainPRComponent implements OnInit { this.hideForwordEmployee = result.NotificationRespondRolesList[0]; } this.notificationDynamicFields(result.NotificationGetRespondAttributesList); - this.NotificationGetRespondAttributesList=result.NotificationGetRespondAttributesList; + this.NotificationGetRespondAttributesList = result.NotificationGetRespondAttributesList; this.common.sharedService.setSharedData( this.NotificationGetRespondAttributesList, WorklistMainPRComponent.PASS_RES_ATTR ); - this.notificationDynamicAttributeArr=result.NotificationGetRespondAttributesList; + this.notificationDynamicAttributeArr = result.NotificationGetRespondAttributesList; if (result.P_Schema) this.schemaNotific = JSON.parse(result.P_Schema); } // valid it } // End handleWorkListButtonsResult - notificationDynamicFields(notificationAttr){ + notificationDynamicFields(notificationAttr) { const containerId = 'notificationDynamicFields'; - for(let i=0;i { @@ -706,17 +706,17 @@ export class WorklistMainPRComponent implements OnInit { } } - async openNoteDetail(note,sender) { + async openNoteDetail(note, sender) { // let modalPage = this.modalCtrl.create('ViewNoteModalPage', { textNote: note }); // modalPage.present(); - console.log("note"+note); + console.log("note" + note); this.common.sharedService.setSharedData(note, 'ViewNoteModalPage') - this.common.sharedService.setSharedData(sender,'ViewNoteModalPageSender') + this.common.sharedService.setSharedData(sender, 'ViewNoteModalPageSender') const modal = await this.modalCtrl.create({ component: ViewNoteModalComponent, - backdropDismiss:false, + backdropDismiss: false, }); modal.cssClass = 'note-modal'; @@ -755,7 +755,7 @@ export class WorklistMainPRComponent implements OnInit { } }//end infiniteScroll -//**********Attachment *****************// + //**********Attachment *****************// async OpenAttachFiles(value, Type) { @@ -776,7 +776,7 @@ export class WorklistMainPRComponent implements OnInit { // let modalPage = this.modalCtrl.create('ViewNoteModalPage', { textNote: note }); // modalPage.present(); // console.log("note"+note); - this.common.sharedService.setSharedData( this.getPassNotificationDetails,WorklistMainPRComponent.PASS_NOTIFICATION_INFO); + this.common.sharedService.setSharedData(this.getPassNotificationDetails, WorklistMainPRComponent.PASS_NOTIFICATION_INFO); this.common.sharedService.setSharedData(WorkListActionObj, 'ApplyActionModalPage') // this.common.sharedService.setSharedData( // this.WorkListActionObj, @@ -785,26 +785,99 @@ export class WorklistMainPRComponent implements OnInit { const modal = await this.modalCtrl.create({ component: ApplyActionModalComponent, - backdropDismiss:false, + backdropDismiss: false, }); modal.cssClass = 'note-modal'; - + modal.onDidDismiss() .then((data) => { console.log(data); // Here's your selected user! - }); + }); - // data => { - // console.log('MODAL DATA', data); - // }); + // data => { + // console.log('MODAL DATA', data); + // }); // const { data } = await this.modalCtrl.onWillDismiss(); // console.log(data); return await modal.present(); - + } + + loadMoreNotificationBody() { + console.log("loadMoreNotificationBody PR"); + if (!this.IsReachEnd) { + console.log("this.IsReachEnd" + this.IsReachEnd); + + this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.worklistMainService.getPRNotificationBody(this.WorkListBodyObj). + subscribe((result: any) => { + if (this.common.validResponse(result)) { + if (result.GetPrNotificationBodyList != undefined) { + this.P_PAGE_NUM++; + (result.GetPrNotificationBodyList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.notificationBodyRes.push(element); + }, (Error) => console.log(Error), () => + //infiniteScroll.target.complete() + console.log("test") + ); + }// if list length >0 + else { + this.IsReachEnd = true; + } + }// if response == 1 + //this.pageNum++; + // infiniteScroll.target.complete(); + + }); + } else { + // if (infiniteScroll) + // infiniteScroll.target.complete(); + } + }//end infiniteScroll + loadMoreActionHistory() { + console.log("doInfinite action history MR"); + + if (!this.IsReachEnd) { + this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; + this.worklistService.getActionHistory(this.WorkListActionHistoryObj). + subscribe((result: any) => { + if (this.common.validResponse(result)) { + if (result.GetActionHistoryList != undefined) { + this.P_PAGE_NUM++; + (result.GetActionHistoryList).forEach(element => { + if (element.ROW_NUM == element.NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.actionHistoryRes.push(element); + }, (Error) => console.log(Error), () => + //infiniteScroll.target.complete() + console.log("TEST")); + }// if list length >0 + else { + this.IsReachEnd = true; + } + }// if response == 1 + //this.pageNum++; + // infiniteScroll.target.complete(); + + }); + } else { + //if (infiniteScroll) + //infiniteScroll.target.complete(); + } + }//end infiniteScroll + + } - - + + 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 dc33107e..983ffb57 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -87,7 +87,7 @@ export class WorklistMainComponent implements OnInit { this.WorkListBodyObj.P_TRANSACTION_ID = this.TransactionID; this.WorkListBodyObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; this.WorkListBodyObj.P_PAGE_NUM = 1; - this.WorkListBodyObj.P_PAGE_LIMIT = 50; + this.WorkListBodyObj.P_PAGE_LIMIT = 100; this.WorkListButtonsObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; diff --git a/Mohem/src/app/payslip/home/home.component.html b/Mohem/src/app/payslip/home/home.component.html index b6e25a7a..c06b7c72 100644 --- a/Mohem/src/app/payslip/home/home.component.html +++ b/Mohem/src/app/payslip/home/home.component.html @@ -26,7 +26,7 @@ PERIOD END DATE{{showPaySlip.PERIOD_END_DATE}} --> - +
@@ -242,7 +242,10 @@ - + + @@ -288,6 +291,10 @@ + + @@ -365,7 +372,7 @@ - +