From 0011d46928e29fc1f136d74313e0b0cdc3ced375 Mon Sep 17 00:00:00 2001
From: devikasuresh20 <devika.s36@wipro.com>
Date: Mon, 7 Oct 2024 16:03:49 +0530
Subject: [PATCH 1/8] Workarea related change in nurse module

---
 .../app-modules/nurse-doctor/workarea/workarea.component.ts   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
index 813d860..865e31b 100644
--- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
+++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts
@@ -858,6 +858,10 @@ export class WorkareaComponent
     this.showPNC = false;
     this.showCaseRecord = false;
     this.showRefer = false;
+
+    if (this.attendant === 'nurse') {
+      this.changeDetectorRef.detectChanges();
+    }
   }
 
   submitPatientMedicalDetailsForm(medicalForm: any) {

From 0cc9fdd0b053aa6707bc2f42e26f6be639b3eb40 Mon Sep 17 00:00:00 2001
From: devikasuresh20 <devika.s36@wipro.com>
Date: Thu, 10 Oct 2024 17:15:30 +0530
Subject: [PATCH 2/8] ANC menstrual history changes

---
 .../menstrual-history.component.html             |  1 -
 .../menstrual-history.component.ts               |  3 +++
 .../shared/services/doctor.service.ts            | 16 +++++++++++++++-
 .../shared/services/nurse.service.ts             | 15 ++++++++++++++-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html
index f95971b..da25caf 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.html
@@ -140,7 +140,6 @@
         [min]="minimumLMPDate"
         [max]="today"
         [matDatepicker]="lmpPicker"
-        [disabled]="visitType === 'ANC'"
       />
       <mat-datepicker-toggle
         matSuffix
diff --git a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts
index 54b0bbb..dc80aa8 100644
--- a/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts
+++ b/src/app/app-modules/nurse-doctor/history/general-opd-history/menstrual-history/menstrual-history.component.ts
@@ -152,6 +152,9 @@ export class MenstrualHistoryComponent implements OnInit, DoCheck, OnDestroy {
         return item.name === temp;
       })[0];
       this.menstrualHistoryForm.patchValue({ menstrualCycleStatus: temp });
+      this.menstrualHistoryForm.get('lMPDate')?.disable();
+    } else {
+      this.menstrualHistoryForm.get('lMPDate')?.enable();
     }
   }
 
diff --git a/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts b/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts
index 4290364..323723f 100644
--- a/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts
+++ b/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts
@@ -807,6 +807,14 @@ export class DoctorService {
     const obstetricFormula = JSON.parse(
       JSON.stringify(patientANCForm.controls.obstetricFormulaForm.value),
     );
+
+    if (detailedANC.lmpDate) {
+      const lmpDate = new Date(detailedANC.lmpDate);
+      const adjustedDate = new Date(
+        lmpDate.getTime() - lmpDate.getTimezoneOffset() * 60000,
+      );
+      detailedANC.lmpDate = adjustedDate.toISOString();
+    }
     const combinedANCForm = Object.assign(
       {},
       detailedANC,
@@ -1633,7 +1641,7 @@ export class DoctorService {
   }
 
   updateGeneralMenstrualHistory(menstrualHistory: any, otherDetails: any) {
-    const temp = JSON.parse(JSON.stringify(menstrualHistory.value));
+    const temp = JSON.parse(JSON.stringify(menstrualHistory.getRawValue()));
     if (temp.menstrualCycleStatus) {
       temp.menstrualCycleStatusID =
         '' + temp.menstrualCycleStatus.menstrualCycleStatusID;
@@ -1657,6 +1665,12 @@ export class DoctorService {
       temp.lMPDate === 'Invalid Date'
     ) {
       delete temp['lMPDate'];
+    } else {
+      const lmpDate = new Date(temp.lMPDate);
+      const adjustedDate = new Date(
+        lmpDate.getTime() - lmpDate.getTimezoneOffset() * 60000,
+      );
+      temp.lMPDate = adjustedDate.toISOString();
     }
 
     const menstrualHistoryData = Object.assign({}, temp, otherDetails);
diff --git a/src/app/app-modules/nurse-doctor/shared/services/nurse.service.ts b/src/app/app-modules/nurse-doctor/shared/services/nurse.service.ts
index bb7dd8d..353231d 100644
--- a/src/app/app-modules/nurse-doctor/shared/services/nurse.service.ts
+++ b/src/app/app-modules/nurse-doctor/shared/services/nurse.service.ts
@@ -690,6 +690,13 @@ export class NurseService {
     const obstetricFormula = JSON.parse(
       JSON.stringify(patientANCForm.controls.obstetricFormulaForm.value),
     );
+    if (detailedANC.lmpDate) {
+      const lmpDate = new Date(detailedANC.lmpDate);
+      const adjustedDate = new Date(
+        lmpDate.getTime() - lmpDate.getTimezoneOffset() * 60000,
+      );
+      detailedANC.lmpDate = adjustedDate.toISOString();
+    }
 
     const combinedANCForm = Object.assign({}, detailedANC, {
       beneficiaryRegID: localStorage.getItem('beneficiaryRegID'),
@@ -1223,7 +1230,7 @@ export class NurseService {
 
   postGeneralMenstrualHistory(menstrualHistoryForm: any, otherDetails: any) {
     const menstrualHistoryFormValue = JSON.parse(
-      JSON.stringify(menstrualHistoryForm.value),
+      JSON.stringify(menstrualHistoryForm.getRawValue()),
     );
     const temp = menstrualHistoryFormValue;
     if (temp.menstrualCycleStatus) {
@@ -1245,6 +1252,12 @@ export class NurseService {
 
     if (!temp.lMPDate) {
       temp.lMPDate = undefined;
+    } else {
+      const lmpDate = new Date(temp.lMPDate);
+      const adjustedDate = new Date(
+        lmpDate.getTime() - lmpDate.getTimezoneOffset() * 60000,
+      );
+      temp.lMPDate = adjustedDate.toISOString();
     }
 
     const menstrualHistoryData = Object.assign({}, temp, otherDetails);

From 01392d7f5e829a7f2ba6ef291bc0f29ec97cedac Mon Sep 17 00:00:00 2001
From: devikasuresh20 <devika.s36@wipro.com>
Date: Thu, 24 Oct 2024 14:53:29 +0530
Subject: [PATCH 3/8] File upload changes

---
 .../lab/workarea/workarea.component.ts        | 18 ++++++++----------
 .../upload-files/upload-files.component.ts    | 19 ++++++++-----------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/app/app-modules/lab/workarea/workarea.component.ts b/src/app/app-modules/lab/workarea/workarea.component.ts
index 4e048cb..4807036 100644
--- a/src/app/app-modules/lab/workarea/workarea.component.ts
+++ b/src/app/app-modules/lab/workarea/workarea.component.ts
@@ -965,16 +965,14 @@ export class WorkareaComponent
     });
     dialogRef.afterClosed().subscribe((result: any) => {
       if (result) {
-        this.labService.viewFileContent(result).subscribe((res: any) => {
-          const blob = new Blob([res], { type: res.type });
-          console.log(blob, 'blob');
-          const url = window.URL.createObjectURL(blob);
-          const a = document.createElement('a');
-          a.href = url;
-          a.download = result.fileName;
-          document.body.appendChild(a);
-          a.click();
-          document.body.removeChild(a);
+        const fileID = {
+          fileID: result,
+        };
+        this.labService.viewFileContent(fileID).subscribe((res: any) => {
+          if (res && res.data && res.data.statusCode === 200) {
+            const fileContent = res.data.data?.response;
+            location.href = fileContent;
+          }
         });
       }
     });
diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts
index 04317b2..816bd0a 100644
--- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts
+++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts
@@ -309,17 +309,14 @@ export class UploadFilesComponent implements OnInit, DoCheck, OnChanges {
     );
     ViewTestReport.afterClosed().subscribe((result) => {
       if (result) {
-        this.labService.viewFileContent(result).subscribe((res: any) => {
-          const blob = new Blob([res], { type: res.type });
-          console.log(blob, 'blob');
-          const url = window.URL.createObjectURL(blob);
-          // window.open(url);
-          const a = document.createElement('a');
-          a.href = url;
-          a.download = result.fileName;
-          document.body.appendChild(a);
-          a.click();
-          document.body.removeChild(a);
+        const fileID = {
+          fileID: result,
+        };
+        this.labService.viewFileContent(fileID).subscribe((res: any) => {
+          if (res && res.data && res.data.statusCode === 200) {
+            const fileContent = res.data.data?.response;
+            location.href = fileContent;
+          }
         });
       }
     });

From e8339b22452352114b25051825491d4d73c154d4 Mon Sep 17 00:00:00 2001
From: devikasuresh20 <devika.s36@wipro.com>
Date: Thu, 24 Oct 2024 16:21:28 +0530
Subject: [PATCH 4/8] Minor changes in file upload

---
 .../view-radiology-uploaded-files.component.html              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/app-modules/lab/view-radiology-uploaded-files/view-radiology-uploaded-files.component.html b/src/app/app-modules/lab/view-radiology-uploaded-files/view-radiology-uploaded-files.component.html
index 18114be..3e4a9f6 100644
--- a/src/app/app-modules/lab/view-radiology-uploaded-files/view-radiology-uploaded-files.component.html
+++ b/src/app/app-modules/lab/view-radiology-uploaded-files/view-radiology-uploaded-files.component.html
@@ -5,6 +5,7 @@ <h4>{{ current_language_set?.coreComponents?.filesClickToDownload }}</h4>
     matDialogClose
     matTooltip="{{ current_language_set?.common?.close }}"
     class="pull-right exit width-20px"
+    aria-label="{{ current_language_set?.common?.close }}"
     >close</mat-icon
   >
 </div>
@@ -29,6 +30,7 @@ <h4 style="text-align: center;">{{current_language_set?.common?.noRecordsFound}}
 </mat-table> -->
 
 <table class="table" aria-describedby="FilesDownload">
+  <th></th>
   <tr *ngIf="fileIds[0] === null">
     <td class="td-style">
       <h4 style="text-align: center">
@@ -38,8 +40,6 @@ <h4 style="text-align: center">
   </tr>
   <ng-container *ngIf="fileIds[0] !== null">
     <tr *ngFor="let fileID of fileIds; let i = index" class="list-style">
-      <td class="td-style"></td>
-      <td class="td-style"></td>
       <td style="text-align: right" class="td-style">{{ i + 1 }}.</td>
       <td
         (click)="openFileContent(fileID)"

From 3b9f338a36e86e2690b3d5e1d2c67a209ac8ee4b Mon Sep 17 00:00:00 2001
From: devikasuresh20 <devika.s36@wipro.com>
Date: Mon, 28 Oct 2024 17:32:01 +0530
Subject: [PATCH 5/8] Diagnosis changes

---
 .../components/diagnosis-search/diagnosis-search.component.html | 2 +-
 .../general-opd-diagnosis/general-opd-diagnosis.component.html  | 2 +-
 .../ncd-screening-diagnosis.component.html                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/app-modules/core/components/diagnosis-search/diagnosis-search.component.html b/src/app/app-modules/core/components/diagnosis-search/diagnosis-search.component.html
index 6650e19..de48dc2 100644
--- a/src/app/app-modules/core/components/diagnosis-search/diagnosis-search.component.html
+++ b/src/app/app-modules/core/components/diagnosis-search/diagnosis-search.component.html
@@ -103,7 +103,7 @@ <h4>{{ currentLanguageSet?.common?.provisionalDiagnosisSelection }}</h4>
       <strong>{{ currentLanguageSet?.common?.noRecordsFound }}</strong>
     </div>
     <mat-paginator
-      [hidden]="diagnosis.data.length > 0"
+      [hidden]="diagnosis.data.length === 0"
       [pageSizeOptions]="[5, 10, 20]"
       [pageSize]="5"
       showFirstLastButtons
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
index 254cc1e..66308f8 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.html
@@ -14,7 +14,7 @@ <h4>{{ current_language_set?.casesheet?.provisionalDiag }}*</h4>
           "
         >
           <ng-container [formGroupName]="i">
-            <div class="col-6 m-t-10">
+            <div class="col-9">
               <mat-form-field class="input-full-width">
                 <input
                   matInput
diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html
index 377adfd..aae40a9 100644
--- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html
+++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html
@@ -18,7 +18,7 @@ <h4 *ngIf="!enableProvisionalDiag">
           "
         >
           <ng-container [formGroupName]="i">
-            <div class="col-6 m-t-10">
+            <div class="col-9">
               <mat-form-field class="input-full-width">
                 <input
                   matInput

From fe9335cba0aafdc752869d78b1fb2e90443d28f6 Mon Sep 17 00:00:00 2001
From: devikasuresh20 <devika.s36@wipro.com>
Date: Wed, 13 Nov 2024 12:01:46 +0530
Subject: [PATCH 6/8] CSS changes for Schedule for TM Screen

---
 .../nurse-doctor/scheduler/scheduler.component.html        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
index 8891f4a..c2be29b 100644
--- a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
+++ b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
@@ -119,7 +119,7 @@ <h4>{{ currentLanguageSet?.common?.scheduler }}</h4>
           <mat-datepicker #schedulerDatePicker></mat-datepicker>
         </mat-form-field>
       </div>
-      <div class="col-xs-12 box" style="margin-top: 15px">
+      <div class="col-xs-12 box">
         <mat-form-field style="width: 60%">
           <mat-label>{{
             currentLanguageSet?.common?.specialization
@@ -187,12 +187,13 @@ <h4>{{ currentLanguageSet?.common?.scheduler }}</h4>
     </div>
   </div>
 
-  <div class="row" style="padding-bottom: 30px">
-    <div class="col-xs-12" *ngIf="selectedSlot && selectedSlot !== null">
+  <div class="row m-b-20">
+    <div cclass="col-xs-12" *ngIf="selectedSlot && selectedSlot !== null">
       <button
         mat-raised-button
         class="mat_blue"
         style="float: right"
+        color="primary"
         id="slot"
         (click)="saveScheduledSlot()"
       >

From ca0dc0a46d0a4ecaa0d67d5769fa3cea5753fd35 Mon Sep 17 00:00:00 2001
From: devikasuresh20 <devika.s36@wipro.com>
Date: Wed, 13 Nov 2024 12:05:58 +0530
Subject: [PATCH 7/8] Minor changes

---
 .../nurse-doctor/scheduler/scheduler.component.html           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
index c2be29b..5d50467 100644
--- a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
+++ b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
@@ -188,7 +188,7 @@ <h4>{{ currentLanguageSet?.common?.scheduler }}</h4>
   </div>
 
   <div class="row m-b-20">
-    <div cclass="col-xs-12" *ngIf="selectedSlot && selectedSlot !== null">
+    <div class="col-xs-12" *ngIf="selectedSlot && selectedSlot !== null">
       <button
         mat-raised-button
         class="mat_blue"
@@ -197,7 +197,7 @@ <h4>{{ currentLanguageSet?.common?.scheduler }}</h4>
         id="slot"
         (click)="saveScheduledSlot()"
       >
-        {{ currentLanguageSet?.common?.submitSlot }}
+        {{ currentLanguageSe  t?.common?.submitSlot }}
       </button>
     </div>
   </div>

From 4e577c01a331be9e84537f9e79ff9514b51d1fa3 Mon Sep 17 00:00:00 2001
From: devikasuresh20 <devika.s36@wipro.com>
Date: Wed, 13 Nov 2024 12:06:43 +0530
Subject: [PATCH 8/8] Minor changes

---
 .../app-modules/nurse-doctor/scheduler/scheduler.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
index 5d50467..0ff8a16 100644
--- a/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
+++ b/src/app/app-modules/nurse-doctor/scheduler/scheduler.component.html
@@ -197,7 +197,7 @@ <h4>{{ currentLanguageSet?.common?.scheduler }}</h4>
         id="slot"
         (click)="saveScheduledSlot()"
       >
-        {{ currentLanguageSe  t?.common?.submitSlot }}
+        {{ currentLanguageSet?.common?.submitSlot }}
       </button>
     </div>
   </div>