Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 25 files
+220 −0 matomo-documentation.md
+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
+131 −0 src/feedback/shared/feedback-dialog/feedback-dialog.component.html
+70 −0 src/feedback/shared/feedback-dialog/feedback-dialog.component.scss
+179 −0 src/feedback/shared/feedback-dialog/feedback-dialog.component.ts
+1 −0 src/public-api.ts
+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
+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
+28 −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"
>

Check warning on line 35 in src/app/app-modules/core/components/app-footer/app-footer.component.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use <a> or <area> instead of the link role to ensure accessibility across all devices.

See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-UI&issues=AZrjH5Gq8sfux74pAkCk&open=AZrjH5Gq8sfux74pAkCk&pullRequest=112
<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
33 changes: 22 additions & 11 deletions src/app/app-modules/core/services/http-interceptor.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,32 @@
): Observable<HttpEvent<any>> {
const key: any = sessionStorage.getItem('key');
let modifiedReq = req;
if (req.body instanceof FormData) {
modifiedReq = req.clone({
headers: req.headers.set('Authorization', key || ''),
});
const isPlatformFeedback =
req.url && req.url.toLowerCase().includes('/platform-feedback');

Check warning on line 46 in src/app/app-modules/core/services/http-interceptor.service.ts

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Prefer using an optional chain expression instead, as it's more concise and easier to read.

See more on https://sonarcloud.io/project/issues?id=PSMRI_TM-UI&issues=AZrjH5Ja8sfux74pAkCl&open=AZrjH5Ja8sfux74pAkCl&pullRequest=112

if (isPlatformFeedback) {
// For platform-feedback: remove Authorization and force JSON content-type
const headers = req.headers
.delete('Authorization')
.set('Content-Type', 'application/json');
modifiedReq = req.clone({ headers });
} else {
if (key !== undefined && key !== null) {
if (req.body instanceof FormData) {
modifiedReq = req.clone({
headers: req.headers
.set('Authorization', key)
.set('Content-Type', 'application/json'),
headers: req.headers.set('Authorization', key || ''),
});
} else {
modifiedReq = req.clone({
headers: req.headers.set('Authorization', ''),
});
if (key !== undefined && key !== null) {
modifiedReq = req.clone({
headers: req.headers
.set('Authorization', key)
.set('Content-Type', 'application/json'),
});
} else {
modifiedReq = req.clone({
headers: req.headers.set('Authorization', ''),
});
}
}
}
return next.handle(modifiedReq).pipe(
Expand Down
7 changes: 7 additions & 0 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,13 @@ const routes: Routes = [
(module) => module.DataSYNCModule,
),
},
{
path: 'feedback',
loadChildren: () =>
import('Common-UI/src/feedback/feedback.module').then(
(m) => m.FeedbackModule,
),
},
];

@NgModule({
Expand Down
Loading
Loading