diff --git a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html index 0954775b..fec9f6d7 100644 --- a/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html +++ b/admin-ui/src/app/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html @@ -412,7 +412,7 @@ -
+
{{ "center.selectLanguage" | translate }} - {{ secondaryLangDisplay }} + {{ secondaryLangDisplay }} { this.popupMessages = response; this.serverError = response.serverError; + this.confirmationPopupMessage = response.masterData.centerType; }); let supportedLanguages = this.appConfigService.getConfig()['supportedLanguages'].split(','); let self = this; @@ -779,7 +781,7 @@ export class MaterDataCommonBodyComponent implements OnInit { this.showErrorPopup(mandatoryFieldLabel[i]+this.popupMessages.genericerror.fieldNameValidation); break; }else if(len === (i+1)){ - self.executeAPI(); + this.isCreateForm ? this.showConfirmationMsg("create") : this.showConfirmationMsg("update") } } } @@ -1132,6 +1134,26 @@ export class MaterDataCommonBodyComponent implements OnInit { return dialogRef; } + showConfirmationMsg(type:any){ + let data = {}; + data = { + case: 'CONFIRMATION', + title: this.confirmationPopupMessage[type].title, + message: this.confirmationPopupMessage[type].message, + yesBtnTxt: this.confirmationPopupMessage[type].yesBtnText, + noBtnTxt: this.confirmationPopupMessage[type].noBtnText + }; + const dialogRef = this.dialog.open(DialogComponent, { + width: '650px', + data + }); + dialogRef.afterClosed().subscribe(response => { + if (response) { + this.executeAPI(); + } else if (!response) {} + }); + } + showErrorPopup(message: string) { this.dialog .open(DialogComponent, { diff --git a/admin-ui/src/app/features/resources/center/edit/edit.component.html b/admin-ui/src/app/features/resources/center/edit/edit.component.html index b6f2ef16..895046ed 100644 --- a/admin-ui/src/app/features/resources/center/edit/edit.component.html +++ b/admin-ui/src/app/features/resources/center/edit/edit.component.html @@ -104,10 +104,10 @@

{{ "center.location-details" | translate }}

- -
+ [ngClass]="isSecondaryLangRTL ? 'secondary-form' : 'secondary-form-ltr'" [dir]="isSecondaryLangRTL ? 'rtl' : 'ltl'"> {{ "center.selectLanguage" | translate }} {{ secondaryLanguageLabels["location-details"] }}
- - @@ -687,7 +687,7 @@

{{ "center.operational-details" | translate }}

-