fix page P_PAGE_LIMIT

MOHEMM-Q3-DEV-LATEST
ashwaq 6 years ago
parent 53746fc95f
commit 10458f2e0f

@ -20,7 +20,7 @@ export class ItemHistoryComponent implements OnInit {
itemHistoryRes: any; itemHistoryRes: any;
IsReachEnd: boolean = false; IsReachEnd: boolean = false;
P_PAGE_NUM: number = 1; P_PAGE_NUM: number = 1;
P_PAGE_LIMIT: number = 50; P_PAGE_LIMIT: number = 100;
POItemHistoryReq:any; POItemHistoryReq:any;
getPassItemHistoreyList: any; getPassItemHistoreyList: any;
constructor( constructor(

@ -19,7 +19,7 @@ import { QuotationAnalysisResponse } from '../models/quotationAnalysisRes';
export class QutationAnalysisComponent implements OnInit { export class QutationAnalysisComponent implements OnInit {
IsReachEnd: boolean = false; IsReachEnd: boolean = false;
P_PAGE_NUM: number = 1; P_PAGE_NUM: number = 1;
P_PAGE_LIMIT: number = 50; P_PAGE_LIMIT: number = 100;
POQuotationHISReq: QuotationAnalysisRequest; POQuotationHISReq: QuotationAnalysisRequest;
getPassPOItemID: any; getPassPOItemID: any;
getPassPOHeaderID: any; getPassPOHeaderID: any;
@ -59,7 +59,7 @@ console.log("getPassPOItemID: "+this.getPassPOHeaderID);
const request = new QuotationAnalysisRequest(); const request = new QuotationAnalysisRequest();
request.P_ITEM_ID=parseInt(itemID); request.P_ITEM_ID=parseInt(itemID);
request.P_PO_HEADER_ID=headerID; request.P_PO_HEADER_ID=headerID;
request.P_PAGE_LIMIT=50; request.P_PAGE_LIMIT=100;
request.P_PAGE_NUM=1; request.P_PAGE_NUM=1;
this.worklistMainService.getQutationAnalysis(request). this.worklistMainService.getQutationAnalysis(request).
subscribe((result: QuotationAnalysisResponse) => { subscribe((result: QuotationAnalysisResponse) => {

@ -19,7 +19,7 @@ export class WorkListActionHistoryComponent implements OnInit {
actionHistoryRes: any; actionHistoryRes: any;
IsReachEnd: boolean = false; IsReachEnd: boolean = false;
P_PAGE_NUM: number = 1; 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) { constructor(private cs: CommonService, private ts: TranslatorService, private modalCtrl: ModalController, public worklistService: WorklistService) {
this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo'); this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo');

@ -28,7 +28,7 @@ export class WorkListRfcComponent implements OnInit {
userNote: any; userNote: any;
getpassResAttr: any = []; getpassResAttr: any = [];
P_PAGE_NUM: number = 1; 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) { constructor(public worklistService: WorklistService, private cs: CommonService, private ts: TranslatorService, public workListMainService: WorklistMainService) {
this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo'); this.getPassNotificationDetails = this.cs.sharedService.getSharedData('passNotificationInfo');

@ -74,7 +74,7 @@ export class WorklistMainMRComponent implements OnInit {
PRLines:any;//change the tpye later PRLines:any;//change the tpye later
IsReachEnd: boolean = false; IsReachEnd: boolean = false;
P_PAGE_NUM: number = 1; P_PAGE_NUM: number = 1;
P_PAGE_LIMIT: number = 50; P_PAGE_LIMIT: number = 100;
headerTotal: any; headerTotal: any;
totalH: any; totalH: any;
valueH: any; valueH: any;

@ -80,7 +80,7 @@ export class WorklistMainPoComponent implements OnInit {
PRLines:any;//change the tpye later PRLines:any;//change the tpye later
IsReachEnd: boolean = false; IsReachEnd: boolean = false;
P_PAGE_NUM: number = 1; P_PAGE_NUM: number = 1;
P_PAGE_LIMIT: number = 50; P_PAGE_LIMIT: number = 100;
headerTotal: any; headerTotal: any;
totalH: any; totalH: any;
valueH: any; valueH: any;
@ -773,7 +773,7 @@ export class WorklistMainPoComponent implements OnInit {
this.IsReachEnd = false; this.IsReachEnd = false;
const request = new POItemHistoryRequest(); const request = new POItemHistoryRequest();
request.P_ITEM_ID=parseInt(itemID); request.P_ITEM_ID=parseInt(itemID);
request.P_PAGE_LIMIT=50; request.P_PAGE_LIMIT=100;
request.P_PAGE_NUM=1; request.P_PAGE_NUM=1;
this.worklistMainService.getPOItemHistory(request). this.worklistMainService.getPOItemHistory(request).
subscribe((result: POItemHistoryRes) => { subscribe((result: POItemHistoryRes) => {
@ -812,7 +812,7 @@ export class WorklistMainPoComponent implements OnInit {
const request = new QuotationAnalysisRequest(); const request = new QuotationAnalysisRequest();
request.P_ITEM_ID=parseInt(itemID); request.P_ITEM_ID=parseInt(itemID);
request.P_PO_HEADER_ID=headerID; request.P_PO_HEADER_ID=headerID;
request.P_PAGE_LIMIT=50; request.P_PAGE_LIMIT=100;
request.P_PAGE_NUM=1; request.P_PAGE_NUM=1;
this.worklistMainService.getQutationAnalysis(request). this.worklistMainService.getQutationAnalysis(request).
subscribe((result: QuotationAnalysisResponse) => { subscribe((result: QuotationAnalysisResponse) => {
@ -898,6 +898,7 @@ export class WorklistMainPoComponent implements OnInit {
// infiniteScroll.target.complete(); // infiniteScroll.target.complete();
} }
}//end infiniteScroll }//end infiniteScroll
loadMoreActionHistory() { loadMoreActionHistory() {
console.log("doInfinite action history MR"); console.log("doInfinite action history MR");

@ -40,7 +40,7 @@ export class WorklistMainPRComponent implements OnInit {
private WorkListActionObj: WorkListActionRequest; private WorkListActionObj: WorkListActionRequest;
private WorkListActionHistoryObj: WorkListActionHistoryRequest; private WorkListActionHistoryObj: WorkListActionHistoryRequest;
private WorkListAttachObj: WorkListButtonRequest; private WorkListAttachObj: WorkListButtonRequest;
private PRList:PRNotificatonBodyList private PRList: PRNotificatonBodyList
public static PASS_NOTIFICATION_INFO = "passNotificationInfo"; public static PASS_NOTIFICATION_INFO = "passNotificationInfo";
public static PASS_ACTION_MODE = "passActionMode"; public static PASS_ACTION_MODE = "passActionMode";
getPassNotificationDetails: any; getPassNotificationDetails: any;
@ -64,16 +64,16 @@ export class WorklistMainPRComponent implements OnInit {
selEmployeeID: any; selEmployeeID: any;
actionType: string = ""; actionType: string = "";
notificationArray: any; notificationArray: any;
notificationDynamicAttributeArr:any; notificationDynamicAttributeArr: any;
private textInput: TextInput; private textInput: TextInput;
private textArea: TextAreaInput; private textArea: TextAreaInput;
notificationCount: any; notificationCount: any;
attachmentRes:any; attachmentRes: any;
PRHeader:any;//change the tpye later PRHeader: any;//change the tpye later
PRLines:any;//change the tpye later PRLines: any;//change the tpye later
IsReachEnd: boolean = false; IsReachEnd: boolean = false;
P_PAGE_NUM: number = 1; P_PAGE_NUM: number = 1;
P_PAGE_LIMIT: number = 50; P_PAGE_LIMIT: number = 100;
headerTotal: any; headerTotal: any;
totalH: any; totalH: any;
valueH: any; valueH: any;
@ -97,12 +97,12 @@ export class WorklistMainPRComponent implements OnInit {
public worklistService: WorklistService public worklistService: WorklistService
) { ) {
//this.getPassNotificationDetails = this.common.sharedService.getSharedData('passNotificationInfo'); //this.getPassNotificationDetails = this.common.sharedService.getSharedData('passNotificationInfo');
this.WorkListActionHistoryObj = new WorkListActionHistoryRequest(); this.WorkListActionHistoryObj = new WorkListActionHistoryRequest();
this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM; this.WorkListActionHistoryObj.P_PAGE_NUM = this.P_PAGE_NUM;
this.WorkListActionHistoryObj.P_PAGE_LIMIT = this.P_PAGE_LIMIT; 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() { ngOnInit() {
this.WorkListAttachObj = new WorkListButtonRequest(); this.WorkListAttachObj = new WorkListButtonRequest();
@ -111,41 +111,41 @@ export class WorklistMainPRComponent implements OnInit {
let segment = document.querySelector('ion-segment'); let segment = document.querySelector('ion-segment');
let slides = document.querySelector('ion-slides'); let slides = document.querySelector('ion-slides');
segment.addEventListener('ionChange', (ev) => onSegmentChange(ev)); segment.addEventListener('ionChange', (ev) => onSegmentChange(ev));
slides.addEventListener('ionSlideDidChange', (ev) => onSlideDidChange(ev)); slides.addEventListener('ionSlideDidChange', (ev) => onSlideDidChange(ev));
// On Segment change slide to the matching slide // On Segment change slide to the matching slide
function onSegmentChange(ev) { function onSegmentChange(ev) {
console.log("ev.detail.value"+ev.detail.value); console.log("ev.detail.value" + ev.detail.value);
slideTo(ev.detail.value); slideTo(ev.detail.value);
} }
function slideTo(index) { function slideTo(index) {
console.log("index: "+index); console.log("index: " + index);
slides.slideTo(index); slides.slideTo(index);
} }
// On Slide change update segment to the matching value // On Slide change update segment to the matching value
async function onSlideDidChange(ev) { async function onSlideDidChange(ev) {
var index = await slides.getActiveIndex(); var index = await slides.getActiveIndex();
console.log("index: "+index); console.log("index: " + index);
clickSegment(index); clickSegment(index);
} }
function clickSegment(index) { function clickSegment(index) {
segment.value = index; segment.value = index;
} }
} }
intializeNotificationDetail() { intializeNotificationDetail() {
document.getElementById("notificationDynamicFields").innerHTML=""; document.getElementById("notificationDynamicFields").innerHTML = "";
console.log("intializeNotificationDetail"); console.log("intializeNotificationDetail");
this.getPassNotificationDetails = this.common.sharedService.getSharedData( this.getPassNotificationDetails = this.common.sharedService.getSharedData(
HomeComponent.NOTIFICATION_DATA, HomeComponent.NOTIFICATION_DATA,
@ -189,38 +189,38 @@ export class WorklistMainPRComponent implements OnInit {
this.getEITNotificationDetails(this.WorkListBodyObj); this.getEITNotificationDetails(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") { } else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") {
this.getAbsenceNotificationDetails(this.WorkListBodyObj); this.getAbsenceNotificationDetails(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE == "PO"){ } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PO") {
this.getPONotificationDetails(this.WorkListBodyObj); this.getPONotificationDetails(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE == "MO"){ } else if (this.getPassNotificationDetails.REQUEST_TYPE == "MO") {
this.getMONotificationDetails(this.WorkListBodyObj); this.getMONotificationDetails(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE == "PR"){ } else if (this.getPassNotificationDetails.REQUEST_TYPE == "PR") {
this.getPRNotificationDetails(this.WorkListBodyObj); this.getPRNotificationDetails(this.WorkListBodyObj);
} }
} }
getPRNotificationDetails(notificationBodyObj){ getPRNotificationDetails(notificationBodyObj) {
this.worklistMainService this.worklistMainService
.getPRNotificationBody(notificationBodyObj) .getPRNotificationBody(notificationBodyObj)
.subscribe((result: PRNotificatonBodyResponse) => { .subscribe((result: PRNotificatonBodyResponse) => {
this.handleWorkListBodyResult(result, "PR"); this.handleWorkListBodyResult(result, "PR");
}); });
} }
getMONotificationDetails(notificationBodyObj){ getMONotificationDetails(notificationBodyObj) {
this.worklistMainService this.worklistMainService
.getMONotificationBody(notificationBodyObj) .getMONotificationBody(notificationBodyObj)
.subscribe((result: MONotificatonBodyResponse) => { .subscribe((result: MONotificatonBodyResponse) => {
//this.handleWorkListBodyResult(result, "MO"); //this.handleWorkListBodyResult(result, "MO");
}); });
} }
getPONotificationDetails(notificationBodyObj){ getPONotificationDetails(notificationBodyObj) {
this.worklistMainService this.worklistMainService
.getPONotificationBody(notificationBodyObj) .getPONotificationBody(notificationBodyObj)
.subscribe((result: PONotificatonBodyResponse) => { .subscribe((result: PONotificatonBodyResponse) => {
console.log(result.GetPoNotificationBodyList.POHeader[0].BUYER); console.log(result.GetPoNotificationBodyList.POHeader[0].BUYER);
this.handleWorkListBodyResult(result, "PO"); this.handleWorkListBodyResult(result, "PO");
}); });
} }
getEITNotificationDetails(notificationBodyObj) { getEITNotificationDetails(notificationBodyObj) {
@ -255,27 +255,27 @@ export class WorklistMainPRComponent implements OnInit {
this.notificationBodyRes = this.notificationBodyRes =
result.GetAbsenceCollectionNotificationBodyList; result.GetAbsenceCollectionNotificationBodyList;
} }
}else if (Type == "PR") { } else if (Type == "PR") {
if (result.GetPrNotificationBodyList) { if (result.GetPrNotificationBodyList) {
console.log("PR"); console.log("PR");
this.PRHeader=result.GetPrNotificationBodyList.PRHeader; this.PRHeader = result.GetPrNotificationBodyList.PRHeader;
this.PRLines=result.GetPrNotificationBodyList.PRLines; this.PRLines = result.GetPrNotificationBodyList.PRLines;
for( var i = 0; i < this.PRHeader.length; i++){ for (var i = 0; i < this.PRHeader.length; i++) {
if(this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Requisition Total'){ if (this.PRHeader[i].HDR_ATTRIBUTE_NAME === 'Requisition Total') {
this.totalH=this.PRHeader[i].HDR_ATTRIBUTE_NAME; this.totalH = this.PRHeader[i].HDR_ATTRIBUTE_NAME;
this.valueH=this.PRHeader[i].HDR_ATTRIBUTE_VALUE; this.valueH = this.PRHeader[i].HDR_ATTRIBUTE_VALUE;
//this. header.HDR_ATTRIBUTE_NAME != 'Non-Recoverable Tax'" //this. header.HDR_ATTRIBUTE_NAME != 'Non-Recoverable Tax'"
} }
if(this.PRHeader[i].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.taxH = this.PRHeader[i].HDR_ATTRIBUTE_NAME;
this.taxvalueH=this.PRHeader[i].HDR_ATTRIBUTE_VALUE; this.taxvalueH = this.PRHeader[i].HDR_ATTRIBUTE_VALUE;
}
// HDR_ATTRIBUTE_VALUE
} }
// HDR_ATTRIBUTE_VALUE
}
this.notificationBodyRes = this.notificationBodyRes =
result.GetPrNotificationBodyList; result.GetPrNotificationBodyList;
} }
@ -284,7 +284,7 @@ export class WorklistMainPRComponent implements OnInit {
} //End handleWorkListBodyResult } //End handleWorkListBodyResult
getNotificationButtons(notificationButtonsObj) { getNotificationButtons(notificationButtonsObj) {
this.worklistMainService this.worklistMainService
.getNotificationButtons(notificationButtonsObj) .getNotificationButtons(notificationButtonsObj)
@ -352,7 +352,7 @@ export class WorklistMainPRComponent implements OnInit {
let ButtonAction: string = this.actionType; let ButtonAction: string = this.actionType;
var responseAttrDic = this.notExampleJsonObject; var responseAttrDic = this.notExampleJsonObject;
this.P_RESPOND_ATTRIBUTES_TBL = []; this.P_RESPOND_ATTRIBUTES_TBL = [];
for (let i=0;i<this.notificationDynamicAttributeArr.length;i++) { for (let i = 0; i < this.notificationDynamicAttributeArr.length; i++) {
let obj: any = {}; let obj: any = {};
obj.ATTRIBUTE_NAME = this.notificationDynamicAttributeArr[i].ATTRIBUTE_NAME; obj.ATTRIBUTE_NAME = this.notificationDynamicAttributeArr[i].ATTRIBUTE_NAME;
if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE === "number") { if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE === "number") {
@ -361,8 +361,8 @@ export class WorklistMainPRComponent implements OnInit {
// else if (isDate(responseAttrDic[key])) { // else if (isDate(responseAttrDic[key])) {
// obj.ATTRIBUTE_DATE_VALUE = responseAttrDic[key]; // obj.ATTRIBUTE_DATE_VALUE = responseAttrDic[key];
// } // }
else if(this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE=="VARCHAR2") { else if (this.notificationDynamicAttributeArr[i].ATTRIBUTE_TYPE == "VARCHAR2") {
obj.ATTRIBUTE_TEXT_VALUE =(document.getElementById(this.notificationDynamicAttributeArr[i].ATTRIBUTE_NAME) as HTMLInputElement).value; obj.ATTRIBUTE_TEXT_VALUE = (document.getElementById(this.notificationDynamicAttributeArr[i].ATTRIBUTE_NAME) as HTMLInputElement).value;
} }
this.P_RESPOND_ATTRIBUTES_TBL.push(obj); this.P_RESPOND_ATTRIBUTES_TBL.push(obj);
} }
@ -390,43 +390,43 @@ export class WorklistMainPRComponent implements OnInit {
// this.WorkListActionObj, // this.WorkListActionObj,
// WorklistMainPRComponent.PASS_NOTIFICATION_INFO // WorklistMainPRComponent.PASS_NOTIFICATION_INFO
// ); // );
if (ButtonAction == "APPROVE"){ if (ButtonAction == "APPROVE") {
this.confirmMsg =this.ts.trPK('worklistMain', 'approveMsg') this.confirmMsg = this.ts.trPK('worklistMain', 'approveMsg')
} }
else if (ButtonAction == "REJECT"){ else if (ButtonAction == "REJECT") {
this.confirmMsg =this.ts.trPK('worklistMain', 'rejectMsg') this.confirmMsg = this.ts.trPK('worklistMain', 'rejectMsg')
} }
else if (ButtonAction == "DEL"){ else if (ButtonAction == "DEL") {
this.confirmMsg =this.ts.trPK('worklistMain', 'delMsg') this.confirmMsg = this.ts.trPK('worklistMain', 'delMsg')
} }
else if (ButtonAction == "CLOSE"){ else if (ButtonAction == "CLOSE") {
this.confirmMsg =this.ts.trPK('worklistMain', 'closeMsg') this.confirmMsg = this.ts.trPK('worklistMain', 'closeMsg')
} }
this.common.confirmAlertDialogAction( this.common.confirmAlertDialogAction(
() => { () => {
this.applyAction(this.WorkListActionObj); this.applyAction(this.WorkListActionObj);
}, this.ts.trPK('general', 'ok'), }, this.ts.trPK('general', 'ok'),
() => {}, this.ts.trPK('general', 'cancel'), () => { }, this.ts.trPK('general', 'cancel'),
this.ts.trPK('vacation-rule', 'confirmation'), this.ts.trPK('vacation-rule', 'confirmation'),
this.confirmMsg); this.confirmMsg);
// alert.onDidDismiss((data) => { // alert.onDidDismiss((data) => {
// if (data == true) { // if (data == true) {
// this.continueDelete(attach); // this.continueDelete(attach);
// } // }
// }); // });
//this.openApplyModal(this.WorkListActionObj); //this.openApplyModal(this.WorkListActionObj);
////////////this.applyAction(this.WorkListActionObj); ////////////this.applyAction(this.WorkListActionObj);
} }
@ -590,29 +590,29 @@ export class WorklistMainPRComponent implements OnInit {
this.hideForwordEmployee = result.NotificationRespondRolesList[0]; this.hideForwordEmployee = result.NotificationRespondRolesList[0];
} }
this.notificationDynamicFields(result.NotificationGetRespondAttributesList); this.notificationDynamicFields(result.NotificationGetRespondAttributesList);
this.NotificationGetRespondAttributesList=result.NotificationGetRespondAttributesList; this.NotificationGetRespondAttributesList = result.NotificationGetRespondAttributesList;
this.common.sharedService.setSharedData( this.common.sharedService.setSharedData(
this.NotificationGetRespondAttributesList, this.NotificationGetRespondAttributesList,
WorklistMainPRComponent.PASS_RES_ATTR WorklistMainPRComponent.PASS_RES_ATTR
); );
this.notificationDynamicAttributeArr=result.NotificationGetRespondAttributesList; this.notificationDynamicAttributeArr = result.NotificationGetRespondAttributesList;
if (result.P_Schema) this.schemaNotific = JSON.parse(result.P_Schema); if (result.P_Schema) this.schemaNotific = JSON.parse(result.P_Schema);
} // valid it } // valid it
} // End handleWorkListButtonsResult } // End handleWorkListButtonsResult
notificationDynamicFields(notificationAttr){ notificationDynamicFields(notificationAttr) {
const containerId = 'notificationDynamicFields'; const containerId = 'notificationDynamicFields';
for(let i=0;i<notificationAttr.length;i++){ for (let i = 0; i < notificationAttr.length; i++) {
if(notificationAttr[i].ATTRIBUTE_TYPE=="VARCHAR2"){ if (notificationAttr[i].ATTRIBUTE_TYPE == "VARCHAR2") {
this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, "", containerId,"","",""); this.textArea = new TextAreaInput(notificationAttr[i].ATTRIBUTE_DISPLAY_NAME, notificationAttr[i].ATTRIBUTE_NAME, "", containerId, "", "", "");
}else if(notificationAttr[i].ATTRIBUTE_TYPE=="ROLE"){ } else if (notificationAttr[i].ATTRIBUTE_TYPE == "ROLE") {
}else if(notificationAttr[i].ATTRIBUTE_TYPE=="DATE"){ } else if (notificationAttr[i].ATTRIBUTE_TYPE == "DATE") {
}else if(notificationAttr[i].ATTRIBUTE_TYPE=="NUMBER"){ } else if (notificationAttr[i].ATTRIBUTE_TYPE == "NUMBER") {
} }
} }
} }
@ -661,8 +661,8 @@ export class WorklistMainPRComponent implements OnInit {
getAttachmentNotification(WorkListAttachObj) { getAttachmentNotification(WorkListAttachObj) {
this.worklistAttachService.getAttach(WorkListAttachObj). this.worklistAttachService.getAttach(WorkListAttachObj).
subscribe((result: NotificationGetAttachResponse) => { subscribe((result: NotificationGetAttachResponse) => {
@ -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 }); // let modalPage = this.modalCtrl.create('ViewNoteModalPage', { textNote: note });
// modalPage.present(); // modalPage.present();
console.log("note"+note); console.log("note" + note);
this.common.sharedService.setSharedData(note, 'ViewNoteModalPage') this.common.sharedService.setSharedData(note, 'ViewNoteModalPage')
this.common.sharedService.setSharedData(sender,'ViewNoteModalPageSender') this.common.sharedService.setSharedData(sender, 'ViewNoteModalPageSender')
const modal = await this.modalCtrl.create({ const modal = await this.modalCtrl.create({
component: ViewNoteModalComponent, component: ViewNoteModalComponent,
backdropDismiss:false, backdropDismiss: false,
}); });
modal.cssClass = 'note-modal'; modal.cssClass = 'note-modal';
@ -755,7 +755,7 @@ export class WorklistMainPRComponent implements OnInit {
} }
}//end infiniteScroll }//end infiniteScroll
//**********Attachment *****************// //**********Attachment *****************//
async OpenAttachFiles(value, Type) { async OpenAttachFiles(value, Type) {
@ -776,7 +776,7 @@ export class WorklistMainPRComponent implements OnInit {
// let modalPage = this.modalCtrl.create('ViewNoteModalPage', { textNote: note }); // let modalPage = this.modalCtrl.create('ViewNoteModalPage', { textNote: note });
// modalPage.present(); // modalPage.present();
// console.log("note"+note); // 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(WorkListActionObj, 'ApplyActionModalPage')
// this.common.sharedService.setSharedData( // this.common.sharedService.setSharedData(
// this.WorkListActionObj, // this.WorkListActionObj,
@ -785,30 +785,30 @@ export class WorklistMainPRComponent implements OnInit {
const modal = await this.modalCtrl.create({ const modal = await this.modalCtrl.create({
component: ApplyActionModalComponent, component: ApplyActionModalComponent,
backdropDismiss:false, backdropDismiss: false,
}); });
modal.cssClass = 'note-modal'; modal.cssClass = 'note-modal';
modal.onDidDismiss() modal.onDidDismiss()
.then((data) => { .then((data) => {
console.log(data); // Here's your selected user! console.log(data); // Here's your selected user!
}); });
// data => { // data => {
// console.log('MODAL DATA', data); // console.log('MODAL DATA', data);
// }); // });
// const { data } = await this.modalCtrl.onWillDismiss(); // const { data } = await this.modalCtrl.onWillDismiss();
// console.log(data); // console.log(data);
return await modal.present(); return await modal.present();
} }
loadMoreNotificationBody() { loadMoreNotificationBody() {
console.log("loadMoreNotificationBody PR"); console.log("loadMoreNotificationBody PR");
if (!this.IsReachEnd) { if (!this.IsReachEnd) {
console.log("this.IsReachEnd"+ this.IsReachEnd); console.log("this.IsReachEnd" + this.IsReachEnd);
this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM; this.WorkListBodyObj.P_PAGE_NUM = this.P_PAGE_NUM;
this.worklistMainService.getPRNotificationBody(this.WorkListBodyObj). this.worklistMainService.getPRNotificationBody(this.WorkListBodyObj).
@ -823,9 +823,9 @@ export class WorklistMainPRComponent implements OnInit {
this.IsReachEnd = false; this.IsReachEnd = false;
} }
this.notificationBodyRes.push(element); this.notificationBodyRes.push(element);
}, (Error) => console.log(Error), () => }, (Error) => console.log(Error), () =>
//infiniteScroll.target.complete() //infiniteScroll.target.complete()
console.log("test") console.log("test")
); );
}// if list length >0 }// if list length >0
else { else {
@ -833,7 +833,7 @@ export class WorklistMainPRComponent implements OnInit {
} }
}// if response == 1 }// if response == 1
//this.pageNum++; //this.pageNum++;
// infiniteScroll.target.complete(); // infiniteScroll.target.complete();
}); });
} else { } else {
@ -858,26 +858,26 @@ export class WorklistMainPRComponent implements OnInit {
this.IsReachEnd = false; this.IsReachEnd = false;
} }
this.actionHistoryRes.push(element); this.actionHistoryRes.push(element);
}, (Error) => console.log(Error), () => }, (Error) => console.log(Error), () =>
//infiniteScroll.target.complete() //infiniteScroll.target.complete()
console.log("TEST")); console.log("TEST"));
}// if list length >0 }// if list length >0
else { else {
this.IsReachEnd = true; this.IsReachEnd = true;
} }
}// if response == 1 }// if response == 1
//this.pageNum++; //this.pageNum++;
// infiniteScroll.target.complete(); // infiniteScroll.target.complete();
}); });
} else { } else {
//if (infiniteScroll) //if (infiniteScroll)
//infiniteScroll.target.complete(); //infiniteScroll.target.complete();
} }
}//end infiniteScroll }//end infiniteScroll
} }

@ -87,7 +87,7 @@ export class WorklistMainComponent implements OnInit {
this.WorkListBodyObj.P_TRANSACTION_ID = this.TransactionID; this.WorkListBodyObj.P_TRANSACTION_ID = this.TransactionID;
this.WorkListBodyObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID; this.WorkListBodyObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID;
this.WorkListBodyObj.P_PAGE_NUM = 1; 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; this.WorkListButtonsObj.P_NOTIFICATION_ID = this.getPassNotificationDetails.NOTIFICATION_ID;

@ -37,7 +37,7 @@ export class HomeComponent implements OnInit {
constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, private router: Router) { constructor(public vacationRuleService: VacationRuleServiceService, public ts: TranslatorService, public cs: CommonService, private router: Router) {
this.P_PAGE_NUM = 1; this.P_PAGE_NUM = 1;
this.P_PAGE_LIMIT = 50; this.P_PAGE_LIMIT = 100;
//this.button = new ButtonInput('btnSubmit', 'Submit', 'containerDiv', 'Y'); //this.button = new ButtonInput('btnSubmit', 'Submit', 'containerDiv', 'Y');
// this.dateTime = new DateTimeInput('Start Date', 'SDate', '', 'containerDiv', 'Y', 'Y', 'Y'); // this.dateTime = new DateTimeInput('Start Date', 'SDate', '', 'containerDiv', 'Y', 'Y', 'Y');

Loading…
Cancel
Save