Merge branch 'ashwaq-fix-bug' of https://hmg.git.cloudforge.com/mohemmionic5 into ashwaq-fix-bug

master
ashwaq 6 years ago
commit 983da59f1f

@ -16,17 +16,18 @@
-->
<!-- <app-generic-header
<app-generic-header
showBack="!getPassdirfromNotifiPage"
[updateDirection]="getPassdirfromNotifiPage"
[headerText]="headerTitle"
(trigger)="closemodal()">
</app-generic-header> -->
(trigger)="closeModal()"
>
</app-generic-header>
<app-generic-header
<!-- <app-generic-header
showBack="true"
[headerText]="headerTitle">
</app-generic-header>
</app-generic-header> -->
<ion-content padding>
<div #containerDiv id="containerDiv">

@ -417,7 +417,8 @@ export class AddEitComponent implements OnInit {
}
}
closemodal() {
closeModal() {
console.log("closeModal");
this.updatedValues = [];
this.modalController.dismiss();
}

@ -46,12 +46,17 @@ export class EitUpdateListComponent implements OnInit {
modal.onDidDismiss()
.then((data: any) => {
console.log("data" + data);
console.log("data" + data.data.updated);
console.log("data" + data.data.eitRequest.EITTransactionTBL);
// console.log("data" + data);
// console.log("data" + data.data.updated);
// console.log("data" + data.data.eitRequest.EITTransactionTBL);
if (data) {
if(data.data == undefined)
{
return;
}
else if (data.data) {
this.updatedData = this.updatedData ? this.updatedData.concat(data.data.updated) : data.data.updated;
this.notificationBodyRes[index].Collection_Notification = data.data.updated;
this.updateTransactionList(data.data.eitRequest.EITTransactionTBL);

Loading…
Cancel
Save