From 436e85873f7f812f21e4d6a13bc38894fb8192b2 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 6 Sep 2021 17:32:44 +0300 Subject: [PATCH] fixed basic details modal issue --- .../services/connector/connector.service.ts | 4 +-- Mohem/src/app/profile/home/home.component.ts | 30 +++++++++---------- .../edit-detail-profile.component.html | 4 +-- .../edit-detail-profile.component.ts | 5 ++-- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index ddd23f6d..b0b0e53c 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 120 * 1000; - public static host = 'https://uat.hmgwebservices.com/'; - // public static host = 'https://hmgwebservices.com/'; + // public static host = 'https://uat.hmgwebservices.com/'; + public static host = 'https://hmgwebservices.com/'; constructor(public httpClient: HttpClient, public cs: CommonService, diff --git a/Mohem/src/app/profile/home/home.component.ts b/Mohem/src/app/profile/home/home.component.ts index 36520a84..17d08d22 100644 --- a/Mohem/src/app/profile/home/home.component.ts +++ b/Mohem/src/app/profile/home/home.component.ts @@ -315,22 +315,22 @@ export class HomeComponent implements OnInit { modal.onDidDismiss() .then((data) => { console.log(data); - this.cs.sharedService.setSharedData(data.data, ProfileService.SELECTED_STATUS); - if (data.data && data.data.data == 1 && source === 'address') { - this.cs.sharedService.setSharedData(this.addressSubMenu, ProfileService.ADRESS_ENTRIES); - this.cs.sharedService.setSharedData(this.employeeAdress, ProfileService.EMP_ADDRESS); - this.cs.sharedService.setSharedData(this.country, ProfileService.COUNTRY); - - this.cs.openAddAddress(); - } else if (data.data && data.data.data == 2 && source === 'address') { - this.cs.openAddAddress(); - } else if (data.data && data.data.data == 1 && source === 'basicDetails') { - this.cs.openAddBasicDetails('correct'); - } else if (data.data && data.data.data == 2 && source === 'basicDetails') { - this.cs.openAddBasicDetails('new'); + if (data.data && data.data.actionClicked === 'next') { + this.cs.sharedService.setSharedData(data.data, ProfileService.SELECTED_STATUS); + if (data.data && data.data.data == 1 && source === 'address') { + this.cs.sharedService.setSharedData(this.addressSubMenu, ProfileService.ADRESS_ENTRIES); + this.cs.sharedService.setSharedData(this.employeeAdress, ProfileService.EMP_ADDRESS); + this.cs.sharedService.setSharedData(this.country, ProfileService.COUNTRY); + + this.cs.openAddAddress(); + } else if (data.data && data.data.data == 2 && source === 'address') { + this.cs.openAddAddress(); + } else if (data.data && data.data.data == 1 && source === 'basicDetails') { + this.cs.openAddBasicDetails('correct'); + } else if (data.data && data.data.data == 2 && source === 'basicDetails') { + this.cs.openAddBasicDetails('new'); + } } - - }) return await modal.present(); } diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html index 940f3bc6..54400f91 100644 --- a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html +++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.html @@ -27,11 +27,11 @@ - {{ts.trPK('eit','cancel-text')}} + {{ts.trPK('eit','cancel-text')}} - {{ts.trPK('general','next')}} + {{ts.trPK('general','next')}} diff --git a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts index e7769477..cf9a5842 100644 --- a/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts +++ b/Mohem/src/app/profile/modal/edit-detail-profile/edit-detail-profile.component.ts @@ -19,11 +19,12 @@ export class EditDetailProfileComponent implements OnInit { ngOnInit() { } - dismiss() { + dismiss(actionValue: any) { // using the injected ModalController this page // can "dismiss" itself and optionally pass back data this.modalController.dismiss({ - 'dismissed': true, + dismissed: true, + actionClicked: actionValue, data: this.isChange }); }