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

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"wrapComponent","route":"case-management"}],"extensions":[{"name":"hiv-care-and-treatment-dashboard-link","component":"hivCareAndTreatmentLink","slot":"patient-chart-dashboard-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-care-and-treatment-dashboard-slot","path":"hiv-care-and-treatment-dashboard","layoutMode":"anchored"}},{"name":"hiv-care-and-treatment-dashboard","slot":"patient-chart-hiv-care-and-treatment-dashboard-slot","component":"hivCareAndTreatment","order":0,"online":true,"offline":false},{"name":"relationship-dashboard-link","component":"relationshipsLink","order":24,"online":true,"offline":false,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-relationship-slot","path":"relationships","layoutMode":"anchored"}},{"name":"relationship-dashboard","slot":"patient-chart-relationship-slot","component":"relationships","order":0,"online":true,"offline":false},{"name":"clinical-encounter-dashboard-link","component":"clinicalEncounterLink","order":25,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-clinical-encounter-slot","path":"clinical-encounter","layoutMode":"anchored"}},{"name":"clinical-encounter-dashboard","slot":"patient-chart-clinical-encounter-slot","component":"clinicalEncounter","order":0,"online":true,"offline":false},{"name":"maternal-and-child-health-dashboard-link","component":"maternalAndChildHealthDashboardLink","order":26,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-maternal-and-child-health-slot","path":"maternal-and-child-health","layoutMode":"anchored"}},{"name":"maternal-and-child-health-dashboard","slot":"patient-chart-maternal-and-child-health-slot","component":"maternalAndChildHealthDashboard","order":0,"online":true,"offline":false},{"name":"maternal-and-child-health-partograph","slot":"maternal-and-child-health-partograph-slot","component":"partograph","order":0,"online":true,"offline":false},{"name":"contact-list-dashboard-link","component":"contactListLink","order":27,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-contact-list-slot","path":"contact-list","layoutMode":"anchored"}},{"name":"contact-list-dashboard","slot":"patient-chart-contact-list-slot","component":"contactList","order":0,"online":true,"offline":false},{"component":"caseManagementDashboardLink","name":"case-management-dashboard-link","meta":{"name":"case-management","title":"Case Management","slot":"case-management-dashboard-slot","path":"/case-management"}},{"name":"wrap-component-view","slot":"case-management-dashboard-slot","component":"wrapComponent","order":2,"online":true,"offline":false},{"name":"case-encounter-link","component":"caseEncounterDashboardLink","order":14,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-case-encounter-slot","path":"case-management-encounters","layoutMode":"anchored"}},{"name":"case-encounter-table","slot":"patient-chart-case-encounter-slot","component":"caseEncounterTable","order":0,"online":true,"offline":false},{"component":"peerCalendarDashboardLink","name":"peer-calendar-dashboard-link","meta":{"name":"peer-calendar","title":"Peer Calendar","slot":"peer-calendar-dashboard-slot","path":"peer-management"}},{"name":"peer-calendar","slot":"peer-calendar-dashboard-slot","component":"peerCalendar","order":0,"online":true,"offline":false},{"name":"special-clinics-dashboard-link","component":"specialClinicsDashboardLink","order":15,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-special-clinics-slot","path":"special-clinics","layoutMode":"anchored"}},{"name":"special-clinics-dashboard","slot":"patient-chart-special-clinics-slot","component":"specialClinicsDashboard","order":0,"online":true,"offline":false},{"name":"patient-complaints","slot":"ewf-patient-summary-slot","component":"patientComplaints","order":0,"online":true,"offline":false}],"modals":[{"name":"birth-date-calculator","component":"birthDateCalculator"},{"name":"relationship-delete-confirm-dialog","component":"relationshipDeleteConfirmialog"},{"name":"end-relationship-dialog","component":"endRelationshipModal"}],"workspaces":[{"name":"contact-list-form","component":"contactListForm","title":"Contact List Form","type":"form"},{"name":"case-management-form","component":"caseManagementForm","title":"Case Management Form","type":"form"},{"name":"add-patient-case-form","component":"addPatientCaseForm","title":"Add patient case Form","type":"form"},{"name":"family-relationship-form","component":"familyRelationshipForm","title":"Family Relationship Form","type":"form"},{"name":"peers-form","component":"peersForm","title":"Add New Peer","type":"form"},{"name":"kenyaemr-cusom-form-entry-workspace","component":"peerCalendarFormEntry","title":"KVP Peer Educator Outreach Calendar","type":"form","width":"extra-wide","canMaximize":true,"canHide":true},{"name":"contact-list-update-form","component":"contactListUpdateForm","title":"Contact List Update Form","type":"form"},{"name":"other-relationship-form","component":"otherRelationshipsForm","title":"Other Relationships Form","type":"form"},{"name":"end-relationship-form","component":"endRelationshipWorkspace","title":"Discontinue relationship form","type":"form"}],"version":"5.4.2-pre.2823"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemr":"^19.0.0"},"pages":[{"component":"wrapComponent","route":"case-management"}],"extensions":[{"name":"hiv-care-and-treatment-dashboard-link","component":"hivCareAndTreatmentLink","slot":"patient-chart-dashboard-slot","meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-hiv-care-and-treatment-dashboard-slot","path":"hiv-care-and-treatment-dashboard","layoutMode":"anchored"}},{"name":"hiv-care-and-treatment-dashboard","slot":"patient-chart-hiv-care-and-treatment-dashboard-slot","component":"hivCareAndTreatment","order":0,"online":true,"offline":false},{"name":"relationship-dashboard-link","component":"relationshipsLink","order":24,"online":true,"offline":false,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-relationship-slot","path":"relationships","layoutMode":"anchored"}},{"name":"relationship-dashboard","slot":"patient-chart-relationship-slot","component":"relationships","order":0,"online":true,"offline":false},{"name":"clinical-encounter-dashboard-link","component":"clinicalEncounterLink","order":25,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-clinical-encounter-slot","path":"clinical-encounter","layoutMode":"anchored"}},{"name":"clinical-encounter-dashboard","slot":"patient-chart-clinical-encounter-slot","component":"clinicalEncounter","order":0,"online":true,"offline":false},{"name":"maternal-and-child-health-dashboard-link","component":"maternalAndChildHealthDashboardLink","order":26,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-maternal-and-child-health-slot","path":"maternal-and-child-health","layoutMode":"anchored"}},{"name":"maternal-and-child-health-dashboard","slot":"patient-chart-maternal-and-child-health-slot","component":"maternalAndChildHealthDashboard","order":0,"online":true,"offline":false},{"name":"maternal-and-child-health-partograph","slot":"maternal-and-child-health-partograph-slot","component":"partograph","order":0,"online":true,"offline":false},{"name":"contact-list-dashboard-link","component":"contactListLink","order":27,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-contact-list-slot","path":"contact-list","layoutMode":"anchored"}},{"name":"contact-list-dashboard","slot":"patient-chart-contact-list-slot","component":"contactList","order":0,"online":true,"offline":false},{"component":"caseManagementDashboardLink","name":"case-management-dashboard-link","meta":{"name":"case-management","title":"Case Management","slot":"case-management-dashboard-slot","path":"/case-management"}},{"name":"wrap-component-view","slot":"case-management-dashboard-slot","component":"wrapComponent","order":2,"online":true,"offline":false},{"name":"case-encounter-link","component":"caseEncounterDashboardLink","order":14,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-case-encounter-slot","path":"case-management-encounters","layoutMode":"anchored"}},{"name":"case-encounter-table","slot":"patient-chart-case-encounter-slot","component":"caseEncounterTable","order":0,"online":true,"offline":false},{"component":"peerCalendarDashboardLink","name":"peer-calendar-dashboard-link","meta":{"name":"peer-calendar","title":"Peer Calendar","slot":"peer-calendar-dashboard-slot","path":"peer-management"}},{"name":"peer-calendar","slot":"peer-calendar-dashboard-slot","component":"peerCalendar","order":0,"online":true,"offline":false},{"name":"special-clinics-dashboard-link","component":"specialClinicsDashboardLink","order":15,"meta":{"columns":1,"columnSpan":1,"slot":"patient-chart-special-clinics-slot","path":"special-clinics","layoutMode":"anchored"}},{"name":"special-clinics-dashboard","slot":"patient-chart-special-clinics-slot","component":"specialClinicsDashboard","order":0,"online":true,"offline":false},{"name":"patient-complaints","slot":"ewf-patient-summary-slot","component":"patientComplaints","order":0,"online":true,"offline":false}],"modals":[{"name":"birth-date-calculator","component":"birthDateCalculator"},{"name":"relationship-delete-confirm-dialog","component":"relationshipDeleteConfirmialog"},{"name":"end-relationship-dialog","component":"endRelationshipModal"}],"workspaces":[{"name":"contact-list-form","component":"contactListForm","title":"Contact List Form","type":"form"},{"name":"case-management-form","component":"caseManagementForm","title":"Case Management Form","type":"form"},{"name":"add-patient-case-form","component":"addPatientCaseForm","title":"Add patient case Form","type":"form"},{"name":"family-relationship-form","component":"familyRelationshipForm","title":"Family Relationship Form","type":"form"},{"name":"peers-form","component":"peersForm","title":"Add New Peer","type":"form"},{"name":"kenyaemr-cusom-form-entry-workspace","component":"peerCalendarFormEntry","title":"KVP Peer Educator Outreach Calendar","type":"form","width":"extra-wide","canMaximize":true,"canHide":true},{"name":"contact-list-update-form","component":"contactListUpdateForm","title":"Contact List Update Form","type":"form"},{"name":"other-relationship-form","component":"otherRelationshipsForm","title":"Other Relationships Form","type":"form"},{"name":"end-relationship-form","component":"endRelationshipWorkspace","title":"Discontinue relationship form","type":"form"}],"version":"5.4.2-pre.2832"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-patient-clinical-view-app",
-  "version": "5.4.2-pre.2823",
+  "version": "5.4.2-pre.2832",
   "description": "Patient clinical view microfrontend for the OpenMRS SPA",
   "keywords": [
     "openmrs"

package/src/maternal-and-child-health/partography/forms/cervix-form.component.tsx

@@ -73,25 +73,49 @@ const CervixForm: React.FC<CervixFormProps> = ({
     };
   }, [existingCervixData]);
 
-  const usedHours = useMemo(() => {
-    if (!selectedHours || selectedHours.length === 0) {
-      return [];
+  // Calculate the latest hour for progressive validation
+  const latestHour = useMemo(() => {
+    if (!existingTimeEntries || existingTimeEntries.length === 0) {
+      return null;
     }
-    return selectedHours;
-  }, [selectedHours]);
+    // Find the maximum hour from existing entries
+    const hours = existingTimeEntries.map((entry) => entry.hour);
+    return Math.max(...hours);
+  }, [existingTimeEntries]);
 
+  // Generate hour options with progressive validation
   const hourOptions = useMemo(() => {
     return Array.from({ length: 24 }, (_, i) => {
       const hourValue = String(i).padStart(2, '0');
-      const isDisabled = usedHours.includes(i);
-      const displayText = isDisabled ? `${hourValue} (used)` : hourValue;
+
+      // Progressive validation: disable if hour is less than or equal to latest hour
+      const isUsed = selectedHours.includes(i);
+      const isBeforeLatest = latestHour !== null && i <= latestHour;
+      const isDisabled = isUsed || isBeforeLatest;
+
+      let displayText = hourValue;
+      if (isUsed) {
+        displayText = `${hourValue} (used)`;
+      } else if (isBeforeLatest) {
+        displayText = `${hourValue} (unavailable)`;
+      }
+
       return {
         value: hourValue,
         text: displayText,
         disabled: isDisabled,
       };
     });
-  }, [usedHours]);
+  }, [selectedHours, latestHour]);
+
+  // Helper text for user guidance
+  const getHourSelectionHelperText = () => {
+    if (latestHour === null) {
+      return t('firstEntryHelp', 'Select the hour for this first cervical measurement');
+    }
+    const nextHour = latestHour + 1;
+    return t('progressiveEntryHelp', `Select hour ${nextHour} or later (latest entry: ${latestHour})`);
+  };
 
   // Clear any errors when form opens
   useEffect(() => {
@@ -114,6 +138,26 @@ const CervixForm: React.FC<CervixFormProps> = ({
       return;
     }
 
+    // Progressive validation: prevent selection of hours before or equal to latest
+    const selectedHour = parseInt(data.hour);
+    if (latestHour !== null && selectedHour <= latestHour) {
+      const nextValidHour = latestHour + 1;
+      setError('hour', {
+        type: 'manual',
+        message: `Please select hour ${nextValidHour} or later. Latest entry was at hour ${latestHour}.`,
+      });
+      return;
+    }
+
+    // Duplicate hour validation
+    if (existingTimeEntries.some((entry) => entry.hour === selectedHour)) {
+      setError('hour', {
+        type: 'manual',
+        message: `Hour ${selectedHour} has already been used. Please select a different hour.`,
+      });
+      return;
+    }
+
     if (!data.time || data.time === '') {
       setError('time', { type: 'manual', message: 'Time selection is required' });
       return;
@@ -218,13 +262,20 @@ const CervixForm: React.FC<CervixFormProps> = ({
                 <Select
                   id="hour-select"
                   labelText="Hour *"
+                  helperText={getHourSelectionHelperText()}
                   value={field.value}
                   onChange={(e) => field.onChange((e.target as HTMLSelectElement).value)}
                   invalid={!!fieldState.error}
                   invalidText={fieldState.error?.message}>
                   <SelectItem value="" text="Select hour" />
                   {hourOptions.map((option) => (
-                    <SelectItem key={option.value} value={option.value} text={option.text} disabled={option.disabled} />
+                    <SelectItem
+                      key={option.value}
+                      value={option.disabled ? '' : option.value}
+                      text={option.text}
+                      disabled={option.disabled}
+                      className={option.disabled ? styles.disabledHourOption : ''}
+                    />
                   ))}
                 </Select>
               )}

package/src/maternal-and-child-health/partography/forms/drugs-iv-fluids-form.component.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, Controller } from 'react-hook-form';
-import { Button, Modal, Grid, Column, Dropdown, TextInput, ButtonSkeleton } from '@carbon/react';
+import { Button, Modal, Grid, Column, Dropdown, TextInput, ButtonSkeleton, Select, SelectItem } from '@carbon/react';
 import { launchWorkspace, useSession, openmrsFetch, showSnackbar } from '@openmrs/esm-framework';
 import { saveDrugOrderData } from '../partography.resource';
 import styles from '../partography-data-form.scss';
@@ -283,18 +283,20 @@ const DrugsIVFluidsForm: React.FC<DrugsIVFluidsFormProps> = ({ isOpen, onClose,
             <Controller
               name="route"
               control={control}
+              rules={{ required: t('routeRequired', 'Please select route') }}
               render={({ field, fieldState }) => (
-                <Dropdown
+                <Select
                   id="route-dropdown"
-                  titleText={t('route', 'Route')}
-                  label={t('selectRoute', 'Select route')}
-                  items={routeOptions}
-                  itemToString={(item) => (item ? item.text : '')}
-                  selectedItem={field.value ? routeOptions.find((opt) => opt.id === field.value) : null}
-                  onChange={({ selectedItem }) => field.onChange(selectedItem?.id || '')}
+                  labelText={t('route', 'Route')}
                   invalid={!!fieldState.error}
                   invalidText={fieldState.error?.message}
-                />
+                  value={field.value}
+                  onChange={(e) => field.onChange(e.target.value)}>
+                  <SelectItem value="" text={t('chooseAnOption', 'Choose an option')} />
+                  {routeOptions.map((option) => (
+                    <SelectItem key={option.id} value={option.id} text={option.text} />
+                  ))}
+                </Select>
               )}
             />
           </Column>
@@ -303,18 +305,20 @@ const DrugsIVFluidsForm: React.FC<DrugsIVFluidsFormProps> = ({ isOpen, onClose,
             <Controller
               name="frequency"
               control={control}
+              rules={{ required: t('frequencyRequired', 'Please select frequency') }}
               render={({ field, fieldState }) => (
-                <Dropdown
+                <Select
                   id="frequency-dropdown"
-                  titleText={t('frequency', 'Frequency')}
-                  label={t('selectFrequency', 'Select frequency')}
-                  items={frequencyOptions}
-                  itemToString={(item) => (item ? item.text : '')}
-                  selectedItem={field.value ? frequencyOptions.find((opt) => opt.id === field.value) : null}
-                  onChange={({ selectedItem }) => field.onChange(selectedItem?.id || '')}
+                  labelText={t('frequency', 'Frequency')}
                   invalid={!!fieldState.error}
                   invalidText={fieldState.error?.message}
-                />
+                  value={field.value}
+                  onChange={(e) => field.onChange(e.target.value)}>
+                  <SelectItem value="" text={t('chooseAnOption', 'Choose an option')} />
+                  {frequencyOptions.map((option) => (
+                    <SelectItem key={option.id} value={option.id} text={option.text} />
+                  ))}
+                </Select>
               )}
             />
           </Column>

package/src/maternal-and-child-health/partography/forms/fetal-heart-rate-form.component.tsx

@@ -55,6 +55,21 @@ const FetalHeartRateForm: React.FC<FetalHeartRateFormProps> = ({
       fetalHeartRate: '',
     },
   });
+
+  // Reset form when it opens
+  React.useEffect(() => {
+    if (isOpen) {
+      reset({
+        hour: '',
+        time: '',
+        fetalHeartRate: '',
+      });
+      clearErrors();
+      setSaveError(null);
+      setSaveSuccess(false);
+    }
+  }, [isOpen, reset, clearErrors]);
+
   const generateHourOptions = () => {
     const options = [];
     // Add 00 hour option first
@@ -73,20 +88,41 @@ const FetalHeartRateForm: React.FC<FetalHeartRateFormProps> = ({
       return null;
     }
     // Find the max hour value from existingTimeEntries (hour is already a number)
-    return Math.max(...existingTimeEntries.map((e) => e.hour));
+    const hours = existingTimeEntries.map((e) => {
+      // Ensure we're working with numbers, not strings
+      const hourNum = typeof e.hour === 'number' ? e.hour : parseFloat(e.hour);
+      return isNaN(hourNum) ? 0 : hourNum;
+    });
+
+    const maxHour = Math.max(...hours);
+    return maxHour;
   }, [existingTimeEntries]);
 
   // Generate hour options, disabling those before the latest entered hour (float comparison)
   const hourOptionsWithDisabled = React.useMemo(() => {
     return generateHourOptions().map((option) => {
       const hourValue = parseFloat(option.value);
+
+      // More precise comparison - disable if hour is less than or equal to latest hour
+      // Use small epsilon to handle floating point precision issues
+      const isDisabled = latestHour !== null && hourValue <= latestHour + 0.001;
+
       return {
         ...option,
-        disabled: latestHour !== null && hourValue <= latestHour,
+        disabled: isDisabled,
+        displayLabel: isDisabled ? `${option.label} (used)` : option.label,
       };
     });
   }, [latestHour]);
 
+  // Helper text for user guidance
+  const getHourSelectionHelperText = () => {
+    if (latestHour === null) {
+      return t('firstEntryHelp', 'Select the hour for this first measurement');
+    }
+    return t('progressiveEntryHelp', `Select an hour after ${latestHour}hr (latest entry)`);
+  };
+
   const handleFormSubmit = async (data: FetalHeartRateFormData) => {
     const hourValue = parseFloat(data.hour);
     const fetalHeartRateValue = parseInt(data.fetalHeartRate);
@@ -99,6 +135,32 @@ const FetalHeartRateForm: React.FC<FetalHeartRateFormProps> = ({
       setError('hour', { type: 'manual', message: t('hourRequired', 'Please select a valid hour') });
       return;
     }
+
+    // Prevent selection of hours before or equal to the latest entry
+    if (latestHour !== null && hourValue <= latestHour) {
+      const nextValidHour = latestHour + 0.5;
+      setError('hour', {
+        type: 'manual',
+        message: t(
+          'hourMustBeAfterLatest',
+          `Hour must be after ${latestHour}hr (latest entry). Please select ${nextValidHour}hr or later.`,
+        ),
+      });
+      return;
+    }
+
+    // Check for exact duplicate hours
+    const isDuplicateHour = existingTimeEntries.some(
+      (entry) => Math.abs(entry.hour - hourValue) < 0.001, // Handle floating point precision
+    );
+
+    if (isDuplicateHour) {
+      setError('hour', {
+        type: 'manual',
+        message: t('duplicateHour', `${hourValue}hr has already been used. Please select a different hour.`),
+      });
+      return;
+    }
     if (!data.time || data.time.trim() === '') {
       setError('time', { type: 'manual', message: t('timeRequired', 'Time is required') });
       return;
@@ -220,18 +282,20 @@ const FetalHeartRateForm: React.FC<FetalHeartRateFormProps> = ({
               render={({ field, fieldState }) => (
                 <Select
                   id="hour-select"
-                  labelText={t('hour', 'Hour')}
+                  labelText={t('hour', 'Hour *')}
+                  helperText={getHourSelectionHelperText()}
                   invalid={!!fieldState.error}
                   invalidText={fieldState.error?.message}
                   value={field.value}
                   onChange={(e) => field.onChange(e.target.value)}>
-                  <SelectItem value="" text={t('admissionTime', 'Admission')} />
+                  <SelectItem value="" text={t('selectHour', 'Select hour')} />
                   {hourOptionsWithDisabled.map((option) => (
                     <SelectItem
                       key={option.value}
-                      value={option.value}
-                      text={option.label}
+                      value={option.disabled ? '' : option.value}
+                      text={option.displayLabel}
                       disabled={option.disabled}
+                      className={option.disabled ? styles.disabledHourOption : ''}
                     />
                   ))}
                 </Select>

package/src/maternal-and-child-health/partography/forms/membrane-amniotic-fluid-form.component.tsx

@@ -74,8 +74,17 @@ const MembraneAmnioticFluidForm: React.FC<MembraneAmnioticFluidFormProps> = ({
     if (!existingTimeEntries || existingTimeEntries.length === 0) {
       return null;
     }
-    // Convert timeSlot values to numeric hours and find the maximum
-    const hours = existingTimeEntries.map((entry) => parseFloat(entry.timeSlot || '0')).filter((hour) => !isNaN(hour)); // Filter out invalid values
+    // Convert exactTime values to decimal hours and find the maximum
+    const hours = existingTimeEntries
+      .map((entry) => {
+        const time = entry.exactTime || '00:00';
+        if (time.match(/^\d{1,2}:\d{2}$/)) {
+          const [hours, minutes] = time.split(':').map(Number);
+          return hours + minutes / 60; // Convert to decimal hour
+        }
+        return 0;
+      })
+      .filter((hour) => hour > 0); // Filter out invalid values
 
     return hours.length > 0 ? Math.max(...hours) : null;
   }, [existingTimeEntries]);
@@ -108,6 +117,12 @@ const MembraneAmnioticFluidForm: React.FC<MembraneAmnioticFluidFormProps> = ({
     if (!data.exactTime || data.exactTime.trim() === '') {
       setError('exactTime', { type: 'manual', message: t('exactTimeRequired', 'Exact time is required') });
       hasErrors = true;
+    } else if (!data.exactTime.match(/^\d{1,2}:\d{2}$/)) {
+      setError('exactTime', {
+        type: 'manual',
+        message: t('exactTimeFormat', 'Time must be in HH:MM format (e.g., 14:30)'),
+      });
+      hasErrors = true;
     }
 
     // Validate amniotic fluid selection
@@ -137,11 +152,12 @@ const MembraneAmnioticFluidForm: React.FC<MembraneAmnioticFluidFormProps> = ({
     const selectedHour = parseFloat(data.timeSlot);
 
     if (latestUsedHour !== null && selectedHour <= latestUsedHour) {
+      const nextValidHour = latestUsedHour + 0.5;
       setError('timeSlot', {
         type: 'manual',
         message: t(
           'timeSlotDisabled',
-          `Cannot select ${data.timeSlot}hr. Please select a time after ${latestUsedHour}hr.`,
+          `Cannot select ${data.timeSlot}hr. Please select ${nextValidHour}hr or later (latest entry: ${latestUsedHour}hr).`,
         ),
       });
       alert(t('timeSlotValidationError', 'Please select a valid time slot that comes after the previous entry.'));
@@ -259,10 +275,17 @@ const MembraneAmnioticFluidForm: React.FC<MembraneAmnioticFluidFormProps> = ({
                     labelText=""
                     value={field.value}
                     onChange={field.onChange}
-                    existingTimeEntries={existingTimeEntries.map((e) => ({
-                      hour: parseInt((e.exactTime || '00:00').split(':')[0] || '0', 10) || 0,
-                      time: e.exactTime || '',
-                    }))}
+                    existingTimeEntries={existingTimeEntries.map((e) => {
+                      // Convert exactTime to proper hour and time format for TimePickerDropdown
+                      const time = e.exactTime || '00:00';
+                      const [hours, minutes] = time.split(':').map(Number);
+                      const hourValue = hours + minutes / 60; // Convert to decimal hour
+
+                      return {
+                        hour: hourValue,
+                        time: time,
+                      };
+                    })}
                     invalid={!!fieldState.error}
                     invalidText={fieldState.error?.message}
                   />

package/src/maternal-and-child-health/partography/forms/urine-test-form.component.tsx

@@ -1,7 +1,8 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, Controller } from 'react-hook-form';
 import { Button, Modal, Grid, Column, Select, SelectItem, NumberInput } from '@carbon/react';
+import { type OpenmrsResource } from '@openmrs/esm-framework';
 import TimePickerDropdown from './time-picker-dropdown.component';
 import styles from '../partography-data-form.scss';
 
@@ -26,13 +27,18 @@ type UrineTestFormProps = {
     timeResultsReturned: string;
   }) => void;
   onDataSaved?: () => void;
-  existingTimeEntries?: Array<{ hour: number; time: string }>;
+  encounters: OpenmrsResource[];
+  isLoading?: boolean;
+  error?: Error | null;
   patient?: {
     uuid: string;
     name: string;
     gender: string;
     age: string;
   };
+  // Add time arrays for progressive validation
+  sampleCollectedTimes: string[];
+  resultsReturnedTimes: string[];
 };
 
 const UrineTestForm: React.FC<UrineTestFormProps> = ({
@@ -40,17 +46,24 @@ const UrineTestForm: React.FC<UrineTestFormProps> = ({
   onClose,
   onSubmit,
   onDataSaved,
-  existingTimeEntries = [],
+  encounters,
+  isLoading = false,
+  error = null,
   patient,
+  sampleCollectedTimes,
+  resultsReturnedTimes,
 }) => {
   const { t } = useTranslation();
 
+  // Time arrays are now passed as props from parent component
+
   const {
     control,
     handleSubmit,
     reset,
     setError,
     clearErrors,
+    watch,
     formState: { errors },
   } = useForm<UrineTestFormData>({
     defaultValues: {
@@ -62,9 +75,42 @@ const UrineTestForm: React.FC<UrineTestFormProps> = ({
     },
   });
 
+  // Watch both time fields for cross-validation
+  const watchedTimeSampleCollected = watch('timeSampleCollected');
+  const watchedTimeResultsReturned = watch('timeResultsReturned');
+
+  // Generate SEPARATE time entries for each field's independent progressive validation
+  const sampleCollectedTimeEntries = useMemo(() => {
+    return sampleCollectedTimes.map((time) => {
+      const [hours] = time.split(':').map(Number);
+      return {
+        hour: hours,
+        time: time,
+      };
+    });
+  }, [sampleCollectedTimes]);
+
+  const resultsReturnedTimeEntries = useMemo(() => {
+    return resultsReturnedTimes.map((time) => {
+      const [hours] = time.split(':').map(Number);
+      return {
+        hour: hours,
+        time: time,
+      };
+    });
+  }, [resultsReturnedTimes]);
+
+  // Helper function to convert time string to minutes for comparison
+  const timeToMinutes = (timeString: string): number => {
+    const [hours, minutes] = timeString.split(':').map(Number);
+    return hours * 60 + minutes;
+  };
+
   const onSubmitForm = async (data: UrineTestFormData) => {
     const volumeValue = parseFloat(data.volume);
     clearErrors();
+
+    // Basic field validation
     if (!data.protein) {
       setError('protein', {
         type: 'manual',
@@ -101,6 +147,18 @@ const UrineTestForm: React.FC<UrineTestFormProps> = ({
       return;
     }
 
+    // Cross-validation: Results time must be >= sample collection time
+    const sampleTime = timeToMinutes(data.timeSampleCollected);
+    const resultsTime = timeToMinutes(data.timeResultsReturned);
+
+    if (resultsTime < sampleTime) {
+      setError('timeResultsReturned', {
+        type: 'manual',
+        message: t('timeResultsInvalid', 'Results return time must be after or equal to sample collection time'),
+      });
+      return;
+    }
+
     onSubmit({
       timeSlot: data.timeSampleCollected,
       exactTime: data.timeSampleCollected,
@@ -182,7 +240,7 @@ const UrineTestForm: React.FC<UrineTestFormProps> = ({
                   onChange={field.onChange}
                   invalid={!!errors.timeSampleCollected}
                   invalidText={errors.timeSampleCollected?.message}
-                  existingTimeEntries={existingTimeEntries}
+                  existingTimeEntries={sampleCollectedTimeEntries}
                 />
               )}
             />
@@ -200,7 +258,6 @@ const UrineTestForm: React.FC<UrineTestFormProps> = ({
                   onChange={(e) => field.onChange(e.target.value)}
                   invalid={!!errors.acetone}
                   invalidText={errors.acetone?.message}>
-                  <SelectItem value="" text={t('selectAcetone', 'Pull from Lab module')} />
                   {acetoneOptions.map((option) => (
                     <SelectItem key={option.value} value={option.value} text={option.label} />
                   ))}
@@ -242,7 +299,7 @@ const UrineTestForm: React.FC<UrineTestFormProps> = ({
                   onChange={field.onChange}
                   invalid={!!errors.timeResultsReturned}
                   invalidText={errors.timeResultsReturned?.message}
-                  existingTimeEntries={existingTimeEntries}
+                  existingTimeEntries={resultsReturnedTimeEntries}
                 />
               )}
             />