Release 3.6.0 into main

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.iemr.tm-ui</groupId>
   <artifactId>tm-ui</artifactId>
-  <version>3.4.0</version>
+  <version>3.6.0</version>
   <name>TM-UI</name>
   <description>Piramal - tm: Module ui</description>
   <packaging>war</packaging>

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 @@
   ): 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 @@
       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/core/services/http-service.service.ts

@@ -21,8 +21,15 @@
 
   constructor(
     private _http: HttpClient,
-    private http: HttpClient,
-  ) {}
+    private http: HttpClient
+  ) 
+  {
+    const storedLang = localStorage.getItem('appLanguage');
+    this.language = storedLang ? JSON.parse(storedLang) : null;
+
+    this.appCurrentLanguge = new BehaviorSubject(this.language);
+    this.currentLangugae$ = this.appCurrentLanguge.asObservable();
+  }
 
   fetchLanguageSet() {
     console.log('Here i come');
@@ -34,6 +41,8 @@
   getCurrentLanguage(response: any) {
     console.log('here at one', response);
     this.language = response;
+    localStorage.setItem('appLanguage', JSON.stringify(response));
+
     console.log('teste', this.language);
     this.appCurrentLanguge.next(response);
     console.log('here at two', this.appCurrentLanguge.value);

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

@@ -64,7 +64,7 @@
     private doctorService: DoctorService,
     private confirmationService: ConfirmationService,
     readonly sessionstorage: SessionStorageService,
     private masterdataService: MasterdataService
   ) {}
 
   ngOnInit() {
@@ -189,7 +189,10 @@
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        this.addDiagnosis();
+
+        if (diagnosisArrayList.length < savedDiagnosisData.length) {
+          this.addDiagnosis();
+        }
       }
     }
   }
@@ -272,7 +275,7 @@
   onDiagnosisSelected(selected: any, index: number) {
     // this.patientQuickConsultForm.get(['provisionalDiagnosisList', index])?.setValue(selected);
     const diagnosisFormArray = this.generalDiagnosisForm.get(
       'provisionalDiagnosisList'
     ) as FormArray;
     const diagnosisFormGroup = diagnosisFormArray.at(index) as FormGroup;
 

src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html

@@ -129,7 +129,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}</h4>
               <mat-form-field class="input-full-width" appearance="fill">
                 <mat-label>{{ current_language_set?.casesheet?.provisionalDiag }}</mat-label>
                 <input matInput type="text" autocomplete="off" name="viewProvisionalDiagnosisProvided"
-                  formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" required #diagnosisInput
+                  formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" #diagnosisInput
                   [matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
               </mat-form-field>
 

src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts

@@ -61,7 +61,7 @@
   enableNCDCondition = false;
   suggestedDiagnosisList: any = [];
 
 
   constructor(
     private fb: FormBuilder,
     private masterdataService: MasterdataService,
@@ -181,7 +181,9 @@
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        this.addDiagnosis();
+        if (diagnosisArrayList.length < savedDiagnosisData.length) {
+          this.addDiagnosis();
+        }
       }
     }
   }
@@ -288,7 +290,7 @@
   onDiagnosisSelected(selected: any, index: number) {
     // this.patientQuickConsultForm.get(['provisionalDiagnosisList', index])?.setValue(selected);
     const diagnosisFormArray = this.generalDiagnosisForm.get(
       'provisionalDiagnosisList'
     ) as FormArray;
     const diagnosisFormGroup = diagnosisFormArray.at(index) as FormGroup;
 

src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html

@@ -22,7 +22,7 @@ <h4 *ngIf="!enableProvisionalDiag">
                 <mat-form-field class="input-full-width" appearance="fill">
                   <mat-label>{{ current_language_set?.casesheet?.provisionalDiag }}</mat-label>
                   <input matInput type="text" autocomplete="off" name="viewProvisionalDiagnosisProvided"
-                    formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" required #diagnosisInput
+                    formControlName="viewProvisionalDiagnosisProvided" minlength="3" maxlength="100" #diagnosisInput
                     [matAutocomplete]="autoDiagnosis" (keyup)="onDiagnosisInputKeyup(diagnosisInput.value, i)" />
                 </mat-form-field>
 

src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts

@@ -73,7 +73,7 @@
     private idrsScoreService: IdrsscoreService,
     private nurseService: NurseService,
     readonly sessionstorage: SessionStorageService,
     private masterdataService: MasterdataService
   ) {}
 
   ngOnInit() {
@@ -220,7 +220,9 @@
         (<FormGroup>diagnosisArrayList.at(i)).controls[
           'viewProvisionalDiagnosisProvided'
         ].disable();
-        this.addDiagnosis();
+        if (diagnosisArrayList.length < savedDiagnosisData.length) {
+          this.addDiagnosis();
+        }
       }
     }
   }

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

@@ -281,9 +281,9 @@ export class PncDiagnosisComponent
       .subscribe((res: any) => {
         if (res && res.statusCode === 200 && res.data && res.data.diagnosis) {
           this.generalDiagnosisForm.patchValue(res.data.diagnosis);
-          if (res.data.diagnosis.provisionalDiagnosisList) {
+          if (res.data.diagnosis) {
             this.patchDiagnosisDetails(
-              res.data.diagnosis.provisionalDiagnosisList,
+              res.data.diagnosis
             );
           }
         }
@@ -297,6 +297,8 @@ export class PncDiagnosisComponent
     this.handleDiagnosisData(diagnosis);
   }
   handleDiagnosisData(diagnosis: any) {
+        console.log("provisionalDiagnosisDataList dia", diagnosis.provisionalDiagnosisList);
+
     if (
       diagnosis.provisionalDiagnosisList &&
       diagnosis.provisionalDiagnosisList.length > 0
@@ -315,23 +317,31 @@ export class PncDiagnosisComponent
     const provisionalDiagnosisList = this.generalDiagnosisForm.controls[
       'provisionalDiagnosisList'
     ] as FormArray;
+
+    console.log("provisionalDiagnosisDataList", provisionalDiagnosisDataList);
+
+
     for (let i = 0; i < provisionalDiagnosisDataList.length; i++) {
       provisionalDiagnosisList.at(i).patchValue({
+        provisionalDiagnosis: provisionalDiagnosisDataList[i].term,
         viewProvisionalDiagnosisProvided: provisionalDiagnosisDataList[i].term,
         term: provisionalDiagnosisDataList[i].term,
         conceptID: provisionalDiagnosisDataList[i].conceptID,
       });
       (<FormGroup>provisionalDiagnosisList.at(i)).controls[
         'viewProvisionalDiagnosisProvided'
       ].disable();
-      this.addProvisionalDiagnosis();
-    }
+      if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length)
+        this.addProvisionalDiagnosis();
+     }
   }
 
   handleConfirmatoryDiagnosisData(confirmatoryDiagnosisDataList: any) {
     const confirmatoryDiagnosisList = this.generalDiagnosisForm.controls[
       'confirmatoryDiagnosisList'
     ] as FormArray;
+        console.log("confirmatoryDiagnosisDataList", confirmatoryDiagnosisDataList);
+
     for (let i = 0; i < confirmatoryDiagnosisDataList.length; i++) {
       confirmatoryDiagnosisList.at(i).patchValue({
         viewConfirmatoryDiagnosisProvided:
@@ -342,9 +352,7 @@ export class PncDiagnosisComponent
       (<FormGroup>confirmatoryDiagnosisList.at(i)).controls[
         'viewConfirmatoryDiagnosisProvided'
       ].disable();
-      if (
-        confirmatoryDiagnosisList.length < confirmatoryDiagnosisDataList.length
-      )
+      if (confirmatoryDiagnosisList.length < confirmatoryDiagnosisDataList.length)
         this.addConfirmatoryDiagnosis();
     }
   }
@@ -448,6 +456,7 @@ export class PncDiagnosisComponent
 
     // Set the nested and top-level fields
     diagnosisFormGroup.patchValue({
+      provisionalDiagnosis: selected?.term || null,
       viewProvisionalDiagnosisProvided: selected,
       conceptID: selected?.conceptID || null,
       term: selected?.term || null,

src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts

@@ -204,27 +204,30 @@ export class FindingsComponent implements OnInit, OnDestroy, DoCheck {
   }
 
   doctorMasterDataSubscription: any;
-  getDoctorMasterData() {
+  getDoctorMasterData() {    
     this.doctorMasterDataSubscription =
       this.masterdataService.nurseMasterData$.subscribe((masterData) => {
         if (masterData) {
           this.chiefComplaintMaster = masterData.chiefComplaintMaster.slice();
           this.chiefComplaintTemporarayList[0] =
             this.chiefComplaintMaster.slice();
 
-          if (this.caseRecordMode === 'view') {
+          if (String(this.caseRecordMode) === 'view') {
             this.beneficiaryRegID =
               this.sessionstorage.getItem('beneficiaryRegID');
             this.visitID = this.sessionstorage.getItem('visitID');
             this.visitCategory = this.sessionstorage.getItem('visitCategory');
 
             const specialistFlagString =
               this.sessionstorage.getItem('specialist_flag');
+
             if (
               this.sessionstorage.getItem('referredVisitCode') ===
                 'undefined' ||
-              this.sessionstorage.getItem('referredVisitCode') === null
+              this.sessionstorage.getItem('referredVisitCode') === null ||
+              this.sessionstorage.getItem('referredVisitCode') === ''
             ) {
+
               this.getFindingDetails(
                 this.beneficiaryRegID,
                 this.visitID,