Skip to content

fix: amm-1986, 1990 - common-ui reference update and version update #235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
5Amogh merged 2 commits into from
Dec 18, 2025
Merged

fix: amm-1986, 1990 - common-ui reference update and version update #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9aa1c9
fix: amm-1986 & 1990
5Amogh Dec 18, 2025
ddcad7e
fix: amm-1986, 1990 - common-ui reference update and version update
5Amogh Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Common-UI
Open in desktop
Submodule Common-UI updated 1 files
+4 −5 src/registrar/registration/registration.component.html
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.iemr.aam-ui</groupId>
<artifactId>aam-ui</artifactId>
<version>3.6.0</version>
<version>3.6.1</version>
<name>AAM-UI</name>
<description>Piramal - AAM: Module ui</description>
<packaging>war</packaging>
Expand Down
2 changes: 2 additions & 0 deletions ...pp-modules/nurse-doctor/nurse-worklist-wrapper/nurse-worklist/nurse-worklist.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...dules/registrar/family-tagging/create-family-tagging/create-family-tagging.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h4>{{ currentLanguageSet?.createFamilyTagging }}</h4>
</form>
</mat-dialog-content>

<mat-dialog-actions class="padding15 margin15 pull-right">
<mat-dialog-actions class="padding15 margin15 pull-right" style="display: flex;justify-content: flex-end;gap:12px">
<button
class="full-width-login button-reset"
type="button"
Expand Down