Added support to check time from global properties

udsm-dhis2-lab · Dec 13, 2024 · e3566ec · e3566ec
1 parent 30c0450
commit e3566ec
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 18 deletions.
diff --git a/ui/src/app/shared/components/clinical-notes/clinical-notes.component.ts b/ui/src/app/shared/components/clinical-notes/clinical-notes.component.ts
@@ -37,6 +37,7 @@ export class ClinicalNotesComponent implements OnInit {
   @Input() provider: any;
   @Input() clinicConfigurations: any;
   @Input() forms: any[];
+  @Input() clearingFormTime?: number;
   savingObservations$: Observable<boolean>;
   ordersUpdates$: Observable<any>;
 
@@ -46,7 +47,7 @@ export class ClinicalNotesComponent implements OnInit {
   currentCustomFormName: string;
   formData: any;
   searchingText: string;
-  clearingFormTime: number;
+
   atLeastOneFieldHasData: boolean = false;
   currentFormHasRequiredData: boolean = false;
   dependedFormHasData: boolean = false;
@@ -64,7 +65,6 @@ export class ClinicalNotesComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    this.clearingFormTime = 0.5;
     this.clinicConfigurations = {
       ...this.clinicConfigurations,
       forms: keyBy(
@@ -90,7 +90,7 @@ export class ClinicalNotesComponent implements OnInit {
       (key) => this.clinicalObservations[key]?.latest
     );
     const concepts = identifyConceptsFromFormattedForm(this.currentCustomForm);
-    this.loadGlobalProperty();
+    // this.loadGlobalProperty();
     // this.currentFormHasRequiredData =
     //   (
     //     Object.keys(this.clinicalObservations).filter(
@@ -187,17 +187,6 @@ export class ClinicalNotesComponent implements OnInit {
     }
   }
 
-  async loadGlobalProperty() {
-    try {
-      const globalProperty = await this.globalSettingService.getSpecificGlobalProperties("ed9dac4a-5b2a-4a5f-8ee2-ca0d88b08506").toPromise();
-      const minutes = parseInt(globalProperty?.value ?? "0", 10);
-      this.clearingFormTime = isNaN(minutes / 60) ? 0.5 : minutes / 60;
-    } catch (error) {
-      console.error("Error occurred:", error);
-      this.clearingFormTime = 0.5; 
-    }
-  }
-
   onCloseMessage(event: Event): void {
     event.stopPropagation();
     this.showMessage = false;

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
@@ -65,9 +65,33 @@
               <mat-icon>arrow_back</mat-icon>
               Back to Client List
             </button>
-            <a mat-icon-button class="mr-4" (click)="toggleSideBarMenu($event)">
+
+            <div class="row">
+              <div *ngFor="let form of dashboardParams?.forms" class="form-button-wrapper">
+                <button
+                class="buttonstyle"
+                  mat-stroked-button
+                  [ngClass]="{
+                    'selected-form':
+                      (selectedForm &&
+                        !showHistoryDetails &&
+                        selectedForm?.uuid === form?.uuid) ||
+                      (!selectedForm &&
+                        !showHistoryDetails &&
+                        dashboardParams?.forms[0] &&
+                        dashboardParams?.forms[0]?.uuid === form?.uuid)
+                  }"
+                  (click)="getSelectedForm($event, form)"
+                >
+                  {{ form?.name }}
+                </button>
+              </div>
+            </div>
+
+
+            <!-- <a mat-icon-button class="mr-4" (click)="toggleSideBarMenu($event)">
               <mat-icon>menu</mat-icon>
-            </a>
+            </a> -->
             <ng-container *ngIf="!useSideBar"> </ng-container>
           </div>
 
@@ -509,6 +533,7 @@
                         [shouldUseOwnFormSelection]="false"
                         [clinicConfigurations]="clinicConfigurations"
                         [provider]="dashboardParams?.provider"
+                        [clearingFormTime]="clearingFormTime"
                         (updateConsultationOrder)="onUpdateConsultationOrder()"
                         [selectedForm]="
                           selectedForm

diff --git a/...rc/app/shared/components/shared-patient-dashboard/shared-patient-dashboard.component.scss b/...rc/app/shared/components/shared-patient-dashboard/shared-patient-dashboard.component.scss
@@ -5,6 +5,9 @@ button:hover {
 button {
   outline: none !important;
 }
+.buttonstyle{
+  margin-left: 10px;
+}
 
 .patient-dashboard-container {
   padding-bottom: 5px;

diff --git a/ui/src/app/shared/components/shared-patient-dashboard/shared-patient-dashboard.component.ts b/ui/src/app/shared/components/shared-patient-dashboard/shared-patient-dashboard.component.ts
@@ -83,6 +83,7 @@ import { GoogleAnalyticsService } from "src/app/google-analytics.service";
 import { SharedRemotePatientHistoryModalComponent } from "../../dialogs/shared-remote-patient-history-modal/shared-remote-patient-history-modal.component";
 import { MatRadioChange } from "@angular/material/radio";
 import { LocationService } from "src/app/core/services";
+import { GlobalSettingService } from "../../resources/global-setting/services";
 
 @Component({
   selector: "app-shared-patient-dashboard",
@@ -156,6 +157,7 @@ export class SharedPatientDashboardComponent implements OnInit {
   tabsToShow: string[] = ["LABORATORY", "PROCEDURE", "RADIOLOGY"];
   currentFormDetails: any = {};
   useSideBar: boolean = false;
+  clearingFormTime: number = 0.5;
 
   selectedHistoryCategory: string = "local";
 
@@ -171,6 +173,7 @@ export class SharedPatientDashboardComponent implements OnInit {
     private userService: UserService,
     private conceptService: ConceptsService,
     private billingService: BillingService,
+    private globalSettingService: GlobalSettingService,
     private googleAnalyticsService: GoogleAnalyticsService,
     private locationService: LocationService
   ) {
@@ -187,7 +190,6 @@ export class SharedPatientDashboardComponent implements OnInit {
           obs?.concept?.uuid === this.visitEndingControlStatusesConceptUuid
       ) || [])[0]?.valueObject;
     }
-    // console.log("Active visit are .............................................",this.activeVisit);
     this.onStartConsultation(this.activeVisit);
     this.store.dispatch(loadOrderTypes());
     this.orderTypes$ = this.store.select(getAllOrderTypes);
@@ -366,9 +368,19 @@ export class SharedPatientDashboardComponent implements OnInit {
     event.stopPropagation();
     this.useSideBar = !this.useSideBar;
   }
+  async loadGlobalProperty() {
+    try {
+      const globalProperty = await this.globalSettingService.getSpecificGlobalProperties("ed9dac4a-5b2a-4a5f-8ee2-ca0d88b08506").toPromise();
+      const minutes = parseInt(globalProperty?.value ?? "0", 10);
+      this.clearingFormTime = isNaN(minutes / 60) ? 0.5 : minutes / 60;
+      console.log("time received :",this.clearingFormTime);
+    } catch (error) {
+      console.error("Error occurred:", error);
+      this.clearingFormTime = 0.5; 
+    }
+  }
 
   onToggleVitalsSummary(event: Event): void {
-    console.log("data tracing ...............");
     console.log(event);
     event.stopPropagation();
     this.trackActionForAnalytics(`View Vitals: Open`);
@@ -377,6 +389,7 @@ export class SharedPatientDashboardComponent implements OnInit {
 
   getSelectedForm(event: Event, form: any): void {
     this.trackActionForAnalytics(`${form?.name}: Open`);
+    this.loadGlobalProperty();
     this.readyForClinicalNotes = false;
     if (event) {
       event.stopPropagation();