@kenyaemr/esm-patient-clinical-view-app 5.4.2-pre.2793 → 5.4.2-pre.2803

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.2793"}
+{"$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.2803"}

package/package.json

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

package/src/config-schema.ts

@@ -2,6 +2,7 @@ export const FETAL_HEART_RATE_GRAPH_UUIDS = {
   fetalHeartRate: 'FETAL_HEART_RATE_CONCEPT',
   fetalHeartRateHour: 'FETAL_HEART_RATE_HOUR_CONCEPT',
   fetalHeartRateTime: 'FETAL_HEART_RATE_TIME_CONCEPT',
+  fetalHeartRateNew: 'FETAL_HEART_RATE_NEW_CONCEPT',
 };
 import { Type } from '@openmrs/esm-framework';
 import _default from 'react-hook-form/dist/logic/appendErrors';
@@ -447,7 +448,7 @@ export const AMNIOTIC_ABSENT_CONCEPT = '163747AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const AMNIOTIC_BLOOD_STAINED_CONCEPT = '1077AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const AMNIOTIC_MEMBRANE_INTACT_CONCEPT = 'd1787a76-7310-4223-a645-9fd410d418c1';
 
-// Cervical Contractions Graph
+//Contractions Graph
 export const UTERINE_CONTRACTIONS_CONCEPT = '163750AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const CONTRACTION_LEVEL_MILD_CONCEPT = '1498AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const CONTRACTION_LEVEL_MODERATE_CONCEPT = '1499AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
@@ -456,12 +457,15 @@ export const UTERINE_CONTRACTION_FREQUENCY_CONCEPT = '166529AAAAAAAAAAAAAAAAAAAA
 export const UTERINE_CONTRACTION_DURATION_CONCEPT = '159368AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 
 // Oxytocin Graph
+
+export const OXYTOCIN_TIME_CONCEPT = 'bb3724c9-fbcc-49c5-9702-6cde0be325ca';
+export const OXYTOCIN_DROPS_PER_MINUTE_CONCEPT = '1d109b10-7b30-4bfa-8a7c-6ecb73357fc2';
 export const OXYTOCIN_DOSE_CONCEPT = '81369AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const ROUTE_CONCEPT = '8878f9c0-a1ce-47ec-a88f-69ef0f6576ba';
 export const FREQUENCY_CONCEPT = 'fd9f82fd-f327-4502-ac8e-5d9144dbd504';
 
 // Drugs IV Fluids Graph
-export const MEDICATION_CONCEPT = '1282AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const MEDICATION_CONCEPT = 'c3082af8-f935-40c5-aa5b-74c684e81aea';
 export const IV_FLUIDS_CONCEPT = '161911AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const DOSAGE_CONCEPT = 'b71ddb80-2d7f-4bde-a44b-236e62d4c1b6';
 export const DRUG_DOSE_CONCEPT = '162384AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
@@ -478,6 +482,8 @@ export const GLUCOSE_LEVEL_CONCEPT = '887AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const KETONE_LEVEL_CONCEPT = '165438AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const URINE_VOLUME_CONCEPT = '159660AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const URINE_CHARACTERISTICS_CONCEPT = '56AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const TIME_RESULTS_RETURNED = '67c3d4c6-465e-4c12-9b7f-d8587ca90603';
+export const TIME_SAMPLE_COLLECTED = 'c554f157-2e16-4585-af29-c48f5e765ce0';
 
 // Cervix / Cervical Monitoring During Labor
 export const CERVIX_CONCEPT = '162261AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';

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

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, Controller } from 'react-hook-form';
 import { contractionLevelOptions as baseContractionLevelOptions } from '../types';
-import { Modal, Dropdown } from '@carbon/react';
+import { Modal, Select, SelectItem } from '@carbon/react';
 import styles from '../partography.scss';
 
 type CervicalContractionsFormData = {
@@ -56,6 +56,8 @@ const CervicalContractionsForm: React.FC<CervicalContractionsFormProps> = ({
   const handleFormSubmit = async (data: CervicalContractionsFormData) => {
     clearErrors();
     let hasErrors = false;
+
+    // Validate contraction level
     if (!data.contractionLevel || data.contractionLevel.trim() === '') {
       setError('contractionLevel', {
         type: 'manual',
@@ -63,15 +65,58 @@ const CervicalContractionsForm: React.FC<CervicalContractionsFormProps> = ({
       });
       hasErrors = true;
     }
+
+    // Validate contraction count
     if (!data.contractionCount || data.contractionCount.trim() === '') {
       setError('contractionCount', {
         type: 'manual',
         message: t('contractionCountRequired', 'Please select number of contractions'),
       });
       hasErrors = true;
+    } else {
+      const countValue = parseInt(data.contractionCount);
+      if (isNaN(countValue) || countValue < 1 || countValue > 5) {
+        setError('contractionCount', {
+          type: 'manual',
+          message: t('contractionCountRange', 'Contraction count must be between 1 and 5'),
+        });
+        hasErrors = true;
+      }
     }
+
+    // Clinical validation warnings
+    if (!hasErrors) {
+      const countValue = parseInt(data.contractionCount);
+
+      // Warning for high contraction frequency
+      if (countValue >= 5) {
+        const proceedWithHighFrequency = window.confirm(
+          t(
+            'highContractionWarning',
+            'High contraction frequency (5 per 10 minutes) detected. This may indicate hyperstimulation. Do you want to proceed?',
+          ),
+        );
+        if (!proceedWithHighFrequency) {
+          return;
+        }
+      }
+
+      // Warning for strong contractions with high frequency
+      if (data.contractionLevel === 'strong' && countValue >= 4) {
+        const proceedWithIntensePattern = window.confirm(
+          t(
+            'intenseContractionWarning',
+            'Strong contractions with high frequency detected. This requires close monitoring. Do you want to proceed?',
+          ),
+        );
+        if (!proceedWithIntensePattern) {
+          return;
+        }
+      }
+    }
+
     if (hasErrors) {
-      alert(t('formValidationError', 'Please select both contraction level and count before submitting.'));
+      alert(t('formValidationError', 'Please correct the validation errors before submitting.'));
       return;
     }
     const currentTime = new Date().toLocaleTimeString('en-GB', {
@@ -111,7 +156,7 @@ const CervicalContractionsForm: React.FC<CervicalContractionsFormProps> = ({
       preventCloseOnClickOutside={isSaving}>
       <div className={styles.contractionsFormContainer} style={{ maxWidth: 600, margin: 0, padding: '0 8px' }}>
         <h3 className={styles.sectionTitle} style={{ marginBottom: 0 }}>
-          {t('cervicalContractionsData', 'Cervical Contractions')}
+          {t('cervicalContractionsData', 'Contractions')}
         </h3>
 
         <Controller
@@ -162,31 +207,21 @@ const CervicalContractionsForm: React.FC<CervicalContractionsFormProps> = ({
             rules={{ required: t('contractionCountRequired', 'Please select number of contractions') }}
             render={({ field, fieldState }) => (
               <>
-                <Dropdown
-                  id="contraction-count-dropdown"
-                  titleText=""
-                  label={t('chooseCount', 'Choose count')}
-                  items={[
-                    { id: '1', text: t('oneContraction', '1 contraction') },
-                    { id: '2', text: t('twoContractions', '2 contractions') },
-                    { id: '3', text: t('threeContractions', '3 contractions') },
-                    { id: '4', text: t('fourContractions', '4 contractions') },
-                    { id: '5', text: t('fiveContractions', '5 contractions') },
-                  ]}
-                  itemToString={(item) => (item ? item.text : '')}
-                  selectedItem={
-                    field.value
-                      ? {
-                          id: field.value,
-                          text: `${field.value} contraction${field.value === '1' ? '' : 's'}`,
-                        }
-                      : null
-                  }
-                  onChange={({ selectedItem }) => field.onChange(selectedItem?.id || '')}
-                  className={styles.contractionCountDropdown}
-                  style={{ minWidth: 280, borderRadius: 24, background: '#eee', fontWeight: 600 }}
-                />
-                {fieldState.error && <div className={styles.errorMessage}>{fieldState.error.message}</div>}
+                <Select
+                  id="contraction-count-select"
+                  value={field.value}
+                  onChange={(e) => field.onChange(e.target.value)}
+                  invalid={!!fieldState.error}
+                  invalidText={fieldState.error?.message}
+                  style={{ minWidth: 280 }}
+                  helperText={t('contractionCountHelper', 'Normal range: 2-4 contractions per 10 minutes')}>
+                  <SelectItem value="" text={t('chooseAnOption', 'Choose an option')} />
+                  <SelectItem value="1" text={t('oneContraction', '1 contraction')} />
+                  <SelectItem value="2" text={t('twoContractions', '2 contractions')} />
+                  <SelectItem value="3" text={t('threeContractions', '3 contractions')} />
+                  <SelectItem value="4" text={t('fourContractions', '4 contractions')} />
+                  <SelectItem value="5" text={t('fiveContractions', '5 contractions (High - Monitor closely)')} />
+                </Select>
               </>
             )}
           />

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

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { useMemo, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, Controller } from 'react-hook-form';
 import { Button, Modal, Grid, Column, NumberInput, Select, SelectItem } from '@carbon/react';
@@ -40,7 +40,14 @@ const CervixForm: React.FC<CervixFormProps> = ({
 }) => {
   const { t } = useTranslation();
 
-  const { control, handleSubmit, reset, setError, clearErrors } = useForm<CervixFormData>({
+  const {
+    control,
+    handleSubmit,
+    reset,
+    setError,
+    clearErrors,
+    formState: { errors },
+  } = useForm<CervixFormData>({
     defaultValues: {
       hour: '',
       time: '',
@@ -86,37 +93,39 @@ const CervixForm: React.FC<CervixFormProps> = ({
     });
   }, [usedHours]);
 
+  // Clear any errors when form opens
+  useEffect(() => {
+    if (isOpen) {
+      reset({
+        hour: '',
+        time: '',
+        cervicalDilation: '',
+        descent: '',
+      });
+      clearErrors();
+    }
+  }, [isOpen, clearErrors, reset]);
   const onSubmitForm = async (data: CervixFormData) => {
+    clearErrors();
+
+    // Basic validation
     if (!data.hour || data.hour === '') {
-      setError('hour', {
-        type: 'manual',
-        message: 'Hour selection is required',
-      });
+      setError('hour', { type: 'manual', message: 'Hour selection is required' });
       return;
     }
 
     if (!data.time || data.time === '') {
-      setError('time', {
-        type: 'manual',
-        message: 'Time selection is required',
-      });
-      console.warn('[CervixForm] Attempted to submit with empty time value:', data);
+      setError('time', { type: 'manual', message: 'Time selection is required' });
       return;
     }
 
     if (!data.cervicalDilation || data.cervicalDilation === '') {
-      setError('cervicalDilation', {
-        type: 'manual',
-        message: 'Cervical dilation is required',
-      });
+      setError('cervicalDilation', { type: 'manual', message: 'Cervical dilation is required' });
       return;
     }
 
     if (!data.descent || data.descent === '') {
-      setError('descent', {
-        type: 'manual',
-        message: 'Descent of head is required',
-      });
+      setError('descent', { type: 'manual', message: 'Descent of head is required' });
       return;
     }
 
@@ -125,26 +134,17 @@ const CervixForm: React.FC<CervixFormProps> = ({
     const descentOfHead = parseInt(data.descent);
 
     if (isNaN(hourValue)) {
-      setError('hour', {
-        type: 'manual',
-        message: 'Invalid hour value',
-      });
+      setError('hour', { type: 'manual', message: 'Invalid hour value' });
       return;
     }
 
     if (isNaN(cervicalDilation)) {
-      setError('cervicalDilation', {
-        type: 'manual',
-        message: 'Invalid cervical dilation value',
-      });
+      setError('cervicalDilation', { type: 'manual', message: 'Invalid cervical dilation value' });
       return;
     }
 
     if (isNaN(descentOfHead)) {
-      setError('descent', {
-        type: 'manual',
-        message: 'Invalid descent of head value',
-      });
+      setError('descent', { type: 'manual', message: 'Invalid descent of head value' });
       return;
     }
 
@@ -157,33 +157,21 @@ const CervixForm: React.FC<CervixFormProps> = ({
     }
 
     if (cervicalDilation > 10) {
-      setError('cervicalDilation', {
-        type: 'manual',
-        message: 'Cervical dilation cannot exceed 10cm',
-      });
+      setError('cervicalDilation', { type: 'manual', message: 'Cervical dilation cannot exceed 10cm' });
       return;
     }
 
     if (descentOfHead < 1) {
-      setError('descent', {
-        type: 'manual',
-        message: 'Descent of head cannot be less than 1 (most descended)',
-      });
+      setError('descent', { type: 'manual', message: 'Descent of head cannot be less than 1 (most descended)' });
       return;
     }
+
     if (descentOfHead > 5) {
-      setError('descent', {
-        type: 'manual',
-        message: 'Descent of head cannot exceed 5',
-      });
+      setError('descent', { type: 'manual', message: 'Descent of head cannot exceed 5' });
       return;
     }
 
-    clearErrors();
-    if (!data.time || data.time.trim() === '') {
-      alert('Time cannot be empty. Please select a valid time.');
-      return;
-    }
+    // All validation passed, submit the form
     onSubmit({
       hour: hourValue,
       time: data.time,
@@ -197,6 +185,7 @@ const CervixForm: React.FC<CervixFormProps> = ({
 
   const handleClose = () => {
     reset();
+    clearErrors();
     onClose();
   };
 
@@ -225,9 +214,6 @@ const CervixForm: React.FC<CervixFormProps> = ({
             <Controller
               name="hour"
               control={control}
-              rules={{
-                required: 'Hour selection is required',
-              }}
               render={({ field, fieldState }) => (
                 <Select
                   id="hour-select"
@@ -248,9 +234,6 @@ const CervixForm: React.FC<CervixFormProps> = ({
             <Controller
               name="time"
               control={control}
-              rules={{
-                required: 'Time selection is required',
-              }}
               render={({ field, fieldState }) => (
                 <TimePickerDropdown
                   id="time-input"
@@ -269,40 +252,20 @@ const CervixForm: React.FC<CervixFormProps> = ({
             <Controller
               name="cervicalDilation"
               control={control}
-              rules={{
-                required: 'Cervical dilation is required',
-                validate: {
-                  isNumber: (value) => !isNaN(parseFloat(value)) || 'Must be a valid number',
-                  minValue: (value) => {
-                    const numValue = parseFloat(value);
-                    return (
-                      numValue >= validationLimits.cervicalDilationMin ||
-                      `Cannot be less than previous measurement (${validationLimits.cervicalDilationMin}cm)`
-                    );
-                  },
-                  maxValue: (value) => {
-                    const numValue = parseFloat(value);
-                    return numValue <= 10 || 'Cannot exceed 10cm';
-                  },
-                },
-              }}
               render={({ field, fieldState }) => (
                 <>
                   <NumberInput
                     id="cervical-dilation-input"
                     label="Cervical Dilation (cm) *"
                     placeholder="Enter dilation (min: 4cm, max: 10cm)"
-                    value={field.value || ''}
-                    onChange={(e, { value }) => {
-                      // Only allow whole numbers
-                      const intValue = String(value).replace(/[^\d]/g, '');
-                      field.onChange(intValue);
-                    }}
                     min={4}
                     max={10}
                     step={1}
+                    value={field.value || ''}
+                    onChange={(e, { value }) => field.onChange(String(value))}
                     invalid={!!fieldState.error}
                     invalidText={fieldState.error?.message}
+                    allowEmpty
                   />
                   {existingCervixData.length > 0 && (
                     <div className={styles.validationHint}>
@@ -313,46 +276,27 @@ const CervixForm: React.FC<CervixFormProps> = ({
               )}
             />
           </Column>
-
           <Column sm={4} md={8} lg={16}>
-            <Controller
-              name="descent"
-              control={control}
-              rules={{
-                required: 'Descent of head is required',
-                validate: {
-                  isNumber: (value) => !isNaN(parseInt(value)) || 'Must be a valid number',
-                  minValue: (value) => {
-                    const numValue = parseInt(value);
-                    return numValue >= 1 || 'Descent of head cannot be less than 1 (most descended)';
-                  },
-                  maxValue: (value) => {
-                    const numValue = parseInt(value);
-                    return numValue <= 5 || 'Descent of head cannot exceed 5';
-                  },
-                },
-              }}
-              render={({ field, fieldState }) => (
-                <>
+            <div className={styles.formField}>
+              <Controller
+                name="descent"
+                control={control}
+                render={({ field, fieldState }) => (
                   <NumberInput
                     id="descent-input"
                     label="Descent of Head *"
-                    placeholder={
-                      existingCervixData.length === 0
-                        ? `Default: 5 (high position), can decrement to lower values`
-                        : `Enter descent (1=most descended, 5=high position)`
-                    }
-                    value={field.value || ''}
-                    onChange={(e, { value }) => field.onChange(String(value))}
-                    min={1}
+                    min={0}
                     max={5}
                     step={1}
+                    value={field.value || ''}
+                    onChange={(e, { value }) => field.onChange(String(value))}
                     invalid={!!fieldState.error}
                     invalidText={fieldState.error?.message}
+                    allowEmpty
                   />
-                </>
-              )}
-            />
+                )}
+              />
+            </div>
           </Column>
         </Grid>
       </div>