@kenyaemr/esm-patient-clinical-view-app 5.4.2-pre.2788 → 5.4.2-pre.2797

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

@@ -107,13 +107,26 @@ import {
   PARTOGRAPHY_CONCEPTS,
   PARTOGRAPHY_ENCOUNTER_TYPES,
   MCH_PARTOGRAPHY_ENCOUNTER_UUID,
+  URINE_TEST_TIME_SLOT_CONCEPT,
   getPartographyUnit,
   type OpenMRSResponse,
   type PartographyObservation,
   type PartographyEncounter,
   type PartographyGraphType,
 } from './types';
-import { configSchema, type ConfigObject } from '../../config-schema';
+import {
+  configSchema,
+  type ConfigObject,
+  TIME_RESULTS_RETURNED,
+  TIME_SAMPLE_COLLECTED,
+  EVENT_DESCRIPTION_CONCEPT,
+  CONTRACTION_COUNT_CONCEPT,
+  UTERINE_CONTRACTIONS_CONCEPT,
+  CONTRACTION_LEVEL_MILD_CONCEPT,
+  CONTRACTION_LEVEL_MODERATE_CONCEPT,
+  CONTRACTION_LEVEL_STRONG_CONCEPT,
+  MOULDING_NONE_CONCEPT,
+} from '../../config-schema';
 
 export type { PartographyObservation, PartographyEncounter };
 const defaultPartographyConfig = configSchema.partography._default;
@@ -359,6 +372,7 @@ export async function createPartographyEncounter(
   formData: any,
   locationUuid?: string,
   providerUuid?: string,
+  signal?: AbortSignal,
   t?: (key: string, fallback?: string) => string,
 ): Promise<{ success: boolean; message: string; encounter?: PartographyEncounter }> {
   try {
@@ -408,7 +422,7 @@ export async function createPartographyEncounter(
       location: finalLocationUuid,
       encounterDatetime: encounterDatetime,
       obs: observations,
-      encounterType: encounterTypeUuid,
+      encounterType: { uuid: encounterTypeUuid },
     };
 
     let finalProviderUuid = providerUuid;
@@ -475,13 +489,12 @@ export async function createPartographyEncounter(
       throw new Error('At least one observation is required');
     }
 
-    // Add debugging to see what payload is being sent
-    // Debug: encounterPayload being sent
-
-    const response = await openmrsFetch(`${restBaseUrl}/encounter`, {
+    const encounterUrl = `${restBaseUrl}/encounter`;
+    const response = await openmrsFetch(encounterUrl, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(encounterPayload),
+      signal: signal, // Add abort signal support
     });
 
     if (!response.ok) {
@@ -651,14 +664,14 @@ function buildObservations(graphType: string, formData: any): any[] {
         });
       }
 
-      // Save hour as a number (not string)
+      // Save hour as a string in the format 'Hour: X' to match backend expectations
       if (formData.hour !== undefined && formData.hour !== '') {
         try {
           const hourValue = parseFloat(formData.hour);
-          if (hourValue >= 0 && hourValue <= 24) {
+          if (!isNaN(hourValue) && hourValue >= 0 && hourValue <= 24) {
             observations.push({
               concept: PARTOGRAPHY_CONCEPTS['fetal-heart-rate-hour'],
-              value: hourValue,
+              value: `Hour: ${hourValue}`,
               obsDatetime,
             });
           }
@@ -740,7 +753,7 @@ function buildObservations(graphType: string, formData: any): any[] {
       }
       if (formData.timeSlot) {
         observations.push({
-          concept: '160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
+          concept: URINE_TEST_TIME_SLOT_CONCEPT,
           value: `Time: ${formData.timeSlot}`,
           obsDatetime,
         });
@@ -821,7 +834,22 @@ function buildObservations(graphType: string, formData: any): any[] {
           obsDatetime,
         });
       }
-      // Remove time-slot obs to avoid OpenMRS errors
+
+      if (formData.timeSlot) {
+        observations.push({
+          concept: URINE_TEST_TIME_SLOT_CONCEPT,
+          value: `Time: ${formData.timeSlot}`,
+          obsDatetime,
+        });
+      }
+
+      if (formData.timeSampleCollected) {
+        observations.push({
+          concept: TIME_SAMPLE_COLLECTED,
+          value: formData.timeSampleCollected,
+          obsDatetime,
+        });
+      }
       if (formData.eventDescription) {
         observations.push({
           concept: PARTOGRAPHY_CONCEPTS['event-description'],
@@ -829,10 +857,11 @@ function buildObservations(graphType: string, formData: any): any[] {
           obsDatetime,
         });
       }
+
       if (formData.timeResultsReturned) {
         observations.push({
-          concept: PARTOGRAPHY_CONCEPTS['event-description'],
-          value: `Results Returned: ${formData.timeResultsReturned}`,
+          concept: TIME_RESULTS_RETURNED,
+          value: formData.timeResultsReturned,
           obsDatetime,
         });
       }
@@ -853,7 +882,7 @@ function buildObservations(graphType: string, formData: any): any[] {
           obsDatetime,
         });
       }
-      // Add route and frequency as event descriptions
+
       if (formData.route) {
         observations.push({
           concept: PARTOGRAPHY_CONCEPTS['event-description'],
@@ -934,22 +963,20 @@ export function transformEncounterToChartData(encounters: PartographyEncounter[]
           const conceptUuid = obs.concept.uuid;
           let value = null;
           let groupName = '';
-          // Robustly handle uterine contractions: both numeric and coded contraction level
+
           if (graphType === 'uterine-contractions') {
-            // Numeric value for graphing
             if (conceptUuid === PARTOGRAPHY_CONCEPTS['uterine-contractions']) {
               value = parseFloat(obs.value as string);
               groupName = getGraphTypeDisplayName('uterine-contractions');
             }
-            // Coded contraction level (none, mild, moderate, strong)
+
             const contractionLevelMap: Record<string, string> = {
-              '1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': 'none',
-              '1498AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': 'mild',
-              '1499AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': 'moderate',
-              '166788AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA': 'strong',
+              MOULDING_NONE_CONCEPT: 'none',
+              CONTRACTION_LEVEL_MILD_CONCEPT: 'mild',
+              CONTRACTION_LEVEL_MODERATE_CONCEPT: 'moderate',
+              CONTRACTION_LEVEL_STRONG_CONCEPT: 'strong',
             };
             if (contractionLevelMap[conceptUuid]) {
-              // For charting, you may want to assign a numeric value for each level
               const contractionLevelValueMap: Record<string, number> = {
                 none: 0,
                 mild: 1,
@@ -1025,11 +1052,8 @@ export function transformEncounterToChartData(encounters: PartographyEncounter[]
   });
 
   return chartData.sort((a, b) => {
-    // Parse time strings (HH:MM format) for comparison
     const timeA = a.time.split(':').map(Number);
     const timeB = b.time.split(':').map(Number);
-
-    // Convert to minutes for easy comparison
     const minutesA = timeA[0] * 60 + (timeA[1] || 0);
     const minutesB = timeB[0] * 60 + (timeB[1] || 0);
 
@@ -1104,16 +1128,14 @@ export function transformEncounterToTableData(
     })}`;
 
     if (graphType === 'uterine-contractions') {
-      // Group obs by time for uterine contractions
       let timeSlot = '';
       let contractionCount = '';
       let contractionLevel = 'none';
       if (Array.isArray(encounter.obs)) {
-        // Always use the last seen contraction level in the encounter (in case order is not guaranteed)
         for (const obs of encounter.obs) {
           // Time slot
           if (
-            obs.concept.uuid === '160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' &&
+            obs.concept.uuid === EVENT_DESCRIPTION_CONCEPT &&
             typeof obs.value === 'string' &&
             obs.value.startsWith('Time:')
           ) {
@@ -1122,30 +1144,30 @@ export function transformEncounterToTableData(
               timeSlot = match[1].trim();
             }
           }
-          // Contraction count (numeric)
-          if (obs.concept.uuid === '159682AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA') {
+
+          if (obs.concept.uuid === CONTRACTION_COUNT_CONCEPT) {
             contractionCount = String(obs.value);
           }
         }
-        // Now, after looping, get the latest contraction level (if any)
+
         for (const obs of encounter.obs) {
-          if (obs.concept.uuid === '163750AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA') {
+          if (obs.concept.uuid === UTERINE_CONTRACTIONS_CONCEPT) {
             let levelUuid = '';
             if (typeof obs.value === 'string') {
               levelUuid = obs.value;
             } else if (obs.value != null && typeof obs.value === 'object' && (obs.value as any)?.uuid) {
               levelUuid = (obs.value as any).uuid;
             }
-            if (levelUuid === '1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA') {
+            if (levelUuid === MOULDING_NONE_CONCEPT) {
               contractionLevel = 'none';
             }
-            if (levelUuid === '1498AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA') {
+            if (levelUuid === CONTRACTION_LEVEL_MILD_CONCEPT) {
               contractionLevel = 'mild';
             }
-            if (levelUuid === '1499AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA') {
+            if (levelUuid === CONTRACTION_LEVEL_MODERATE_CONCEPT) {
               contractionLevel = 'moderate';
             }
-            if (levelUuid === '166788AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA') {
+            if (levelUuid === CONTRACTION_LEVEL_STRONG_CONCEPT) {
               contractionLevel = 'strong';
             }
           }
@@ -1162,7 +1184,6 @@ export function transformEncounterToTableData(
         });
       }
     } else {
-      // ...existing code for other graph types...
       encounter.obs.forEach((obs, obsIndex) => {
         try {
           if (typeof obs.value === 'string') {
@@ -1266,11 +1287,9 @@ export function transformEncounterToTableData(
   );
 }
 
-// Hook to fetch and manage fetal heart rate data from OpenMRS
 export function useFetalHeartRateData(patientUuid: string) {
   const fetcher = (url: string) => openmrsFetch(url).then((res) => res.json());
 
-  // Fetch encounters instead of just observations to get all related data
   const { data, error, isLoading, mutate } = useSWR(
     patientUuid
       ? `${restBaseUrl}/encounter?patient=${patientUuid}&encounterType=${MCH_PARTOGRAPHY_ENCOUNTER_UUID}&v=full&limit=100&order=desc`
@@ -1296,7 +1315,6 @@ export function useFetalHeartRateData(patientUuid: string) {
           continue;
         }
 
-        // Look for fetal heart rate observations in this encounter
         const fetalHeartRateObs = encounter.obs.find(
           (obs) => obs.concept.uuid === PARTOGRAPHY_CONCEPTS['fetal-heart-rate'],
         );
@@ -1304,11 +1322,9 @@ export function useFetalHeartRateData(patientUuid: string) {
         if (fetalHeartRateObs) {
           const encounterDatetime = new Date(encounter.encounterDatetime);
 
-          // Look for hour and time observations with text format
           let hour = 0;
           let time = '';
 
-          // Find hour observation (saved as "Hour: X.X")
           const hourObs = encounter.obs.find(
             (obs) =>
               obs.concept.uuid === PARTOGRAPHY_CONCEPTS['fetal-heart-rate-hour'] &&
@@ -1317,7 +1333,6 @@ export function useFetalHeartRateData(patientUuid: string) {
               obs.value.startsWith('Hour:'),
           );
 
-          // Find time observation (saved as "Time: XX:XX")
           const timeObs = encounter.obs.find(
             (obs) =>
               obs.concept.uuid === PARTOGRAPHY_CONCEPTS['fetal-heart-rate-time'] &&
@@ -1326,7 +1341,6 @@ export function useFetalHeartRateData(patientUuid: string) {
               obs.value.startsWith('Time:'),
           );
 
-          // Parse hour from text format "Hour: 2.5"
           if (hourObs && typeof hourObs.value === 'string') {
             const hourMatch = hourObs.value.match(/Hour:\s*([0-9.]+)/);
             if (hourMatch) {
@@ -1334,7 +1348,6 @@ export function useFetalHeartRateData(patientUuid: string) {
             }
           }
 
-          // Parse time from text format "Time: 03:15"
           if (timeObs && typeof timeObs.value === 'string') {
             const timeMatch = timeObs.value.match(/Time:\s*(.+)/);
             if (timeMatch) {
@@ -1412,11 +1425,19 @@ export async function saveDrugOrderData(
     route: string;
     frequency: string;
   },
+  locationUuid?: string,
+  providerUuid?: string,
+  signal?: AbortSignal,
 ) {
   try {
-    // Use the existing createPartographyEncounter function with drugs-fluids graph type
-    const result = await createPartographyEncounter(patientUuid, 'drugs-fluids', formData);
-
+    const result = await createPartographyEncounter(
+      patientUuid,
+      'drugs-fluids',
+      formData,
+      locationUuid,
+      providerUuid,
+      signal,
+    );
     return result;
   } catch (error) {
     console.error('Error saving drug order data:', error);
@@ -1427,9 +1448,7 @@ export async function saveDrugOrderData(
   }
 }
 
-// Function to fetch drug orders for a patient
 export function useDrugOrders(patientUuid: string) {
-  // Remove the problematic sort parameter that's causing 500 error
   const apiUrl = patientUuid
     ? `${restBaseUrl}/order?patient=${patientUuid}&orderType=131168f4-15f5-102d-96e4-000c29c2a5d7&v=full&limit=50`
     : null;
@@ -1440,23 +1459,18 @@ export function useDrugOrders(patientUuid: string) {
     const responseData = data?.data as any;
 
     if (!responseData?.results || !Array.isArray(responseData.results)) {
-      // console.log('Drug Orders: No results found');
       return [];
     }
 
     const allOrders = responseData.results;
-    // Filter for active orders and manually sort by dateActivated (newest first)
     const activeOrders = allOrders
       .filter((order: any) => order.action === 'NEW' && !order.dateStopped)
       .sort((a: any, b: any) => {
-        // Manual sorting by dateActivated, handling null values
         const dateA = a.dateActivated ? new Date(a.dateActivated).getTime() : 0;
         const dateB = b.dateActivated ? new Date(b.dateActivated).getTime() : 0;
-        return dateB - dateA; // Descending order (newest first)
+        return dateB - dateA;
       });
 
-    // console.log(`Drug Orders: Found ${allOrders.length} total orders, ${activeOrders.length} active orders`);
-
     const processedOrders = activeOrders.map((order: any) => {
       const processed = {
         id: order.uuid,

package/src/maternal-and-child-health/partography/partography.scss

@@ -204,10 +204,10 @@
 
 .chartContainer {
   background-color: colors.$white;
-  padding: layout.$spacing-04;
+  padding: 0;
   border-radius: layout.$spacing-02;
   border: 2px solid colors.$gray-40;
-  margin-bottom: layout.$spacing-04;
+  margin-bottom: 0;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
 
   // Medical chart styling
@@ -888,6 +888,13 @@
   flex-wrap: wrap;
 }
 
+// Orange tag style for low range
+.tagLowRange {
+  background-color: #ff9800 !important;
+  color: #fff !important;
+  border-color: #ff9800 !important;
+}
+
 .fetalHeartRateChart {
   min-height: 600px; // Increased height to match cervix graph
   width: 100%;
@@ -996,7 +1003,7 @@
   border-radius: layout.$spacing-02;
   overflow-x: auto;
   max-height: 300px; // Set a reasonable height
-  max-width: 1050px; // Show approximately 13 grids (140px label + 70px * 13 columns = 1050px)
+  max-width: 1540px; // Show approximately 20 grids (140px label + 70px * 20 columns = 1540px)
 }
 
 .gridContainer {
@@ -1265,7 +1272,7 @@
   }
 }
 
-// Detailed Cervical Contractions Grid - Partograph Format
+// Detailed Contractions Grid - Partograph Format
 .contractionsContainer {
   display: flex;
   flex-direction: column;
@@ -1515,13 +1522,13 @@
   color: colors.$gray-80;
 }
 
-// Grid container for cervical contractions
+// Grid container for contractions
 .contractionsGrid {
   position: relative;
   margin: layout.$spacing-04 0;
 }
 
-// Table view styles for cervical contractions
+// Table view styles for contractions
 .contractionsTable {
   background-color: colors.$white;
   border: 1px solid colors.$gray-30;
@@ -1589,6 +1596,58 @@
   margin: layout.$spacing-05 0;
 }
 
+.oxytocinGraph {
+  width: 100%;
+  margin: 0;
+
+  .membraneGrid {
+    max-height: fit-content;
+    min-height: auto;
+    margin-top: 0;
+    margin-bottom: 0;
+    padding-bottom: 0;
+  }
+
+  .gridContainer {
+    padding: 0;
+    margin-bottom: 0;
+  }
+
+  .gridRow {
+    min-height: 50px;
+    margin-bottom: 0;
+
+    &:last-child {
+      border-bottom: 1px solid colors.$gray-20;
+    }
+  }
+
+  .gridCell {
+    border: 1px solid colors.$gray-30;
+    min-height: 50px;
+  }
+}
+
+// Oxytocin specific styling when inside fetalHeartRateContainer
+.fetalHeartRateContainer {
+  .membraneGrid {
+    margin: 0;
+    padding: 0;
+    max-height: fit-content;
+    min-height: auto;
+  }
+
+  .gridContainer {
+    padding: 0;
+    margin: 0;
+  }
+
+  .gridRow {
+    margin: 0;
+    min-height: 50px;
+  }
+}
+
 .drugsCell {
   position: relative;
   background-color: colors.$white;

package/src/maternal-and-child-health/partography/resources/fetal-heart-rate.resource.ts

@@ -4,6 +4,7 @@ import useSWR from 'swr';
 import { MCH_PARTOGRAPHY_ENCOUNTER_UUID, PARTOGRAPHY_CONCEPTS } from '../types';
 import { createPartographyEncounter } from '../partography.resource';
 import { useTranslation } from 'react-i18next';
+import { FETAL_HEART_RATE_HOUR_CONCEPT } from '../../../config-schema';
 
 export interface FetalHeartRateEntry {
   id: string;
@@ -42,12 +43,9 @@ export function useFetalHeartRateData(patientUuid: string) {
         const encounterDatetime = new Date(encounter.encounterDatetime);
         let hour = 0;
         let time = '';
+        // Find hour obs by concept and use its value as number
         const hourObs = encounter.obs.find(
-          (obs) =>
-            obs.concept.uuid === PARTOGRAPHY_CONCEPTS['fetal-heart-rate-hour'] &&
-            obs.value &&
-            typeof obs.value === 'string' &&
-            obs.value.startsWith('Hour:'),
+          (obs) => obs.concept.uuid === FETAL_HEART_RATE_HOUR_CONCEPT && typeof obs.value === 'number',
         );
         const timeObs = encounter.obs.find(
           (obs) =>
@@ -56,11 +54,8 @@ export function useFetalHeartRateData(patientUuid: string) {
             typeof obs.value === 'string' &&
             obs.value.startsWith('Time:'),
         );
-        if (hourObs && typeof hourObs.value === 'string') {
-          const hourMatch = hourObs.value.match(/Hour:\s*([0-9.]+)/);
-          if (hourMatch) {
-            hour = parseFloat(hourMatch[1]) || 0;
-          }
+        if (hourObs && typeof hourObs.value === 'number') {
+          hour = hourObs.value;
         }
         if (timeObs && typeof timeObs.value === 'string') {
           const timeMatch = timeObs.value.match(/Time:\s*(.+)/);

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

@@ -96,13 +96,15 @@ export async function saveOxytocinFormData(
   if (!finalLocationUuid) {
     return { success: false, message: t('Location information is required'), error: 'NO_LOCATION' };
   }
-  const now = new Date();
-  now.setMinutes(now.getMinutes() - 1);
+  // Use utility to ensure encounterDatetime is always in the past
+  // Import getValidEncounterDatetime from types/index if not already imported
+  // eslint-disable-next-line @typescript-eslint/no-var-requires
+  const { getValidEncounterDatetime } = require('../types');
   const encounterPayload = {
     patient: patientUuid,
     encounterType: MCH_PARTOGRAPHY_ENCOUNTER_UUID,
     location: finalLocationUuid,
-    encounterDatetime: toOmrsIsoString(now),
+    encounterDatetime: getValidEncounterDatetime(),
     obs: observations,
     encounterProviders: [
       {

package/src/maternal-and-child-health/partography/types/index.ts

@@ -35,11 +35,13 @@ export const contractionLevelUuidMap: Record<string, string> = {
   moderate: '1499AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
   strong: '166788AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA',
 };
-// Utility: Map urine test code/label to plus notation
-// Default Fetal Heart Rate Chart Data
-// ...existing code...
-// ...existing code...
-// Uterine Contraction Level Options (for Cervical Contractions Form)
+export function getValidEncounterDatetime(): string {
+  const now = new Date();
+  now.setMinutes(now.getMinutes() - 4);
+  return now.toISOString();
+}
+export const URINE_TEST_TIME_SLOT_CONCEPT = 'bb3724c9-fbcc-49c5-9702-6cde0be325ca';
+
 export const contractionLevelOptions = [
   {
     value: 'none',
@@ -140,6 +142,8 @@ import {
   CONTRACTION_LEVEL_MILD_CONCEPT,
   CONTRACTION_LEVEL_MODERATE_CONCEPT,
   CONTRACTION_LEVEL_STRONG_CONCEPT,
+  OXYTOCIN_DROPS_PER_MINUTE_CONCEPT,
+  OXYTOCIN_TIME_CONCEPT,
 } from '../../../config-schema';
 
 const _CODE_TO_PLUS_MAP: Record<string, string> = {
@@ -151,10 +155,20 @@ const _CODE_TO_PLUS_MAP: Record<string, string> = {
   '++': '++',
   [MOULDING_SEVERE_CONCEPT]: '+++',
   '+++': '+++',
+  NEGATIVE: '0',
+  ZERO: '0',
+  'ONE PLUS': '+',
+  '1+': '+',
+  'TWO PLUS': '++',
+  '2+': '++',
+  'THREE PLUS': '+++',
+  '3+': '+++',
+  TRACE: '+/-',
+  '+/-': '+/-',
 };
 
 export const codeToPlus = (raw?: string): string => {
-  const key = (raw ?? '').toString().trim();
+  const key = (raw ?? '').toString().trim().toUpperCase();
   return _CODE_TO_PLUS_MAP[key] ?? raw ?? '';
 };
 const _partoConcepts = (configSchema as any)?.partography?._default?.conceptUuids ?? {};
@@ -232,11 +246,8 @@ export const PARTOGRAPHY_GRAPH_TYPES = [
 export const PARTOGRAPHY_ENCOUNTER_TYPES = Object.fromEntries(
   PARTOGRAPHY_GRAPH_TYPES.map((type) => [
     type,
-    type === 'drugs-fluids'
-      ? _partoUuids.drugsFluidsEncounterUuid ?? '39da3525-afe4-45ff-8977-c53b7b359158'
-      : type === 'pulse-bp-combined'
-      ? MCH_PARTOGRAPHY_ENCOUNTER_UUID
-      : MCH_PARTOGRAPHY_ENCOUNTER_UUID,
+    /* For testing: set drugs-fluids to use the same encounter type as temperature/others */
+    MCH_PARTOGRAPHY_ENCOUNTER_UUID,
   ]),
 ) as Record<(typeof PARTOGRAPHY_GRAPH_TYPES)[number], string>;
 
@@ -535,16 +546,14 @@ export const getColorForGraph = (colorName: string): string => {
   return PARTOGRAPHY_COLOR_MAPPINGS[colorName as keyof typeof PARTOGRAPHY_COLOR_MAPPINGS] || '#525252';
 };
 
-// Default Fetal Heart Rate Chart Data
-export const defaultFetalHeartRateChartData = [
-  { hour: 0, value: 140, group: 'Fetal Heart Rate', time: '0', color: getColorForGraph('green') },
-  { hour: 10, value: 140, group: 'Fetal Heart Rate', time: '10', color: getColorForGraph('green') },
-  { hour: 20, value: 140, group: 'Fetal Heart Rate', time: '20', color: getColorForGraph('green') },
-  { hour: 30, value: 140, group: 'Fetal Heart Rate', time: '30', color: getColorForGraph('green') },
-  { hour: 40, value: 140, group: 'Fetal Heart Rate', time: '40', color: getColorForGraph('green') },
-  { hour: 50, value: 140, group: 'Fetal Heart Rate', time: '50', color: getColorForGraph('green') },
-  { hour: 60, value: 140, group: 'Fetal Heart Rate', time: '60', color: getColorForGraph('green') },
-];
+// Default Fetal Heart Rate Chart Data - Empty for no data state
+export const defaultFetalHeartRateChartData: Array<{
+  hour: number;
+  value: number;
+  group: string;
+  time: string;
+  color: string;
+}> = [];
 
 export const FORM_OPTION_CONCEPTS = {
   AMNIOTIC_FLUID: {
@@ -787,20 +796,14 @@ export const TIME_SLOT_OPTIONS = [
 ] as const;
 
 export const MEMBRANE_TIME_SLOT_OPTIONS = [
-  { value: '16:00', label: '16:00' },
-  { value: '17:00', label: '17:00' },
-  { value: '18:00', label: '18:00' },
-  { value: '19:00', label: '19:00' },
-  { value: '20:00', label: '20:00' },
-  { value: '21:00', label: '21:00' },
-  { value: '22:00', label: '22:00' },
-  { value: '23:00', label: '23:00' },
-  { value: '00:00', label: '00:00' },
-  { value: '01:00', label: '01:00' },
-  { value: '02:00', label: '02:00' },
-  { value: '03:00', label: '03:00' },
-  { value: '04:00', label: '04:00' },
-  { value: '05:00', label: '05:00' },
+  // Add 0hr option first
+  { value: '0', label: '0hr' },
+  // Then add the existing 0.5hr increments
+  ...Array.from({ length: 48 }, (_, i) => {
+    const value = ((i + 1) * 0.5).toString();
+    const label = i % 2 === 1 ? `${(i + 1) * 0.5}hr` : `${(i + 1) / 2}hr`;
+    return { value, label };
+  }),
 ] as const;
 
 export const EVENT_TYPE_OPTIONS = [
@@ -1281,8 +1284,8 @@ export const MOULDING_SYMBOL_MAP: Record<string, string> = {
 };
 
 export const OXYTOCIN_FORM_CONCEPTS = {
-  time: FETAL_HEART_RATE_HOUR_CONCEPT,
-  oxytocinDropsPerMinute: OXYTOCIN_DOSE_CONCEPT,
+  time: OXYTOCIN_TIME_CONCEPT,
+  oxytocinDropsPerMinute: OXYTOCIN_DROPS_PER_MINUTE_CONCEPT,
 } as const;
 export const CERVIX_FORM_CONCEPTS = {
   hour: FETAL_HEART_RATE_HOUR_CONCEPT,

package/translations/am.json

@@ -47,7 +47,7 @@
   "caseEncounter": "የጉዳይ አስተዳደር ግኝቶች",
   "caseManagement": "Case Management",
   "causeOfDeath": "የሞት መንስኤ",
-  "cervicalContractionsData": "Cervical Contractions",
+  "cervicalContractionsData": "Contractions",
   "cervicalDilation": "Cervical Dilation",
   "chooseAnOption": "Choose an option",
   "chooseCount": "Choose count",

package/translations/en.json

@@ -47,7 +47,7 @@
   "caseEncounter": "Case management encounters",
   "caseManagement": "Case Management",
   "causeOfDeath": "Cause of Death",
-  "cervicalContractionsData": "Cervical Contractions",
+  "cervicalContractionsData": "Contractions",
   "cervicalDilation": "Cervical Dilation",
   "chooseAnOption": "Choose an option",
   "chooseCount": "Choose count",