Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9713717
fix: Amm-626 assamese language conversion fix (#83)
snehar-nd Sep 1, 2025
86f00b6
feat: amm-1337 Feedback module integration and 1668 removal of PII fr…
5Amogh Sep 12, 2025
a4790c9
Merge pull request #92 from PSMRI/AMM-1337
5Amogh Sep 18, 2025
f45420c
Update pom.xml
5Amogh Sep 25, 2025
d8c3efa
Update pom.xml
5Amogh Sep 25, 2025
b7480d3
Merge pull request #96 from PSMRI/sn/3.5.1
5Amogh Sep 30, 2025
af16acb
fix: 1899 signature enhancement
snehar-nd Oct 30, 2025
5762852
fix: 1899 added signexist apiendpoint for env
snehar-nd Oct 30, 2025
83cc0d8
fix: signature case sheet fix
snehar-nd Nov 4, 2025
700fc7e
fix: signature case sheet fix and revisit date was not able to access
snehar-nd Nov 4, 2025
dbf80a7
Merge pull request #111 from PSMRI/release-3.6.1
5Amogh Dec 3, 2025
17a6ec6
Merge branch 'release-3.6.0' into release-3.8.0
5Amogh Dec 3, 2025
7599727
Merge pull request #112 from PSMRI/release-3.8.0
5Amogh Dec 3, 2025
32157d1
Merge branch 'release-3.6.0' into release-3.5.0
5Amogh Dec 3, 2025
79fa27a
Merge pull request #113 from PSMRI/release-3.5.0
5Amogh Dec 3, 2025
db78b3e
fix: amm-1931 handling session expiry
snehar-nd Dec 8, 2025
494858e
fix: amm-1931 handling session expiry
snehar-nd Dec 8, 2025
8665b58
Merge pull request #114 from PSMRI/sn/wasa
snehar-nd Dec 9, 2025
9868246
fix: amm-2001 btn-close for feedback
5Amogh Dec 10, 2025
31c945e
Merge pull request #115 from PSMRI/amm-2001
snehar-nd Dec 10, 2025
a7a3ef9
Merge branch 'release-3.6.0' into nd/3.5.1/sn
snehar-nd Dec 11, 2025
d5ec325
Merge pull request #107 from PSMRI/nd/3.5.1/sn
snehar-nd Dec 12, 2025
8958db6
fix: amm-1931 session expiry error handling mechanism
5Amogh Jan 16, 2026
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
Submodule Common-UI updated 34 files
+307 βˆ’0 matomo-documentation.md
+220 βˆ’0 matomo-local-setup.md
+ βˆ’ src/assets/images/tracking-high-level-diagram.png
+37 βˆ’0 src/feedback/feedback-routing.module.ts
+48 βˆ’0 src/feedback/feedback.module.ts
+72 βˆ’0 src/feedback/pages/feedback-public-page/feedback-public-page-component.ts
+63 βˆ’0 src/feedback/services/feedback.service.ts
+135 βˆ’0 src/feedback/shared/feedback-dialog/feedback-dialog.component.html
+72 βˆ’0 src/feedback/shared/feedback-dialog/feedback-dialog.component.scss
+185 βˆ’0 src/feedback/shared/feedback-dialog/feedback-dialog.component.ts
+1 βˆ’0 src/public-api.ts
+1 βˆ’1 ...egistrar/abha-components/abha-generation-success-component/abha-generation-success-component.component.html
+1 βˆ’1 src/registrar/abha-components/abha-verify-success-component/abha-verify-success-component.component.html
+1 βˆ’1 src/registrar/abha-components/download-search-abha/download-search-abha.component.html
+1 βˆ’1 src/registrar/abha-components/download-search-abha/download-search-abha.component.ts
+1 βˆ’1 src/registrar/abha-components/generate-abha-component/generate-abha-component.component.ts
+2 βˆ’2 src/registrar/abha-components/health-id-display-modal/health-id-display-modal.component.html
+4 βˆ’3 src/registrar/registration/abha-information/abha-information.component.html
+10 βˆ’2 src/registrar/registration/abha-information/abha-information.component.ts
+21 βˆ’18 src/registrar/registration/location-information/location-information.component.html
+44 βˆ’17 src/registrar/registration/location-information/location-information.component.ts
+6 βˆ’1 src/registrar/registration/personal-information/personal-information.component.html
+12 βˆ’20 src/registrar/registration/personal-information/personal-information.component.ts
+3 βˆ’2 src/registrar/registration/registration.component.ts
+94 βˆ’120 src/registrar/search-dialog/search-dialog.component.html
+154 βˆ’33 src/registrar/search-dialog/search-dialog.component.ts
+2 βˆ’2 src/registrar/search/search.component.ts
+6 βˆ’0 src/tracking/index.ts
+110 βˆ’0 src/tracking/lib/amrit-tracking.service.ts
+192 βˆ’0 src/tracking/lib/ga-tracking.service.ts
+150 βˆ’0 src/tracking/lib/matomo-tracking.service.ts
+11 βˆ’0 src/tracking/lib/tracking-provider.ts
+36 βˆ’0 src/tracking/lib/tracking.module.ts
+25 βˆ’0 src/tracking/lib/tracking.tokens.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<footer class="footer container-fluid">
<div class="row">
<div class="col-4 text-left">
<div class="col-3 text-left">
<span
class="footer-text"
*ngIf="currentLanguageSet === null || currentLanguageSet === undefined"
Expand All @@ -12,7 +12,7 @@
>{{ currentLanguageSet?.coreComponents?.poweredByWipro }}</span
>
</div>
<div class="col-4 text-center">
<div class="col-3 text-center">
<p
class="footer-text"
*ngIf="currentLanguageSet === null || currentLanguageSet === undefined"
Expand All @@ -26,7 +26,21 @@
{{ year }} Β© {{ currentLanguageSet?.coreComponents?.pSMRI }}
</p>
</div>
<div class="col-4 text-end">
<div
class="col-3 text-end"
style="cursor: pointer"
[routerLink]="['/feedback']"
[queryParams]="{ sl: 'TM' }"
role="link"
>
<mat-icon style="vertical-align: top; font-size: medium; margin-right: 2%"
>mail</mat-icon
>
<span class="footer-text"
>{{ currentLanguageSet?.platform_feedback?.feedback ?? "Feedback" }}
</span>
</div>
<div class="col-3 text-end">
<p class="footer-text">
<span
class="footer-text"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,13 +161,15 @@ export class AppHeaderComponent implements OnInit {

logout() {
this.auth.logout().subscribe((res) => {
this.router.navigate(['/login']).then((result) => {
if (result) {
this.changeLanguage('English');
this.sessionstorage.clear();
sessionStorage.clear();
}
});
this.router
.navigate(['/feedback'], { queryParams: { sl: 'TM' } })
.then((result) => {
if (result) {
this.changeLanguage('English');
this.sessionstorage.clear();
sessionStorage.clear();
}
});
});
}
rolenavigation() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,34 +19,6 @@
<tr style="color: #595959; font-size: 14px">
<td>{{ beneficiary?.beneficiaryName }}</td>
</tr>
<ng-container *ngIf="beneficiary?.fatherName">
<tr style="font-size: 14px; color: #000000">
<th id="fatherName">
{{ current_language_set?.bendetails?.fatherName }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>{{ beneficiary?.fatherName }}</td>
</tr>
</ng-container>
<ng-container *ngIf="beneficiary?.lastName">
<tr style="font-size: 14px; color: #000000">
<th id="lastName">
{{ current_language_set?.bendetails?.lastName }}:
</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>{{ beneficiary?.lastName }}</td>
</tr>
</ng-container>
<ng-container *ngIf="beneficiary?.preferredPhoneNum">
<tr style="font-size: 14px; color: #000000">
<th id="phoneNo">{{ current_language_set?.bendetails?.phoneNo }}:</th>
</tr>
<tr style="color: #595959; font-size: 14px">
<td>{{ beneficiary?.preferredPhoneNum }}</td>
</tr>
</ng-container>
<tr style="font-size: 14px; color: #000000">
<th id="gender">
{{ current_language_set?.bendetails?.gender }} /
Expand Down
1 change: 1 addition & 0 deletions src/app/app-modules/core/core.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ import { SharedModule } from './components/shared/shared.module';
WebcamModule,
MatTableModule,
SharedModule,
RouterModule,
],
declarations: [
CommonDialogComponent,
Expand Down
2 changes: 1 addition & 1 deletion src/app/app-modules/core/services/confirmation.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { CommonDialogComponent } from '../components/common-dialog/common-dialog
@Injectable()
export class ConfirmationService {
constructor(
private dialog: MatDialog,
public dialog: MatDialog,
@Inject(DOCUMENT) doc: any,
) {}

Expand Down
Loading
Loading