diff --git a/Common-UI b/Common-UI index 0ada5440..f4536935 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 0ada54409ae7968a1a7b529afb1dd9dd7b6552ee +Subproject commit f45369358ebf0c9c57deee0a39482022a1007849 diff --git a/pom.xml b/pom.xml index 4e3972b4..b7ff5d9e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.aam-ui aam-ui - 3.6.0 + 3.6.1 AAM-UI Piramal - AAM: Module ui war diff --git a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts index 2c36c372..ee0d1305 100644 --- a/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts +++ b/src/app/app-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts @@ -279,6 +279,8 @@ export class NurseWorklistComponent implements OnInit, DoCheck, OnDestroy { .confirm( `info`, this.currentLanguageSet.alerts.info.confirmtoProceedFurther, + this.currentLanguageSet.common.ok, + this.currentLanguageSet.common.cancel, ) .subscribe((result) => { if (result) { diff --git a/src/app/app-modules/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html b/src/app/app-modules/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html index 95fcea82..742e974a 100644 --- a/src/app/app-modules/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html +++ b/src/app/app-modules/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html @@ -114,7 +114,7 @@

{{ currentLanguageSet?.createFamilyTagging }}

- +