Merge pull request #479 from udsm-dhis2-lab/feature/visitdatacheckup

Feature/visitdatacheckup
udsm-dhis2-lab · Nov 16, 2024 · 2c66330 · 2c66330
2 parents 5c503e5 + 04d68cf
commit 2c66330
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 2 deletions.
diff --git a/ui/src/app/modules/billing/pages/billing-list/billing-list.component.html b/ui/src/app/modules/billing/pages/billing-list/billing-list.component.html
@@ -20,7 +20,7 @@
         [isTabularList]="true"
         [filterCategory]="'billing'"
         [orderBy]="'ENCOUNTER'"
-        [orderByDirection]="'ASC'"
+        [orderByDirection]="'DESC'"
         (selectPatient)="onSelectPatient($event)"
       ></app-patient-list>
     </div>

diff --git a/ui/src/app/modules/clinic/pages/clinic-patient-list/clinic-patient-list.component.html b/ui/src/app/modules/clinic/pages/clinic-patient-list/clinic-patient-list.component.html
@@ -46,6 +46,7 @@
               <app-patient-list
                 [isTabularList]="true"
                 [itemsPerPage]="10"
+                [orderByDirection]="'DESC'"
                 [currentLocation]="(currentLocation$ | async)?.id"
                 [orderType]="params?.consultationOrderType"
                 (selectPatient)="onSelectPatient($event)"
@@ -151,6 +152,7 @@
                 [doNotUseLocation]="true"
                 [isTabularList]="true"
                 [itemsPerPage]="10"
+                [orderByDirection]="'DESC'"
                 [orderType]=""
                 (selectPatient)="onSelectPatient($event)"
               ></app-patient-list>

diff --git a/ui/src/app/modules/inpatient/pages/inpatient-home/inpatient-home.component.html b/ui/src/app/modules/inpatient/pages/inpatient-home/inpatient-home.component.html
@@ -45,6 +45,7 @@
             <app-patient-list
               [encounterType]="'e22e39fd-7db2-45e7-80f1-60fa0d5a4378'"
               (selectPatient)="onSelectPatient($event)"
+              [orderByDirection]="'DESC'"
               [shouldShowParentLocation]="true"
               [isTabularList]="true"
             ></app-patient-list>
@@ -95,12 +96,14 @@
         <div *ngIf="!params?.settingCurrentLocationStatus">
           <div class="w-100 text-centered">
             <!-- TODO: Softcode the order uuid -->
+            <!-- 181820aa-88c9-479b-9077-af92f5364329 -->
             <!-- {{ locationsIds$ | async | json }} -->
             <app-patient-list
               [isDischarge]="true"
               [encounterType]="'181820aa-88c9-479b-9077-af92f5364329'"
               (selectPatient)="onSelectPatient($event)"
               [shouldShowParentLocation]="true"
+              [orderByDirection]="'DESC'"
               [isTabularList]="true"
             ></app-patient-list>
           </div>

diff --git a/ui/src/app/modules/inpatient/pages/inpatient-home/inpatient-home.component.ts b/ui/src/app/modules/inpatient/pages/inpatient-home/inpatient-home.component.ts
@@ -85,6 +85,7 @@ export class InpatientHomeComponent implements OnInit {
 
     // console.log("this.currentLocation?.uuid", this.currentLocation);
     this.currentLocation = this.location;
+    console.log("currentLocation ....",this.currentLocation);
     this.bedsUnderCurrentWard$ = this.store.select(getAllBedsUnderCurrentWard, {
       id: this.currentLocation?.uuid,
       tagName: "Bed Location",

diff --git a/...ology/components/patient-radiology-orders-list/patient-radiology-orders-list.component.ts b/...ology/components/patient-radiology-orders-list/patient-radiology-orders-list.component.ts
@@ -66,6 +66,7 @@ export class PatientRadiologyOrdersListComponent implements OnInit {
       this.currentBills,
       this.activeVisit
     );
+    console.log("formattedOrders...",this.activeVisit);
   }
 
   previewPDFData(pdfData) {
@@ -213,4 +214,4 @@ export class PatientRadiologyOrdersListComponent implements OnInit {
         console.log('Save complete');
       }, 2000);
   }
-}
+}
diff --git a/...les/radiology/containers/patient-radiology-orders/patient-radiology-orders.component.scss b/...les/radiology/containers/patient-radiology-orders/patient-radiology-orders.component.scss
@@ -2,3 +2,11 @@
   background-color: #2a8fd1 !important;
   color: #fff !important;
 }
+.patient-profile-sticky {
+  position: sticky;
+  top: 0;
+  width: 100%;
+  padding-top: 20px;
+  box-shadow: 0px 2px 1px -1px rgb(0 0 0 / 20%),
+    0px 1px 1px 0px rgb(0 0 0 / 14%), 0px 1px 3px 0px rgb(0 0 0 / 12%);
+}
diff --git a/ui/src/app/modules/radiology/containers/radiology-home/radiology-home.component.html b/ui/src/app/modules/radiology/containers/radiology-home/radiology-home.component.html
@@ -27,6 +27,7 @@
       [orderType]="'8189dbdd-3f10-11e4-adec-0800271c1b75'"
       [itemsPerPage]="10"
       [isTabularList]="true"
+      [orderByDirection]="'DESC'"
       (selectPatient)="onSelectPatient($event)"
     ></app-patient-list>
   </div>

diff --git a/...rc/app/shared/components/shared-patient-dashboard/shared-patient-dashboard.component.html b/...rc/app/shared/components/shared-patient-dashboard/shared-patient-dashboard.component.html
@@ -53,6 +53,7 @@
           [currentPatient]="dashboardParams?.currentPatient"
         ></app-new-patient-profile>
       </div>
+
       <div class="w-100 patient-other-details-padding">
         <div class="d-flex justify-content-between align-items-center pl-3 pr-3">
           <div class="d-flex justify-content-left">

diff --git a/ui/src/app/shared/helpers/add-bill-status-to-ordered-items.helper.ts b/ui/src/app/shared/helpers/add-bill-status-to-ordered-items.helper.ts
@@ -51,6 +51,7 @@ export function addBillStatusToOrders(orders, bills, visit) {
   const billedItems = flatten(
     (
       bills?.map((bill) => {
+        console.log("bills visit.....",visit)
         return {
           ...bill,
           items: bill?.items?.map((item) => {