Sn/es

src/app/app-modules/core/components/app-footer/app-footer.component.html

@@ -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"
@@ -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"
@@ -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"

src/app/app-modules/core/components/app-header/app-header.component.ts

@@ -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() {

src/app/app-modules/core/components/beneficiary-details/beneficiary-details.component.html

@@ -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 }} /

src/app/app-modules/core/core.module.ts

@@ -90,6 +90,7 @@ import { SharedModule } from './components/shared/shared.module';
     WebcamModule,
     MatTableModule,
     SharedModule,
+    RouterModule,
   ],
   declarations: [
     CommonDialogComponent,

src/app/app-modules/core/services/http-interceptor.service.ts

@@ -42,21 +42,32 @@ export class HttpInterceptorService implements HttpInterceptor {
   ): 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');
+
+    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(
@@ -73,11 +84,33 @@ export class HttpInterceptorService implements HttpInterceptor {
       catchError((error: HttpErrorResponse) => {
         console.error(error);
         this.spinnerService.setLoading(false);
+
+        if(error.status === 401){
+          this.sessionstorage.clear();
+          this.confirmationService.alert(this.currentLanguageSet.sessionExpiredPleaseLogin, 'error');
+          setTimeout(() => this.router.navigate(['/login']), 0);
+        } else if (error.status === 403) {
+          this.confirmationService.alert(
+            this.currentLanguageSet.accessDenied,
+            'error',
+          );
+        } else if (error.status === 500) {
+          this.confirmationService.alert(
+            this.currentLanguageSet.internaleServerError,
+            'error',
+          );
+        } else {
+          this.confirmationService.alert(
+            error.message || this.currentLanguageSet.somethingWentWrong,
+            'error',
+          );
+        }
         return throwError(error.error);
       }),
     );
   }
 
+
   private onSuccess(url: string, response: any): void {
     if (this.timerRef) clearTimeout(this.timerRef);
 

src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts

@@ -355,25 +355,24 @@ export class DoctorDiagnosisCaseSheetComponent
           }
         }
       }
-      console.log(
-        'referDetailsForRefer',
-        JSON.stringify(this.referDetails, null, 4),
-      );
       if (
         this.casesheetData &&
         this.casesheetData.doctorData.Refer &&
-        this.referDetails.revisitDate &&
-        !moment(this.referDetails.revisitDate, 'DD/MM/YYYY', true).isValid()
+        this.casesheetData.doctorData.Refer.revisitDate &&
+        !moment(this.casesheetData.doctorData.Refer.revisitDate, 'DD/MM/YYYY', true).isValid()
       ) {
-        const sDate = new Date(this.referDetails.revisitDate);
-        this.referDetails.revisitDate = [
+        const sDate = new Date(this.casesheetData.doctorData.Refer.revisitDate);
+        this.casesheetData.doctorData.Refer.revisitDate = [
           this.padLeft.apply(sDate.getDate()),
           this.padLeft.apply(sDate.getMonth() + 1),
           this.padLeft.apply(sDate.getFullYear()),
         ].join('/');
       }
 
-      this.downloadSign();
+      if (this.casesheetData?.BeneficiaryData?.doctorSignatureFlag) {
+
+        this.downloadSign();
+      }
       this.getVaccinationTypeAndDoseMaster();
     }
   }
@@ -384,9 +383,11 @@ export class DoctorDiagnosisCaseSheetComponent
   }
 
    downloadSign() {
+
     this.getUserId().subscribe((userId) => {
-      const tcSpecId = this.beneficiaryDetails?.tCSpecialistUserID;
-      const userIdToUse = tcSpecId && tcSpecId !== 0 ? tcSpecId : userId;
+      const userIdToUse = this.beneficiaryDetails?.tCSpecialistUserID ?? userId;
+      console.log("User", userIdToUse);
+
       this.doctorService.downloadSign(userIdToUse).subscribe(
         (response: any) => {
           const blob = new Blob([response], { type: response.type });