@kenyaemr/esm-patient-clinical-view-app 5.4.2-pre.2823 → 5.4.2-pre.2832

package/src/maternal-and-child-health/partography/resources/oxytocin.resource.ts

@@ -17,6 +17,38 @@ export interface SaveOxytocinDataResponse {
   error?: string;
 }
 
+/**
+ * Helper function to extract time from oxytocin observation value
+ */
+function extractTimeFromOxytocinObs(obsValue: any): string {
+  if (!obsValue) {
+    return '';
+  }
+
+  if (typeof obsValue === 'string') {
+    // Handle "Time: HH:MM" format
+    if (obsValue.startsWith('Time:')) {
+      const match = obsValue.match(/Time:\s*(.+)/);
+      if (match) {
+        const time = match[1].trim();
+        // Validate HH:MM format
+        if (time.match(/^\d{1,2}:\d{2}$/)) {
+          return time;
+        }
+      }
+    }
+    // Handle direct HH:MM format
+    if (obsValue.match(/^\d{1,2}:\d{2}$/)) {
+      return obsValue;
+    }
+  } else if (typeof obsValue === 'object' && obsValue && 'display' in obsValue) {
+    // Handle concept object with display property
+    return extractTimeFromOxytocinObs(obsValue.display);
+  }
+
+  return '';
+}
+
 export function useOxytocinData(patientUuid: string) {
   const { t } = useTranslation();
   const encounterRepresentation =
@@ -34,31 +66,72 @@ export function useOxytocinData(patientUuid: string) {
   const sortedEncounters = oxytocinData.sort(
     (a, b) => new Date(b.encounterDatetime).getTime() - new Date(a.encounterDatetime).getTime(),
   );
-  const transformedData = sortedEncounters.map((encounter) => {
-    const observations = encounter.obs || [];
-    const timeObs = observations.find((obs) => obs.concept.uuid === OXYTOCIN_FORM_CONCEPTS.time);
-    const dropsObs = observations.find((obs) => obs.concept.uuid === OXYTOCIN_FORM_CONCEPTS.oxytocinDropsPerMinute);
-    return {
-      uuid: encounter.uuid,
-      encounterDatetime: encounter.encounterDatetime,
-      time: timeObs?.value ? String(timeObs.value) : null,
-      dropsPerMinute: dropsObs?.value ? Number(dropsObs.value) : null,
-      timeDisplay: timeObs?.value ? `${timeObs.value}` : null,
-    };
-  });
-  const existingOxytocinEntries = transformedData
-    .filter((data) => data.time !== null && data.dropsPerMinute !== null)
-    .map((data) => ({ time: data.time!, dropsPerMinute: data.dropsPerMinute! }));
+  const transformedData = sortedEncounters
+    .map((encounter) => {
+      const observations = encounter.obs || [];
+      const timeObs = observations.find((obs) => obs.concept.uuid === OXYTOCIN_FORM_CONCEPTS.time);
+      const dropsObs = observations.find((obs) => obs.concept.uuid === OXYTOCIN_FORM_CONCEPTS.oxytocinDropsPerMinute);
+
+      // Only include encounters that have both time and drops data (indicating genuine oxytocin form submissions)
+      if (!timeObs?.value || !dropsObs?.value) {
+        return null;
+      }
+
+      const timeValue = String(timeObs.value);
+      const dropsValue = Number(dropsObs.value);
+
+      // Additional validation: ensure the time value looks like oxytocin form data
+      const extractedTime = extractTimeFromOxytocinObs(timeValue);
+      if (!extractedTime || !extractedTime.match(/^\d{1,2}:\d{2}$/)) {
+        return null;
+      }
+
+      // Ensure drops per minute is a valid number
+      if (isNaN(dropsValue) || dropsValue < 0) {
+        return null;
+      }
+
+      return {
+        uuid: encounter.uuid,
+        encounterDatetime: encounter.encounterDatetime,
+        time: timeValue,
+        dropsPerMinute: dropsValue,
+        timeDisplay: extractedTime,
+      };
+    })
+    .filter(Boolean) as Array<{
+    uuid: string;
+    encounterDatetime: string;
+    time: string;
+    dropsPerMinute: number;
+    timeDisplay: string;
+  }>;
+
+  const existingOxytocinEntries = transformedData.map((data) => ({
+    time: data.time,
+    dropsPerMinute: data.dropsPerMinute,
+  }));
 
   let localizedError = error;
   if (error) {
     localizedError = t('Failed to load oxytocin data');
   }
 
+  // Transform data for TimePickerDropdown component (format: Array<{ hour: number; time: string }>)
+  const existingTimeEntries = transformedData.map((data) => {
+    const timeStr = data.timeDisplay; // Already extracted and validated above
+    const [hours] = timeStr.split(':').map(Number);
+    return {
+      hour: hours,
+      time: timeStr,
+    };
+  });
+
   return {
     encounters: sortedEncounters,
     oxytocinData: transformedData,
     existingOxytocinEntries,
+    existingTimeEntries, // For TimePickerDropdown component
     isLoading,
     error: localizedError,
     mutate,

package/src/maternal-and-child-health/partography/resources/temperature.resource.ts

@@ -1,12 +1,105 @@
 import useSWR from 'swr';
-import { usePartographyEncounters } from '../partography.resource';
+import { usePartographyEncounters, usePartographyData } from '../partography.resource';
 import { useTranslation } from 'react-i18next';
+import { useMemo } from 'react';
 
 export function useTemperatureData(patientUuid: string) {
   const { encounters, isLoading, error, mutate } = usePartographyEncounters(patientUuid, 'temperature');
   return { data: encounters, isLoading, error, mutate };
 }
 
+export interface TemperatureTimeEntry {
+  hour: number;
+  time: string;
+  encounterDatetime: string;
+  temperature?: number;
+}
+
+export interface UseTemperatureFormDataResult {
+  temperatureData: any[];
+  temperatureTimeEntries: TemperatureTimeEntry[];
+  isLoading: boolean;
+  error: any;
+  mutate: () => void;
+}
+
+/**
+ * Custom hook for temperature-specific data isolation
+ * This ensures temperature form validations only consider temperature data
+ */
+export const useTemperatureFormData = (patientUuid: string): UseTemperatureFormDataResult => {
+  const { data: temperatureEncounters = [], isLoading, error, mutate } = usePartographyData(patientUuid, 'temperature');
+
+  // Extract temperature-specific time entries for form validation
+  const temperatureTimeEntries = useMemo(() => {
+    if (!temperatureEncounters || temperatureEncounters.length === 0) {
+      return [];
+    }
+
+    return temperatureEncounters
+      .map((encounter) => {
+        // Find temperature observation
+        const tempObs = encounter.obs.find((obs) => obs.concept.uuid === '5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA');
+
+        // Find time observation
+        const timeObs = encounter.obs.find(
+          (obs) =>
+            obs.concept.uuid === '160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' &&
+            typeof obs.value === 'string' &&
+            obs.value.startsWith('Time:'),
+        );
+
+        if (!tempObs || !timeObs) {
+          return null; // Skip if no temperature or time data
+        }
+
+        // Extract time from observation value
+        let time = '';
+        if (timeObs && typeof timeObs.value === 'string') {
+          const timeMatch = timeObs.value.match(/Time:\s*(.+)/);
+          if (timeMatch) {
+            time = timeMatch[1].trim();
+          }
+        }
+
+        if (!time || !time.match(/^\d{1,2}:\d{2}$/)) {
+          return null; // Skip if invalid time format
+        }
+
+        // Convert time to hour value for progressive validation
+        const [hours, minutes] = time.split(':').map(Number);
+        const hourValue = hours + minutes / 60; // Convert to decimal hour
+
+        // Extract temperature value
+        let temperature = tempObs?.value ?? null;
+        if (typeof temperature === 'string') {
+          const parsed = parseFloat(temperature);
+          temperature = isNaN(parsed) ? null : parsed;
+        }
+
+        return {
+          hour: hourValue,
+          time: time,
+          encounterDatetime: encounter.encounterDatetime,
+          temperature: typeof temperature === 'number' ? temperature : undefined,
+        };
+      })
+      .filter((entry) => entry !== null)
+      .sort((a, b) => {
+        // Sort by encounter datetime for chronological order
+        return new Date(a!.encounterDatetime).getTime() - new Date(b!.encounterDatetime).getTime();
+      }) as TemperatureTimeEntry[];
+  }, [temperatureEncounters]);
+
+  return {
+    temperatureData: temperatureEncounters,
+    temperatureTimeEntries,
+    isLoading,
+    error,
+    mutate,
+  };
+};
+
 import { PARTOGRAPHY_CONCEPTS } from '../types';
 import { toOmrsIsoString } from '@openmrs/esm-framework';
 
@@ -82,3 +175,47 @@ export function transformTemperatureEncounterToTableData(encounters: any[]): any
   });
   return tableData;
 }
+
+/**
+ * Helper function to convert time string to decimal hour
+ * Example: "14:30" -> 14.5
+ */
+export const convertTimeToHour = (timeString: string): number => {
+  if (!timeString || !timeString.match(/^\d{1,2}:\d{2}$/)) {
+    return 0;
+  }
+
+  const [hours, minutes] = timeString.split(':').map(Number);
+  return hours + minutes / 60;
+};
+
+/**
+ * Helper function to extract time from observation value
+ * Handles various time formats in OpenMRS observations
+ */
+export const extractTimeFromTemperatureObs = (obsValue: any): string => {
+  if (!obsValue) {
+    return '';
+  }
+
+  if (typeof obsValue === 'string') {
+    // Handle "Time: HH:MM" format
+    if (obsValue.startsWith('Time:')) {
+      const match = obsValue.match(/Time:\s*(.+)/);
+      if (match) {
+        const time = match[1].trim();
+        // Validate HH:MM format
+        if (time.match(/^\d{1,2}:\d{2}$/)) {
+          return time;
+        }
+      }
+    }
+
+    // Handle direct HH:MM format
+    if (obsValue.match(/^\d{1,2}:\d{2}$/)) {
+      return obsValue;
+    }
+  }
+
+  return '';
+};