@ampath/esm-dha-workflow-app 4.0.0-next.28 → 4.0.0-next.30

package/src/bookings/daily/filters/daily-bookings-filter.component.tsx

@@ -0,0 +1,80 @@
+import React, { useRef } from 'react';
+import { Button, DatePicker, DatePickerInput, Dropdown, type OnChangeData } from '@carbon/react';
+import styles from './daily-bookings-filter.component.scss';
+import { type BookingFilter } from '../../types';
+import { useSession } from '@openmrs/esm-framework';
+
+interface DailyBookingsFilterProps {
+  filterSelected: (filters: BookingFilter) => void;
+}
+const DailyBookingsFilter: React.FC<DailyBookingsFilterProps> = ({ filterSelected }) => {
+  const dateRef = useRef<string>('');
+  const departmentRef = useRef<string>();
+  const session = useSession();
+  const locationUuid = session.sessionLocation.uuid;
+  const handleDateChange = (dateSelected: Date[]) => {
+    dateRef.current = new Date(dateSelected[0]).toISOString().split('T')[0];
+  };
+  const handleDepartmentChange = (selectedDept: OnChangeData<{ text: string }>) => {
+    departmentRef.current = selectedDept.selectedItem.text;
+  };
+  const handeleGenerateFilters = () => {
+    const filters: BookingFilter = {
+      startDate: dateRef.current,
+      department: departmentRef.current,
+      locationUuids: locationUuid,
+    };
+    filterSelected(filters);
+  };
+  return (
+    <>
+      <div className={styles.filterLayout}>
+        <div className={styles.filterRow}>
+          <div className={styles.filterFormGroup}>
+            <DatePicker
+              datePickerType="single"
+              locale="en"
+              onChange={handleDateChange}
+              onClose={() => {}}
+              onOpen={() => {}}
+            >
+              <DatePickerInput id="date-picker-single" labelText="Date" placeholder="mm/dd/yyyy" />
+            </DatePicker>
+          </div>
+          <div className={styles.filterFormGroup}>
+            <Dropdown
+              id="department"
+              invalidText="invalid selection"
+              itemToString={(item) => item.text}
+              onChange={handleDepartmentChange}
+              items={[
+                {
+                  text: 'HIV',
+                },
+                {
+                  text: 'CDM',
+                },
+                {
+                  text: 'ONCOLOGY',
+                },
+              ]}
+              label="Select Department"
+              titleText="Department"
+              type="default"
+              warnText=""
+            />
+          </div>
+        </div>
+        <div className={styles.filterRow}>
+          <div className={styles.filterFormGroup}>
+            <Button kind="primary" onClick={handeleGenerateFilters}>
+              Generate
+            </Button>
+          </div>
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default DailyBookingsFilter;

package/src/bookings/daily/patient-list/daily-bookings-patient-list.component.tsx

@@ -0,0 +1,97 @@
+import React from 'react';
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@carbon/react';
+import { type DailyBookingsResult } from '../../types';
+
+interface DailiyBookingsPatientListProps {
+  patientListData: DailyBookingsResult[];
+}
+const DailiyBookingsPatientList: React.FC<DailiyBookingsPatientListProps> = ({ patientListData }) => {
+  if (!patientListData || patientListData.length === 0) {
+    return <>No Data</>;
+  }
+  return (
+    <>
+      <Table>
+        <TableHead>
+          <TableRow>
+            <TableHeader>No</TableHeader>
+            <TableHeader>CCC Number</TableHeader>
+            <TableHeader>UPI Number</TableHeader>
+            <TableHeader>Program</TableHeader>
+            <TableHeader>RTC Date</TableHeader>
+            <TableHeader>Med Pickup Date</TableHeader>
+            <TableHeader>ARV Start Date</TableHeader>
+            <TableHeader>HIV Disclosure Status</TableHeader>
+            <TableHeader>Height</TableHeader>
+            <TableHeader>Weight</TableHeader>
+            <TableHeader>Stage</TableHeader>
+            <TableHeader>Patient Categorization</TableHeader>
+            <TableHeader>Service Delivery Model</TableHeader>
+            <TableHeader>DSD Model</TableHeader>
+            <TableHeader>CD4 Date</TableHeader>
+            <TableHeader>CD4 Results</TableHeader>
+            <TableHeader>Gender</TableHeader>
+            <TableHeader>Birthdate</TableHeader>
+            <TableHeader>Age</TableHeader>
+            <TableHeader>Patient Name</TableHeader>
+            <TableHeader>Identifiers</TableHeader>
+            <TableHeader>Phone Number</TableHeader>
+            <TableHeader>Latest RTC Date</TableHeader>
+            <TableHeader>Latest VL</TableHeader>
+            <TableHeader>VL Category</TableHeader>
+            <TableHeader>Latest VL Date</TableHeader>
+            <TableHeader>Last Appointment</TableHeader>
+            <TableHeader>Visit Type</TableHeader>
+            <TableHeader>Current Meds</TableHeader>
+            <TableHeader>Covid-19 Vaccination</TableHeader>
+            <TableHeader>TB Screening Date</TableHeader>
+            <TableHeader>TB Screening Result</TableHeader>
+            <TableHeader>Patient Category</TableHeader>
+          </TableRow>
+        </TableHead>
+
+        <TableBody>
+          {patientListData &&
+            patientListData.map((val, index) => (
+              <TableRow key={val.patient_uuid ?? index}>
+                <TableCell>{index + 1}</TableCell>
+                <TableCell>{val.ccc_number}</TableCell>
+                <TableCell>{val.upi_number}</TableCell>
+                <TableCell>{val.program}</TableCell>
+                <TableCell>{val.rtc_date}</TableCell>
+                <TableCell>{val.med_pick_up_date}</TableCell>
+                <TableCell>{val.arv_first_regimen_start_date}</TableCell>
+                <TableCell>{val.hiv_disclosure_status}</TableCell>
+                <TableCell>{val.height}</TableCell>
+                <TableCell>{val.weight}</TableCell>
+                <TableCell>{val.stage}</TableCell>
+                <TableCell>{val.patient_categorization}</TableCell>
+                <TableCell>{val.service_delivery_model}</TableCell>
+                <TableCell>{val.dsd_model}</TableCell>
+                <TableCell>{val.cd4_date}</TableCell>
+                <TableCell>{val.cd4_results}</TableCell>
+                <TableCell>{val.gender}</TableCell>
+                <TableCell>{val.birthdate}</TableCell>
+                <TableCell>{val.age}</TableCell>
+                <TableCell>{val.person_name}</TableCell>
+                <TableCell>{val.identifiers}</TableCell>
+                <TableCell>{val.phone_number}</TableCell>
+                <TableCell>{val.latest_rtc_date}</TableCell>
+                <TableCell>{val.latest_vl}</TableCell>
+                <TableCell>{val.vl_category}</TableCell>
+                <TableCell>{val.latest_vl_date}</TableCell>
+                <TableCell>{val.last_appointment}</TableCell>
+                <TableCell>{val.visit_type}</TableCell>
+                <TableCell>{val.cur_meds}</TableCell>
+                <TableCell>{val.covid_19_vaccination_status}</TableCell>
+                <TableCell>{val.tb_screening_date}</TableCell>
+                <TableCell>{val.tb_screening_result}</TableCell>
+                <TableCell>{val.patient_category}</TableCell>
+              </TableRow>
+            ))}
+        </TableBody>
+      </Table>
+    </>
+  );
+};
+export default DailiyBookingsPatientList;

package/src/bookings/types/index.ts

@@ -0,0 +1,68 @@
+export type BookingFilter = {
+  startDate: string;
+  department: string;
+  locationUuids: string;
+};
+
+export type BookingDto = BookingFilter & {
+  startIndex: string;
+  limit: string;
+};
+
+export type DailyBookingsResult = {
+  ccc_number: string;
+  ovcid_id: string;
+  upi_number: string;
+  program: string;
+  rtc_date: string;
+  med_pick_up_date: string;
+  arv_first_regimen_start_date: string;
+  hiv_disclosure_status: string;
+  height: number;
+  weight: number;
+  stage: number;
+  patient_categorization: string;
+  service_delivery_model: string;
+  dsd_model: string;
+  cd4_date: string;
+  cd4_results: number;
+  patient_uuid: string;
+  gender: string;
+  birthdate: string;
+  age: number;
+  person_name: string;
+  identifiers: string;
+  phone_number: string;
+  latest_rtc_date: string;
+  latest_vl: number;
+  vl_category: string;
+  latest_vl_date: string;
+  last_appointment: string;
+  visit_type: string;
+  cur_meds: string;
+  previous_vl: number;
+  previous_vl_date: string;
+  nearest_center: string;
+  covid_19_vaccination_status: string;
+  sms_consent_provided: string;
+  sms_receive_time: string;
+  sms_delivery_status: string;
+  tb_screening_date: string;
+  patient_category: string;
+  tb_screening_result: string;
+  cervical_screening_date: string;
+  cervical_screening_method: string;
+  cervical_screening_result: string;
+};
+
+export type DailyBookingsReponse = {
+  schemas: any;
+  sqlQuery: string;
+  result: DailyBookingsResult[];
+};
+
+export enum DailyBookingType {
+  Appointments = 'daily-appointments',
+  Visits = 'daily-visits',
+  HasNotReturned = 'daily-has-not-returned',
+}

package/src/config-schema.ts

@@ -1,7 +1,7 @@
 import { Type, validator } from '@openmrs/esm-framework';
 
 export const configSchema = {
-    concepts: {
+  concepts: {
     defaultPriorityConceptUuid: {
       _type: Type.ConceptUuid,
       _default: false,
@@ -77,6 +77,21 @@ export const configSchema = {
       _default: '5089AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
     },
   },
+  subDomainUrl: {
+    _type: Type.String,
+    _description: 'Subdomain e.g training,staging',
+    _default: '',
+  },
+  etlBaseUrl: {
+    _type: Type.String,
+    _description: 'ETL Endpoint',
+    _default: '',
+  },
+  hieBaseUrl: {
+    _type: Type.String,
+    _description: 'HIE Endpoint',
+    _default: '',
+  },
 };
 
 export type Config = {
@@ -118,6 +133,9 @@ export interface ConfigObject {
   showRecommendedVisitTypeTab: boolean;
   visitQueueNumberAttributeUuid: string | null;
   visitTypeResourceUrl: string;
+  subDomainUrl: string;
+  etlBaseUrl: string;
+  hieBaseUrl: string;
   // vitals: VitalsConfigObject;
 }
 

package/src/index.ts

@@ -7,7 +7,7 @@
 import { getAsyncLifecycle, defineConfigSchema, getSyncLifecycle } from '@openmrs/esm-framework';
 import { configSchema } from './config-schema';
 
-const moduleName = '@ampath/openmrs-esm-home-app.js';
+export const moduleName = '@ampath/esm-dha-workflow-app';
 
 const options = {
   featureName: 'Consulation Workflow',

package/src/registry/registry.resource.ts

@@ -1,4 +1,4 @@
-import { HIE_BASE_URL } from '../shared/constants';
+import { getHieBaseUrl } from '../shared/utils/get-base-url';
 import {
   type ClientRegistrySearchRequest,
   type RequestCustomOtpDto,
@@ -25,7 +25,8 @@ async function postJson<T>(url: string, payload: unknown): Promise<T> {
 }
 
 export async function requestCustomOtp(payload: RequestCustomOtpDto): Promise<RequestCustomOtpResponse> {
-  const url = `${HIE_BASE_URL}/client/send-custom-otp`;
+  const hieBaseUrl = await getHieBaseUrl();
+  const url = `${hieBaseUrl}/client/send-custom-otp`;
   const formattedPayload = {
     identificationNumber: payload.identificationNumber,
     identificationType: payload.identificationType,
@@ -35,7 +36,8 @@ export async function requestCustomOtp(payload: RequestCustomOtpDto): Promise<Re
 }
 
 export async function validateCustomOtp(payload: ValidateHieCustomOtpDto): Promise<ValidateCustomOtpResponse> {
-  const url = `${HIE_BASE_URL}/client/validate-custom-otp`;
+  const hieBaseUrl = await getHieBaseUrl();
+  const url = `${hieBaseUrl}/client/validate-custom-otp`;
   const formattedPayload = {
     sessionId: payload.sessionId,
     otp: payload.otp,
@@ -47,7 +49,8 @@ export async function validateCustomOtp(payload: ValidateHieCustomOtpDto): Promi
 export async function fetchClientRegistryData(
   payload: ClientRegistrySearchRequest,
 ): Promise<ClientRegistrySearchResponse> {
-  const url = `${HIE_BASE_URL}/client/search`;
+  const hieBaseUrl = await getHieBaseUrl();
+  const url = `${hieBaseUrl}/client/search`;
   const formattedPayload = {
     identificationNumber: payload.identificationNumber,
     identificationType: payload.identificationType,

package/src/resources/patient-resource.ts

@@ -2,6 +2,7 @@ import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 import { type HieClient, type CreatePatientDto, HieIdentificationType } from '../registry/types';
 import { IdentifierTypesUuids } from './identifier-types';
 import { getAmrsIdentifierTypeUuid } from '../registry/utils/hie-client-adapter';
+import { getSubDomainUrl } from '../shared/utils/get-base-url';
 
 export async function createPatient(payload: CreatePatientDto) {
   return await openmrsFetch(`${restBaseUrl}/patient`, {
@@ -44,8 +45,9 @@ export function generateAmrsCreatePatientIdentifiersPayload(hieClient: HieClient
 }
 
 export async function generateAmrsUniversalIdentifier() {
+  const subDomainUrl = await getSubDomainUrl();
   const abortController = new AbortController();
-  const resp = await openmrsFetch(`https://staging.ampath.or.ke/amrs-id-generator/generateidentifier`, {
+  const resp = await openmrsFetch(`${subDomainUrl}/amrs-id-generator/generateidentifier`, {
     headers: {
       'Content-Type': 'application/json',
     },

package/src/root.component.tsx

@@ -11,6 +11,7 @@ import PharmacyComponent from './pharmacy/pharmacy.component';
 import Consultation from './service-queues/consultation/consultation.component';
 import Dashboard from './dashboard/dashboard.component';
 import AccountingComponent from './accounting/accounting.component';
+import DailyBookings from './bookings/daily/daily-bookings.component';
 
 const Root: React.FC = () => {
   const spaBasePath = window.spaBase;
@@ -32,6 +33,7 @@ const Root: React.FC = () => {
           <Route path="pharmacy" element={<PharmacyComponent />} />
           <Route path="appointments" element={<AppointmentsComponent />} />
           <Route path="accounting" element={<AccountingComponent />} />
+          <Route path="bookings/daily" element={<DailyBookings />} />
           <Route path="*" element={<RegistryComponent />} />
         </Routes>
       </main>

package/src/service-queues/service-queues.resource.ts

@@ -9,8 +9,8 @@ import {
 import dayjs from 'dayjs';
 import useSWR from 'swr';
 import { useMemo } from 'react';
-import { ETL_BASE_URL } from '../shared/constants';
 import { type QueueEntryResult } from '../registry/types';
+import { getEtlBaseUrl } from '../shared/utils/get-base-url';
 
 export function serveQueueEntry(servicePointName: string, ticketNumber: string, status: string) {
   const abortController = new AbortController();
@@ -148,7 +148,8 @@ export async function getServiceQueueByLocationUuid(
   serviceUuid: string,
   locationUuid: string,
 ): Promise<QueueEntryResult[]> {
-  const queueEntryUrl = `${ETL_BASE_URL}/queue-entry`;
+  const etlBaseUrl = await getEtlBaseUrl();
+  const queueEntryUrl = `${etlBaseUrl}/queue-entry`;
   const params = {
     locationUuid: locationUuid,
     serviceUuid: serviceUuid,

package/src/shared/constants/index.ts

@@ -1,3 +1 @@
-export const HIE_BASE_URL = 'https://staging.ampath.or.ke/hie';
-export const OPENMRS_BASE_URL = 'https://staging.ampath.or.ke/openmrs/ws/rest/v1';
-export const ETL_BASE_URL = 'https://staging.ampath.or.ke/etl-staging/etl';
+

package/src/shared/utils/get-base-url.ts

@@ -0,0 +1,17 @@
+import { getConfig } from '@openmrs/esm-framework';
+import { moduleName } from '../..';
+
+export async function getSubDomainUrl() {
+  const { subDomainUrl } = await getConfig(moduleName);
+  return subDomainUrl ?? null;
+}
+
+export async function getEtlBaseUrl() {
+  const { etlBaseUrl } = await getConfig(moduleName);
+  return etlBaseUrl ?? null;
+}
+
+export async function getHieBaseUrl() {
+  const { hieBaseUrl } = await getConfig(moduleName);
+  return hieBaseUrl ?? null;
+}

package/src/side-nav-menu/nav-link-config.ts

@@ -73,4 +73,14 @@ export const navLinksConfig = [
     to: 'bookings',
     title: 'Bookings',
   },
+  {
+    to: 'bookings',
+    title: 'Bookings',
+    children: [
+      {
+        to: 'daily',
+        title: 'Daily',
+      },
+    ],
+  },
 ];

package/src/triage/triage.resource.ts

@@ -1,10 +1,10 @@
 import useSWR from 'swr';
-import { openmrsFetch } from '@openmrs/esm-framework';
+import { openmrsFetch, restBaseUrl } from '@openmrs/esm-framework';
 
 import { type Patient } from './types';
 export default function useTriagePatients(locationUuid: string) {
   const { data, error, isLoading } = useSWR(
-    `https://staging.ampath.or.ke/openmrs/ws/rest/v1/queue-entry?v=custom:(uuid,display,queue:(display,uuid,location:(display,uuid)),status:(display),patient:(uuid,person:(gender,age)))&totalCount=true&isEnded=false&location=${locationUuid}`,
+    `${restBaseUrl}/queue-entry?v=custom:(uuid,display,queue:(display,uuid,location:(display,uuid)),status:(display),patient:(uuid,person:(gender,age)))&totalCount=true&isEnded=false&location=${locationUuid}`,
     (url: string) =>
       openmrsFetch<{
         results: Array<Patient>;