fix worklist issue

work-list
ashwaq 6 years ago
parent 927bfbace5
commit 929844d1ef

@ -64,9 +64,11 @@
<div [ngClass]="isEmptyObject() ? 'work-list-container' : ''" *ngIf='selectedFilter != "ITG"'>
<div *ngFor="let data of showFormattedData | keyvalue; let i = index">
<span class="date-span">{{data.key}}</span>
<div (click)="openNotificationDetail(data.value)" class="date-data" *ngFor="let workList of data.value; let j = index">
<div class="date-data" *ngFor="let workList of data.value; let j = index">
<div (click)="openNotificationDetail(workList)">
<p>{{workList.SUBJECT}}</p>
</div>
</div>
</div>
</div>

@ -152,7 +152,14 @@ export class HomeComponent implements OnInit {
this.WorkListObj.P_PAGE_LIMIT = 50;
}
ngOnInit() {
ngOnInit(){
}
ionViewDidEnter() {
console.log("ionViewDidEnter");
// this.direction = TranslatorService.getCurrentDirection();
this.worklistNotifications = this.common.sharedService.getSharedData('worklistNotifications', false);
this.Details();
@ -287,6 +294,7 @@ export class HomeComponent implements OnInit {
}
categorizeData(arrayToCategorize: any) {
console.log("categorizeData");
const datePipe = new DatePipe('en-US');
const formattedData = {};
for (const workList of arrayToCategorize) {
@ -340,12 +348,13 @@ export class HomeComponent implements OnInit {
}
openNotificationDetail(obj) {
this.common.sharedService.setSharedData(obj[0], HomeComponent.NOTIFICATION_DATA);
console.log(obj);
this.common.sharedService.setSharedData(obj, HomeComponent.NOTIFICATION_DATA);
if (obj.REQUEST_TYPE === 'PR') {
this.common.openWorklistMainPRPage();
} else if (obj[0].REQUEST_TYPE === 'PO') {
} else if (obj.REQUEST_TYPE === 'PO') {
this.common.openWorklistMainPOPage();
} else if (obj[0].REQUEST_TYPE === 'MO') {
} else if (obj.REQUEST_TYPE === 'MO') {
this.common.openWorklistMainMRPage();
} else {
this.common.openWorklistMainPage();

@ -1,5 +1,5 @@
<ion-header>
<ion-toolbar class="header-toolbar">
<ion-toolbar class="header-toolbar-new">
<nav-buttons></nav-buttons>
<ion-title color="light">
{{ts.trPK('worklistMain','ITEM_HIS')}}
@ -22,10 +22,10 @@
</ion-card-header> -->
<!-- <ion-card-content> -->
<div class="noDataDiv" [hidden]="itemHistoryRes && itemHistoryRes.length > 0">
<div class="noDataDiv" [hidden]="itemHistoryRes && itemHistoryRes.length >= 0">
<p>{{ 'general, empty' | translate}}</p>
</div>
<ion-list class="itemeHistoryist" *ngIf="itemHistoryRes && itemHistoryRes.length > 0 ">
<ion-list class="itemeHistoryist" *ngIf="itemHistoryRes && itemHistoryRes.length >= 0 ">
<div>
<ion-grid class="gridItemReq">

@ -0,0 +1,27 @@
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MoItemHistoryComponent } from './mo-item-history.component';
describe('MoItemHistoryComponent', () => {
let component: MoItemHistoryComponent;
let fixture: ComponentFixture<MoItemHistoryComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ MoItemHistoryComponent ],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(MoItemHistoryComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

@ -0,0 +1,17 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-mo-item-history',
templateUrl: './mo-item-history.component.html',
styleUrls: ['./mo-item-history.component.scss'],
})
export class MoItemHistoryComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}

@ -17,7 +17,7 @@ style="margin-right: -22px;margin-top: -10px;">
</ion-list-header>
<div *ngFor="let button of actionBtns ">
<ion-item *ngIf="button.BUTTON_ACTION !='APPROVED' && button.BUTTON_ACTION !='REJECTED' && button.BUTTON_ACTION !='REQUEST_INFO' " >
<ion-item *ngIf="button.BUTTON_ACTION !='APPROVED' && button.BUTTON_ACTION !='APPROVE' && button.BUTTON_ACTION !='REJECTED' && button.BUTTON_ACTION !='REJECT' && button.BUTTON_ACTION !='REQUEST_INFO' " >
<ion-label class="labelRadio"> {{button.BUTTON_LABEL}}</ion-label>
<ion-radio color="secondary" mode="md" value="{{button.BUTTON_ACTION}}" (ionSelect)="radioSelect(button)"></ion-radio>

@ -1,5 +1,5 @@
<ion-header>
<ion-toolbar class="header-toolbar">
<ion-toolbar class="header-toolbar-new">
<nav-buttons></nav-buttons>
<ion-title color="light">
{{ts.trPK('worklistMain','QUOTATION_ANALYSIS')}}

@ -60,8 +60,8 @@ 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=1;
request.P_PAGE_NUM=50;
request.P_PAGE_LIMIT=100;
request.P_PAGE_NUM=1;
this.doInfiniteReq=request;
this.worklistMainService.getQutationAnalysis(request).
subscribe((result: QuotationAnalysisResponse) => {

@ -1,4 +1,4 @@
<ion-header>
<ion-header *ngIf="!messageSuccess">
<ion-toolbar>
<!-- class="header-toolbar" <nav-buttons></nav-buttons> -->
<ion-title color="dark">{{ 'replacementRoll, title' | translate}}</ion-title>
@ -6,7 +6,7 @@
</ion-header>
<ion-content >
<div *ngIf="!messageSuccess">
<ion-list style="margin-bottom:2px !important" [hidden]="isAnswer==true">
<ion-item lines="none">
<ion-label class="boldTxtNav">{{'replacementRoll, searchBy' | translate}}</ion-label>
@ -109,9 +109,19 @@
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll>
</div>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-col size="12">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<!--filled-->
</ion-col>
<ion-col size="12"> <div style="font-size: 30px !important"> Transaction Successful </div> </ion-col>
</div>
</ion-content>
<ion-footer>
<ion-footer *ngIf="!messageSuccess">
<div class="noteInput">
<ion-label [hidden]="isAnswer==false" class="boldTxtNav" padding>{{"replacementRoll, question" | translate}} :

@ -38,6 +38,7 @@ export class WorkListReplacementRollComponent implements OnInit {
getpassResAttr: any = [];
active: any;
demoeAttach:any=[];
messageSuccess: boolean =false;
constructor(public worklistService: WorklistService, private cs: CommonService, private ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController) {
this.P_PAGE_NUM = 1;
@ -211,7 +212,7 @@ export class WorkListReplacementRollComponent implements OnInit {
this.WorkListActionObj.P_FORWARD_TO_USER_NAME = this.selectedUserInf.USER_NAME;
this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode;
this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr
this.modalCtrl.dismiss();
// this.modalCtrl.dismiss();
this.workListMainService.actionButton(this.WorkListActionObj).
subscribe((result: any) => {
@ -233,7 +234,7 @@ export class WorkListReplacementRollComponent implements OnInit {
this.WorkListActionObj.P_FORWARD_TO_USER_NAME = null;
this.WorkListActionObj.P_ACTION_MODE = this.getPassActionMode;
this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr
this.modalCtrl.dismiss();
// this.modalCtrl.dismiss();
this.workListMainService.actionButton(this.WorkListActionObj).
subscribe((result: any) => {
@ -259,10 +260,23 @@ export class WorkListReplacementRollComponent implements OnInit {
// this.cs.showAlert(msg);
// this.navCtrl.push("HomePage");
// here show succsfull msg
this.cs.openNotificationPage();
}
this.messageSuccess = true;
setTimeout(() => {
this.messageSuccess = false;
//this.modalCtrl.dismiss(succ);
this.modalCtrl.dismiss({
'dismissed': true,
data: "Success"
});
}, 5000);
}
} // not valid it
} // valid it
}
// cancel() {

@ -1,12 +1,12 @@
<ion-header>
<ion-header *ngIf="!messageSuccess">
<ion-toolbar >
<ion-title color="dark">{{ 'workListMain, rfc' | translate}}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content padding>
<ion-content >
<div *ngIf="!messageSuccess">
<div class="tipsPadding boldTxtNav">
{{'replacementRoll , msgRFC' | translate}}
</div>
@ -49,11 +49,19 @@
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content>
</ion-infinite-scroll>
</div>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-col size="12">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<!--filled-->
</ion-col>
<ion-col size="12"> <div style="font-size: 30px !important"> Transaction Successful </div> </ion-col>
</div>
</ion-content>
<ion-footer>
<ion-footer *ngIf="!messageSuccess">
<div class="noteInput">
<label class="boldTxtNav" padding>{{'replacementRoll , enterNote' | translate}}</label>

@ -127,7 +127,24 @@
}
.succssfullMSG{
height: 100%;
width: 100%;
background: var(--newgreen);
color: white;
font-weight: bold;
font-size: 20px;
text-align: center;
vertical-align: middle;
padding-top: 30px;
}
.succssfullIcon{
width: 60%;
text-align: center;
height: 60%;
}

@ -17,6 +17,7 @@ export class WorkListRfcComponent implements OnInit {
private WorkListActionHistoryObj: WorkListActionHistoryRequest;
private WorkListActionObj: WorkListActionRequest;
messageSuccess: boolean = false;
getPassNotificationDetails: any;
RFCEmployeeListListRes: any;
@ -100,7 +101,6 @@ export class WorkListRfcComponent implements OnInit {
this.WorkListActionObj.P_ACTION_MODE = "RFC";
this.WorkListActionObj.P_COMMENTS = this.userNote;// response Attr
this.WorkListActionObj.P_APPROVER_INDEX = this.seqNo;
this.modalCtrl.dismiss();
this.workListMainService.actionButton(this.WorkListActionObj).
subscribe((result: any) => {
@ -129,8 +129,19 @@ export class WorkListRfcComponent implements OnInit {
// this.navCtrl.push("HomePage");
// this.cs.openHome();
// here show succsfull msg
this.messageSuccess = true;
setTimeout(() => {
this.messageSuccess = false;
//this.cs.openNotificationPage();
// this.modalCtrl.dismiss();
this.modalCtrl.dismiss({
'dismissed': true,
data: "Success"
});
}, 5000);
this.cs.openNotificationPage();
}
} // valid it
}

@ -9,7 +9,7 @@
</ion-header>
<ion-content *ngIf="!messageSuccess" class="colorBG">
<div *ngIf="!messageSuccess" >
<div class="subjectNotification">{{getPassNotificationDetails.SUBJECT}}</div>
@ -519,7 +519,7 @@
<ion-grid>
<ion-item class="itemAttch" *ngFor="let attachList of attachmentRes">
<div *ngIf="attachList.FILE_CONTENT_TYPE === 'pdf' || attachList.FILE_CONTENT_TYPE === 'PDF'">
<!-- <div *ngIf="attachList.FILE_CONTENT_TYPE === 'pdf' || attachList.FILE_CONTENT_TYPE === 'PDF'">
<img float-start class="attachImg" src="../assets/imgs/pdf.png">
</div>
<div *ngIf="attachList.FILE_CONTENT_TYPE === 'txt'"> <img float-start class="attachImg"
@ -532,7 +532,7 @@
<div
*ngIf="attachList.FILE_CONTENT_TYPE === 'png' || attachList.FILE_CONTENT_TYPE === 'jpeg' || attachList.FILE_CONTENT_TYPE === 'jpg'|| attachList.FILE_CONTENT_TYPE === 'PNG' || attachList.FILE_CONTENT_TYPE === 'JPEG'|| attachList.FILE_CONTENT_TYPE === 'JPG'">
<img float-start class="attachImg" src="../assets/imgs/img.png">
</div>
</div> -->
<ion-label>
{{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} </ion-label>
@ -565,16 +565,17 @@
</ion-row>
</div>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-col size="12">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<!--filled-->
</ion-col>
<ion-col size="12"> <div style="font-size: 30px !important"> Transaction Successful </div> </ion-col>
</div>
</ion-content>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<!--filled-->
<br />
<div> Transaction Successful </div>
</div>
<ion-footer *ngIf="!messageSuccess" class="footerSearchBtn">
<!-- <ion-row>
@ -639,12 +640,13 @@
<ion-tabs>
<ion-tab-bar class="tabBar" slot="bottom">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVED')">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVE')">
<img src="../assets/imgs/action-approve.png">
<ion-label>Approve</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')">
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT
')">
<img src="../assets/imgs/action-reject.png">
<ion-label>Reject</ion-label>
</ion-tab-button>

@ -177,7 +177,6 @@ export class WorklistMainMRComponent implements OnInit {
this.getNotificationResAttr(this.WorkListButtonsObj);
this.getActionHistory(this.WorkListActionHistoryObj);
this.getAttachmentNotification(this.WorkListAttachObj);
if (this.getPassNotificationDetails.REQUEST_TYPE == "EIT") {
this.getEITNotificationDetails(this.WorkListBodyObj);
} else if (this.getPassNotificationDetails.REQUEST_TYPE == "ABSENCE") {
@ -265,10 +264,10 @@ export class WorklistMainMRComponent implements OnInit {
this.common.sharedService.setSharedData(this.notificationButtonRes, "passActionMore");
console.log("test" + this.notificationButtonRes.length);
for (let i = 0; i < this.notificationButtonRes.length; i++) {
if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED") {
if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE") {
this.approveDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED") {
if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT") {
this.rejectDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") {
@ -296,9 +295,10 @@ export class WorklistMainMRComponent implements OnInit {
setTimeout(() => {
this.messageSuccess = false;
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}, 5000);
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}
} // valid it
}
@ -310,11 +310,13 @@ export class WorklistMainMRComponent implements OnInit {
if (itemNo > this.notificationArray.length) {
this.common.openNotificationPage();
} else {
for (let i = 0; i <= this.notificationArray.length; i++) {
for (let i = 0; i < this.notificationArray.length; i++) {
if (this.notificationArray[i].ROW_NUM == itemNo) {
this.common.sharedService.setSharedData(this.notificationArray[i], HomeComponent.NOTIFICATION_DATA);
// itemExist = true;
this.intializeNotificationDetail();
this.intializeNotificationDetail();
// this.common.openNotificationPage();
break;
}
}
@ -456,7 +458,11 @@ export class WorklistMainMRComponent implements OnInit {
ButtonAction == "DELEGATE" ||
ButtonAction == "REQUEST_INFO" ||
ButtonAction == "TRANSFER" ||
ButtonAction == "TRANSFER_INFO"
ButtonAction == "TRANSFER_INFO" ||
ButtonAction == "APPROVE_AND_FORWARD" ||
ButtonAction == "FORWARD"
) {
// alert("multi option: "+ ButtonAction);
this.WorkListActionObj.P_ACTION_MODE = ButtonAction;
@ -981,8 +987,9 @@ export class WorklistMainMRComponent implements OnInit {
if (data.data == "cancel" || data.data == undefined) {
return;
} else {
} else if (data.data == "Success") {
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}
});
@ -1012,8 +1019,9 @@ export class WorklistMainMRComponent implements OnInit {
if (data.data == "cancel" || data.data == undefined) {
return;
} else {
} else if (data.data == "Success") {
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}
});

@ -9,13 +9,9 @@
</ion-header>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon> <!--filled-->
<br/>
<div> Transaction Successful </div>
</div>
<ion-content *ngIf="!messageSuccess" class="colorBG">
<ion-content class="colorBG">
<div *ngIf="!messageSuccess">
<div class="subjectNotification">{{getPassNotificationDetails.SUBJECT}}</div>
<!-- add segemnt part -->
@ -657,7 +653,7 @@
<ion-grid>
<ion-item class="itemAttch" *ngFor="let attachList of attachmentRes" >
<div
<!-- <div
*ngIf="attachList.FILE_CONTENT_TYPE === 'pdf' || attachList.FILE_CONTENT_TYPE === 'PDF'">
<img float-start class="attachImg" src="../assets/imgs/pdf.png">
</div>
@ -671,7 +667,7 @@
<div
*ngIf="attachList.FILE_CONTENT_TYPE === 'png' || attachList.FILE_CONTENT_TYPE === 'jpeg' || attachList.FILE_CONTENT_TYPE === 'jpg'|| attachList.FILE_CONTENT_TYPE === 'PNG' || attachList.FILE_CONTENT_TYPE === 'JPEG'|| attachList.FILE_CONTENT_TYPE === 'JPG'">
<img float-start class="attachImg" src="../assets/imgs/img.png">
</div>
</div> -->
<ion-label>
{{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} </ion-label>
@ -697,14 +693,18 @@
</div>
</ion-col>
</ion-row>
</div>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-col size="12">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<!--filled-->
</ion-col>
<ion-col size="12"> <div style="font-size: 30px !important"> Transaction Successful </div> </ion-col>
</div>
</ion-content>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon> <!--filled-->
<br/>
<div> Transaction Successful </div>
</div>
<ion-footer *ngIf="!messageSuccess" class="footerSearchBtn">
@ -777,12 +777,12 @@
<ion-tabs>
<ion-tab-bar class="tabBar" slot="bottom">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVED')">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVE')">
<img src="../assets/imgs/action-approve.png">
<ion-label>Approve</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')">
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT')">
<img src="../assets/imgs/action-reject.png">
<ion-label>Reject</ion-label>
</ion-tab-button>

@ -296,10 +296,10 @@ export class WorklistMainPoComponent implements OnInit {
this.common.sharedService.setSharedData(this.notificationButtonRes, "passActionMore");
console.log("test" + this.notificationButtonRes.length);
for (let i = 0; i < this.notificationButtonRes.length; i++) {
if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED") {
if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE") {
this.approveDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED") {
if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT") {
this.rejectDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") {
@ -330,10 +330,11 @@ export class WorklistMainPoComponent implements OnInit {
setTimeout(() => {
this.messageSuccess = false;
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}, 5000);
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}
} // valid it
}
@ -345,7 +346,7 @@ export class WorklistMainPoComponent implements OnInit {
if (itemNo > this.notificationArray.length) {
this.common.openNotificationPage();
} else {
for (let i = 0; i <= this.notificationArray.length; i++) {
for (let i = 0; i < this.notificationArray.length; i++) {
if (this.notificationArray[i].ROW_NUM == itemNo) {
this.common.sharedService.setSharedData(this.notificationArray[i], HomeComponent.NOTIFICATION_DATA);
// itemExist = true;
@ -495,7 +496,11 @@ export class WorklistMainPoComponent implements OnInit {
ButtonAction == "DELEGATE" ||
ButtonAction == "REQUEST_INFO" ||
ButtonAction == "TRANSFER" ||
ButtonAction == "TRANSFER_INFO"
ButtonAction == "TRANSFER_INFO" ||
ButtonAction == "APPROVE_AND_FORWARD" ||
ButtonAction == "FORWARD"
) {
// alert("multi option: "+ ButtonAction);
this.WorkListActionObj.P_ACTION_MODE = ButtonAction;
@ -1052,8 +1057,9 @@ export class WorklistMainPoComponent implements OnInit {
if (data.data == "cancel" || data.data == undefined) {
return;
} else {
} else if (data.data == "Success") {
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}
});

@ -7,8 +7,8 @@
</ion-toolbar>
</ion-header>
<ion-content *ngIf="!messageSuccess" class="colorBG">
<ion-content class="colorBG">
<div *ngIf="!messageSuccess">
<div class="subjectNotification">{{getPassNotificationDetails.SUBJECT}}</div>
<!-- add segemnt part -->
@ -379,7 +379,7 @@
<ion-grid>
<ion-item class="itemAttch" *ngFor="let attachList of attachmentRes">
<div *ngIf="attachList.FILE_CONTENT_TYPE === 'pdf' || attachList.FILE_CONTENT_TYPE === 'PDF'">
<!-- <div *ngIf="attachList.FILE_CONTENT_TYPE === 'pdf' || attachList.FILE_CONTENT_TYPE === 'PDF'">
<img float-start class="attachImg" src="../assets/imgs/pdf.png">
</div>
<div *ngIf="attachList.FILE_CONTENT_TYPE === 'txt'"> <img float-start class="attachImg"
@ -392,7 +392,7 @@
<div
*ngIf="attachList.FILE_CONTENT_TYPE === 'png' || attachList.FILE_CONTENT_TYPE === 'jpeg' || attachList.FILE_CONTENT_TYPE === 'jpg'|| attachList.FILE_CONTENT_TYPE === 'PNG' || attachList.FILE_CONTENT_TYPE === 'JPEG'|| attachList.FILE_CONTENT_TYPE === 'JPG'">
<img float-start class="attachImg" src="../assets/imgs/img.png">
</div>
</div> -->
<ion-label>
{{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} </ion-label>
@ -416,14 +416,16 @@
</div>
</ion-col>
</ion-row>
</ion-content>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<!--filled-->
<br />
<div> Transaction Successful </div>
</div>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-col size="12">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<!--filled-->
</ion-col>
<ion-col size="12"> <div style="font-size: 30px !important"> Transaction Successful </div> </ion-col>
</div>
</ion-content>
<ion-footer *ngIf="!messageSuccess" class="footerSearchBtn">
<!-- <ion-row>
@ -487,12 +489,12 @@
<ion-tabs>
<ion-tab-bar class="tabBar" slot="bottom">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVED')">
<ion-tab-button *ngIf="approveDis" (click)="actionButton('APPROVE')">
<img src="../assets/imgs/action-approve.png">
<ion-label>Approve</ion-label>
</ion-tab-button>
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECTED')">
<ion-tab-button *ngIf="rejectDis" (click)="actionButton('REJECT')">
<img src="../assets/imgs/action-reject.png">
<ion-label>Reject</ion-label>
</ion-tab-button>

@ -298,10 +298,10 @@ export class WorklistMainPRComponent implements OnInit {
this.common.sharedService.setSharedData(this.notificationButtonRes, "passActionMore");
console.log("test" + this.notificationButtonRes.length);
for (let i = 0; i < this.notificationButtonRes.length; i++) {
if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED") {
if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE") {
this.approveDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED") {
if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT") {
this.rejectDis = true;
} else
if (this.notificationButtonRes[i].BUTTON_ACTION == "REQUEST_INFO") {
@ -495,7 +495,11 @@ export class WorklistMainPRComponent implements OnInit {
ButtonAction == "DELEGATE" ||
ButtonAction == "REQUEST_INFO" ||
ButtonAction == "TRANSFER" ||
ButtonAction == "TRANSFER_INFO"
ButtonAction == "TRANSFER_INFO" ||
ButtonAction == "APPROVE_AND_FORWARD" ||
ButtonAction == "FORWARD"
) {
// alert("multi option: "+ ButtonAction);
this.WorkListActionObj.P_ACTION_MODE = ButtonAction;
@ -986,8 +990,9 @@ export class WorklistMainPRComponent implements OnInit {
if (data.data == "cancel" || data.data == undefined) {
return;
} else {
} else if (data.data == "Success") {
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}
});

@ -6,8 +6,8 @@
</ion-buttons>
</ion-toolbar>
</ion-header>
<ion-content *ngIf="!messageSuccess" class="colorBG">
<ion-content class="colorBG">
<div *ngIf="!messageSuccess">
<!-- add segemnt part -->
<div class="subjectNotification">{{getPassNotificationDetails.SUBJECT}}</div>
<ion-segment [dir]="directionLTR" mode="md" color="secondary" (ionChange)="segmentChanged($event)"
@ -398,7 +398,7 @@
<ion-grid>
<ion-item class="itemAttch" *ngFor="let attachList of attachmentRes">
<div *ngIf="attachList.FILE_CONTENT_TYPE === 'pdf' || attachList.FILE_CONTENT_TYPE === 'PDF'">
<!-- <div *ngIf="attachList.FILE_CONTENT_TYPE === 'pdf' || attachList.FILE_CONTENT_TYPE === 'PDF'">
<img float-start class="attachImg" src="../assets/imgs/pdf.png">
</div>
<div *ngIf="attachList.FILE_CONTENT_TYPE === 'txt'"> <img float-start class="attachImg"
@ -411,7 +411,7 @@
<div
*ngIf="attachList.FILE_CONTENT_TYPE === 'png' || attachList.FILE_CONTENT_TYPE === 'jpeg' || attachList.FILE_CONTENT_TYPE === 'jpg'|| attachList.FILE_CONTENT_TYPE === 'PNG' || attachList.FILE_CONTENT_TYPE === 'JPEG'|| attachList.FILE_CONTENT_TYPE === 'JPG'">
<img float-start class="attachImg" src="../assets/imgs/img.png">
</div>
</div> -->
<ion-label>
{{attachList.SEQ_NUM }}. {{attachList.FILE_NAME}} </ion-label>
@ -456,13 +456,17 @@
</div>
</ion-col>
</ion-row>
</div>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-col size="12">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<!--filled-->
</ion-col>
<ion-col size="12"> <div style="font-size: 30px !important"> Transaction Successful </div> </ion-col>
</div>
</ion-content>
<div *ngIf="messageSuccess" class="succssfullMSG">
<ion-icon class="succssfullIcon" name="checkmark"></ion-icon>
<!--filled-->
<br />
<div> Transaction Successful </div>
</div>
<ion-footer class="footerSearchBtn" *ngIf="!messageSuccess">

@ -158,23 +158,24 @@
font-size: 14px;
}
.succssfullMSG{
height: 100%;
width: 100%;
background: var(--newgreen);
color: white;
font-weight: bold;
font-size: 20px;
text-align: center;
vertical-align: middle;
padding-top: 30px;
}
// .succssfullMSG{
// height: 100%;
// width: 100%;
// background: var(--newgreen);
// color: white;
// font-weight: bold;
// font-size: 20px;
// text-align: center;
// vertical-align: middle;
// padding-top: 30px;
// }
.succssfullIcon{
width: 60%;
text-align: center;
height: 60%;
}
// .succssfullIcon{
// width: 60%;
// text-align: center;
// height: 36%;
// padding-top: 100px;
// }
////////////////////////////////
.subOrdinateList{
// margin: 10px;

@ -346,10 +346,11 @@ export class WorklistMainComponent implements OnInit {
setTimeout(() => {
this.messageSuccess = false;
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}, 5000);
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}
} // valid it
}
@ -361,7 +362,7 @@ export class WorklistMainComponent implements OnInit {
if (itemNo > this.notificationArray.length) {
this.common.openNotificationPage();
} else {
for (let i = 0; i <= this.notificationArray.length; i++) {
for (let i = 0; i < this.notificationArray.length; i++) {
if (this.notificationArray[i].ROW_NUM == itemNo) {
this.common.sharedService.setSharedData(this.notificationArray[i], HomeComponent.NOTIFICATION_DATA);
// itemExist = true;
@ -886,8 +887,9 @@ export class WorklistMainComponent implements OnInit {
if (data.data == "cancel" || data.data == undefined) {
return;
} else {
} else if (data.data == "Success") {
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}
});
@ -917,8 +919,9 @@ export class WorklistMainComponent implements OnInit {
if (data.data == "cancel" || data.data == undefined) {
return;
} else {
} else if (data.data == "Success") {
this.getNotificationCountAfterSubmit();
this.nextNotfification();
}
});

@ -516,7 +516,8 @@ left: 66px;
.succssfullIcon{
width: 60%;
text-align: center;
height: 60%;
height: 36%;
padding-top: 100px;
}
.subjectNotification{
text-align: center;

Loading…
Cancel
Save