@kenyaemr/esm-patient-clinical-view-app 5.4.2-pre.2758 → 5.4.2-pre.2764

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.2758"}
+{"$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.2764"}

package/package.json

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

package/src/config-schema.ts

@@ -1,3 +1,8 @@
+export const FETAL_HEART_RATE_GRAPH_UUIDS = {
+  fetalHeartRate: 'FETAL_HEART_RATE_CONCEPT',
+  fetalHeartRateHour: 'FETAL_HEART_RATE_HOUR_CONCEPT',
+  fetalHeartRateTime: 'FETAL_HEART_RATE_TIME_CONCEPT',
+};
 import { Type } from '@openmrs/esm-framework';
 import _default from 'react-hook-form/dist/logic/appendErrors';
 
@@ -427,66 +432,83 @@ export const configSchema = {
     _default: '9065e3c6-b2f5-4f99-9cbf-f67fd9f82ec5',
   },
 };
-export const DRUG_ORDER_TYPE_UUID = '131168f4-15f5-102d-96e4-000c29c2a5d7';
-export const ENCOUNTER_ROLE = '240b26f9-dd88-4172-823d-4a8bfeb7841f';
-export const MOULDING_NONE_CONCEPT = '1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const MOULDING_SLIGHT_CONCEPT = '1362AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const MOULDING_MODERATE_CONCEPT = '1363AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const MOULDING_SEVERE_CONCEPT = '1364AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const CONTRACTION_LEVEL_MILD_CONCEPT = '1498AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const CONTRACTION_LEVEL_MODERATE_CONCEPT = '1499AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const CONTRACTION_LEVEL_STRONG_CONCEPT = '166788AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const CERVIX_CONCEPT = '162261AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+
+// Fetal Heart Rate Graph
 export const FETAL_HEART_RATE_CONCEPT = '1440AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const FETAL_HEART_RATE_TIME_CONCEPT = 'bb3724c9-fbcc-49c5-9702-6cde0be325ca';
 export const FETAL_HEART_RATE_HOUR_CONCEPT = '160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const FETAL_HEART_RATE_TIME_CONCEPT = '160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const DESCENT_OF_HEAD_CONCEPT = '1810AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+
+// Membrane Amniotic Fluid Graph
+export const AMNIOTIC_FLUID_CONCEPT = '162653AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const RUPTURED_MEMBRANES_CONCEPT = '164900AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const AMNIOTIC_CLEAR_LIQUOR_CONCEPT = '159484AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const AMNIOTIC_MECONIUM_STAINED_CONCEPT = '134488AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+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
 export const UTERINE_CONTRACTIONS_CONCEPT = '163750AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const CONTRACTION_LEVEL_MILD_CONCEPT = '1498AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const CONTRACTION_LEVEL_MODERATE_CONCEPT = '1499AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const CONTRACTION_LEVEL_STRONG_CONCEPT = '166788AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const UTERINE_CONTRACTION_FREQUENCY_CONCEPT = '166529AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const UTERINE_CONTRACTION_DURATION_CONCEPT = '159368AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+
+// Oxytocin Graph
+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 IV_FLUIDS_CONCEPT = '161911AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const DOSAGE_CONCEPT = 'b71ddb80-2d7f-4bde-a44b-236e62d4c1b6';
+export const DRUG_DOSE_CONCEPT = '162384AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+
+// Pulse BP Graph
 export const MATERNAL_PULSE_CONCEPT = '5087AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const SYSTOLIC_BP_CONCEPT = '5085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const DIASTOLIC_BP_CONCEPT = '5086AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const TEMPERATURE_CONCEPT = '5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const GLUCOSE_LEVEL_CONCEPT = '887AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const PULSE_BP_TIME_CONCEPT = 'bb3724c9-fbcc-49c5-9702-6cde0be325ca';
+
+// Urine Test Graph
 export const PROTEIN_LEVEL_CONCEPT = '161442AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const GLUCOSE_LEVEL_CONCEPT = '887AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const KETONE_LEVEL_CONCEPT = '165438AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const URINE_VOLUME_CONCEPT = '159660AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const CONTRACTION_COUNT_CONCEPT = '159682AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const URINE_CHARACTERISTICS_CONCEPT = '56AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const MEDICATION_CONCEPT = '1282AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+
+// Cervix / Cervical Monitoring During Labor
+export const CERVIX_CONCEPT = '162261AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const DESCENT_OF_HEAD_CONCEPT = '1810AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const STATION_0_CONCEPT = '160769AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const STATION_1_CONCEPT = '162135AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const STATION_2_CONCEPT = '166065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const STATION_3_CONCEPT = '166066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const STATION_4_CONCEPT = '166067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const STATION_5_CONCEPT = '163734AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+
+export const DRUG_ORDER_TYPE_UUID = '131168f4-15f5-102d-96e4-000c29c2a5d7';
+export const ENCOUNTER_ROLE = '240b26f9-dd88-4172-823d-4a8bfeb7841f';
+export const MOULDING_NONE_CONCEPT = '1107AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const MOULDING_SLIGHT_CONCEPT = '1362AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const MOULDING_MODERATE_CONCEPT = '1363AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const MOULDING_SEVERE_CONCEPT = '1364AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const TEMPERATURE_CONCEPT = '5088AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
+export const CONTRACTION_COUNT_CONCEPT = '159682AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const MEDICATION_NAME_CONCEPT = '164231AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const OXYTOCIN_DOSE_CONCEPT = '81369AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const ROUTE_CONCEPT = '8878f9c0-a1ce-47ec-a88f-69ef0f6576ba';
-export const FREQUENCY_CONCEPT = 'fd9f82fd-f327-4502-ac8e-5d9144dbd504';
-export const IV_FLUIDS_CONCEPT = '161911AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const DOSAGE_CONCEPT = 'b71ddb80-2d7f-4bde-a44b-236e62d4c1b6';
-export const DRUG_DOSE_CONCEPT = '162384AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const EVENT_TYPE_CONCEPT = '162879AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const EVENT_DESCRIPTION_CONCEPT = '160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const AMNIOTIC_FLUID_CONCEPT = '162653AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const MOULDING_CONCEPT = '166527AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const BLOOD_GROUP_CONCEPT = '300AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const TIME_SLOT_CONCEPT = '163286AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const PULSE_BP_TIME_CONCEPT = 'bb3724c9-fbcc-49c5-9702-6cde0be325ca';
 export const LABOR_PATTERN_CONCEPT = '164135AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const HOURS_SINCE_RUPTURE_CONCEPT = '167149AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const RUPTURED_MEMBRANES_CONCEPT = '164900AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const DATE_OF_ADMISSION_CONCEPT = '1640AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const GESTATION_WEEKS_CONCEPT = '1789AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const ESTIMATED_DELIVERY_DATE_CONCEPT = '5596AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 export const LAST_MENSTRUAL_PERIOD_CONCEPT = '1427AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const AMNIOTIC_CLEAR_LIQUOR_CONCEPT = '159484AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const AMNIOTIC_MECONIUM_STAINED_CONCEPT = '134488AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const AMNIOTIC_ABSENT_CONCEPT = '163747AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const AMNIOTIC_BLOOD_STAINED_CONCEPT = '1077AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const AMNIOTIC_MEMBRANE_INTACT_CONCEPT = 'd1787a76-7310-4223-a645-9fd410d418c1';
-export const STATION_0_CONCEPT = '160769AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const STATION_1_CONCEPT = '162135AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const STATION_2_CONCEPT = '166065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const STATION_3_CONCEPT = '166066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const STATION_4_CONCEPT = '166067AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
-export const STATION_5_CONCEPT = '163734AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA';
 
 export interface ConfigObject {
   requireMaritalStatusOnAgeGreaterThanOrEqualTo: number;

package/src/maternal-and-child-health/partography/components/temperature-graph.component.tsx

@@ -43,8 +43,6 @@ const TemperatureGraph: React.FC<TemperatureGraphProps> = ({
   isLoading = false,
 }) => {
   const { t } = useTranslation();
-
-  // Only show rows with both date and a time (exactTime or timeSlot)
   const filteredTableData = tableData.filter((item) => item.date && (item.exactTime || item.timeSlot));
   const timeColumns = filteredTableData.map((item) => item.exactTime || item.timeSlot || '--');
 
@@ -60,8 +58,6 @@ const TemperatureGraph: React.FC<TemperatureGraphProps> = ({
     }
     return '';
   };
-
-  // Carbon skeleton for loading state
   const renderSkeleton = () => (
     <div className={styles.membraneGrid}>
       <div className={styles.gridContainer}>

package/src/maternal-and-child-health/partography/components/uterine-contractions-graph.component.tsx

@@ -47,12 +47,10 @@ const UterineContractionsGraph: React.FC<UterineContractionsGraphProps> = ({
 }) => {
   const { t } = useTranslation();
 
-  // Only show rows with both date and timeSlot
   const filteredTableData = tableData.filter((item) => item.date && item.timeSlot);
   const timeColumns = filteredTableData.map((item) => item.timeSlot || '--');
   const yAxisLabels = ['5', '4', '3', '2', '1'];
 
-  // Carbon skeleton for loading state
   const renderSkeleton = () => (
     <div className={styles.membraneGrid}>
       <div className={styles.gridContainer}>
@@ -118,6 +116,7 @@ const UterineContractionsGraph: React.FC<UterineContractionsGraphProps> = ({
             <h3 className={styles.fetalHeartRateTitle}>Uterine Contractions</h3>
             <div className={styles.fetalHeartRateControls}>
               <span className={styles.legendText}>
+                {}
                 Contractions per 10 min | Bar Heights: 0=None, 2=Mild, 3=Moderate, 5=Strong
               </span>
             </div>
@@ -165,7 +164,6 @@ const UterineContractionsGraph: React.FC<UterineContractionsGraphProps> = ({
           ) : (
             <div className={styles.membraneGrid}>
               <div className={styles.gridContainer}>
-                {/* Header row with time columns */}
                 <div className={styles.gridHeader}>
                   <div className={styles.gridCell}>{t('time', 'Time')}</div>
                   {timeColumns.map((timeColumn, idx) => (
@@ -174,16 +172,40 @@ const UterineContractionsGraph: React.FC<UterineContractionsGraphProps> = ({
                     </div>
                   ))}
                 </div>
-                {/* Contractions row */}
                 <div className={styles.gridRow}>
                   <div className={styles.gridRowLabel}>{t('contractions', 'Contractions')}</div>
-                  {filteredTableData.map((item, idx) => (
-                    <div key={`contraction-${idx}`} className={styles.gridCell}>
-                      {item.contractionCount !== undefined && item.contractionCount !== null
-                        ? item.contractionCount
-                        : '--'}
-                    </div>
-                  ))}
+                  {filteredTableData.map((item, idx) => {
+                    const rawLevel = (item.contractionLevel || '').toLowerCase();
+
+                    const getContractionLevel = (level) => {
+                      if (level === '0' || level === 'none') {
+                        return 'none';
+                      }
+                      if (level === '1' || level === 'mild') {
+                        return 'mild';
+                      }
+                      if (level === '2' || level === 'moderate') {
+                        return 'moderate';
+                      }
+                      if (level === '3' || level === '5' || level === 'strong') {
+                        return 'strong';
+                      }
+                      return 'none';
+                    };
+
+                    const contractionLevel = getContractionLevel(rawLevel);
+
+                    return (
+                      <div
+                        key={`contraction-${idx}`}
+                        className={`${styles.gridCell} contractionsGridCell`}
+                        data-contraction-level={contractionLevel}>
+                        {item.contractionCount !== undefined && item.contractionCount !== null
+                          ? item.contractionCount
+                          : '--'}
+                      </div>
+                    );
+                  })}
                 </div>
               </div>
             </div>

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

@@ -1,10 +1,9 @@
-import React, { useMemo } from 'react';
+import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, Controller } from 'react-hook-form';
-import { Button, Modal, Grid, Column, Dropdown } from '@carbon/react';
+import { contractionLevelOptions as baseContractionLevelOptions } from '../types';
+import { Modal, Dropdown } from '@carbon/react';
 import styles from '../partography.scss';
-import { CONTRACTION_STRONG_UUID } from '../types';
-import { MOULDING_NONE_CONCEPT, MOULDING_SLIGHT_CONCEPT, MOULDING_MODERATE_CONCEPT } from '../../../config-schema';
 
 type CervicalContractionsFormData = {
   contractionLevel: string;
@@ -32,7 +31,6 @@ const CervicalContractionsForm: React.FC<CervicalContractionsFormProps> = ({
   patient,
 }) => {
   const { t } = useTranslation();
-
   const {
     control,
     handleSubmit,
@@ -47,68 +45,50 @@ const CervicalContractionsForm: React.FC<CervicalContractionsFormProps> = ({
     },
   });
 
-  const contractionLevelOptions = useMemo(
-    () => [
-      {
-        value: 'none',
-        label: t('noContractions', 'No Contractions'),
-        concept: MOULDING_NONE_CONCEPT,
-        visual: '0',
-        visualClass: 'none',
-        title: t('none', 'None'),
-      },
-      {
-        value: 'mild',
-        label: t('mildContractions', 'Mild Contractions'),
-        concept: MOULDING_SLIGHT_CONCEPT,
-        visual: '1',
-        visualClass: 'mild',
-        title: t('mild', 'Mild'),
-      },
-      {
-        value: 'moderate',
-        label: t('moderateContractions', 'Moderate Contractions'),
-        concept: MOULDING_MODERATE_CONCEPT,
-        visual: '2',
-        visualClass: 'moderate',
-        title: t('moderate', 'Moderate'),
-      },
-      {
-        value: 'strong',
-        label: t('strongContractions', 'Strong Contractions'),
-        concept: CONTRACTION_STRONG_UUID,
-        visual: '3',
-        visualClass: 'strong',
-        title: 'Strong',
-      },
-    ],
-    [t],
-  );
+  const contractionLevelOptions = baseContractionLevelOptions.map((opt) => ({
+    ...opt,
+    label: t(opt.labelKey, opt.defaultLabel),
+    title: opt.titleKey ? t(opt.titleKey, opt.defaultTitle) : opt.defaultTitle || opt.title,
+  }));
 
-  const contractionCountItems = useMemo(
-    () => [
-      { 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') },
-    ],
-    [t],
-  );
+  const [isSaving, setIsSaving] = useState(false);
 
-  const handleFormSubmit = (data: CervicalContractionsFormData) => {
+  const handleFormSubmit = async (data: CervicalContractionsFormData) => {
+    clearErrors();
+    let hasErrors = false;
+    if (!data.contractionLevel || data.contractionLevel.trim() === '') {
+      setError('contractionLevel', {
+        type: 'manual',
+        message: t('contractionLevelRequired', 'Please select contraction level'),
+      });
+      hasErrors = true;
+    }
+    if (!data.contractionCount || data.contractionCount.trim() === '') {
+      setError('contractionCount', {
+        type: 'manual',
+        message: t('contractionCountRequired', 'Please select number of contractions'),
+      });
+      hasErrors = true;
+    }
+    if (hasErrors) {
+      alert(t('formValidationError', 'Please select both contraction level and count before submitting.'));
+      return;
+    }
     const currentTime = new Date().toLocaleTimeString('en-GB', {
       hour: '2-digit',
       minute: '2-digit',
     });
-
-    onSubmit({
-      contractionLevel: data.contractionLevel,
-      contractionCount: data.contractionCount,
-      timeSlot: currentTime,
-    });
-
-    reset();
+    setIsSaving(true);
+    try {
+      await onSubmit({
+        contractionLevel: data.contractionLevel,
+        contractionCount: data.contractionCount,
+        timeSlot: currentTime,
+      });
+      reset();
+    } finally {
+      setIsSaving(false);
+    }
   };
 
   const handleClose = () => {
@@ -121,87 +101,95 @@ const CervicalContractionsForm: React.FC<CervicalContractionsFormProps> = ({
     <Modal
       open={isOpen}
       onRequestClose={handleClose}
-      primaryButtonText={t('save', 'Save')}
+      className={styles.cervixModal}
+      size="sm"
+      primaryButtonText={isSaving ? t('saving', 'Saving...') : t('save', 'Save')}
       secondaryButtonText={t('cancel', 'Cancel')}
       onRequestSubmit={handleSubmit(handleFormSubmit)}
       onSecondarySubmit={handleClose}
-      className={styles.cervixModal}
-      size="lg">
-      <div className={styles.contractionsFormContainer}>
-        <div className={styles.formMainSection}>
-          <div className={styles.formSectionLeft}>
-            <h3 className={styles.sectionTitle}>{t('cervicalContractionsData', 'Cervical Contractions')}</h3>
-            <h4 className={styles.sectionTitle}>{t('contractionLevel', 'Select Contraction Level')}</h4>
-            <p className={styles.sectionDescription}>
-              {t('contractionLevelDescription', 'Choose the intensity of uterine contractions observed')}
-            </p>
+      primaryButtonDisabled={isSaving}
+      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')}
+        </h3>
 
-            <Controller
-              name="contractionLevel"
-              control={control}
-              rules={{ required: t('contractionLevelRequired', 'Please select contraction level') }}
-              render={({ field, fieldState }) => (
-                <>
-                  <div className={styles.contractionLevelSelector}>
-                    {contractionLevelOptions.map((option) => (
-                      <div
-                        key={option.value}
-                        className={`${styles.contractionLevelOption} ${
-                          field.value === option.value ? styles.contractionLevelSelected : ''
-                        }`}
-                        onClick={() => field.onChange(option.value)}
-                        onKeyDown={(e) => {
-                          if (e.key === 'Enter' || e.key === ' ') {
-                            e.preventDefault();
-                            field.onChange(option.value);
-                          }
-                        }}
-                        role="button"
-                        tabIndex={0}
-                        aria-pressed={field.value === option.value}
-                        title={option.label}>
-                        <div className={styles.contractionLevelTitle}>{option.title}</div>
-                        <div className={`${styles.contractionLevelButton} ${styles[option.visualClass]}`}>
-                          {option.visual}
-                        </div>
-                      </div>
-                    ))}
+        <Controller
+          name="contractionLevel"
+          control={control}
+          rules={{ required: t('contractionLevelRequired', 'Please select contraction level') }}
+          render={({ field, fieldState }) => (
+            <div style={{ display: 'flex', justifyContent: 'center', marginTop: 24, marginBottom: 8 }}>
+              {contractionLevelOptions.map((option) => (
+                <div key={option.value} style={{ flex: 1, minWidth: 100, margin: '0 12px' }}>
+                  <div style={{ textAlign: 'center', fontWeight: 600, marginBottom: 8 }}>{option.title}</div>
+                  <div
+                    className={`${styles.contractionLevelOption} ${
+                      field.value === option.value ? styles.contractionLevelSelected : ''
+                    }`}
+                    onClick={() => field.onChange(option.value)}
+                    onKeyDown={(e) => {
+                      if (e.key === 'Enter' || e.key === ' ') {
+                        e.preventDefault();
+                        field.onChange(option.value);
+                      }
+                    }}
+                    role="button"
+                    tabIndex={0}
+                    aria-pressed={field.value === option.value}
+                    title={option.label}
+                    style={{ minWidth: 80 }}>
+                    <div className={`${styles.contractionLevelButton} ${styles[option.visualClass]}`}>
+                      {option.visual}
+                    </div>
                   </div>
-                  {fieldState.error && <div className={styles.errorMessage}>{fieldState.error.message}</div>}
-                </>
-              )}
-            />
-          </div>
 
-          <div className={styles.formSectionRight}>
-            <Controller
-              name="contractionCount"
-              control={control}
-              rules={{ required: t('contractionCountRequired', 'Please select number of contractions') }}
-              render={({ field, fieldState }) => (
-                <>
-                  <Dropdown
-                    id="contraction-count-dropdown"
-                    titleText={t('chooseCount', 'Number of Contractions')}
-                    label={t('chooseCount', 'Choose count')}
-                    items={contractionCountItems}
-                    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}
-                  />
-                  {fieldState.error && <div className={styles.errorMessage}>{fieldState.error.message}</div>}
-                </>
-              )}
-            />
-          </div>
+                  {option.value === contractionLevelOptions[contractionLevelOptions.length - 1].value &&
+                    fieldState.error && <div className={styles.errorMessage}>{fieldState.error.message}</div>}
+                </div>
+              ))}
+            </div>
+          )}
+        />
+
+        <div style={{ margin: '32px 0 0 0', textAlign: 'left', fontWeight: 500 }}>
+          {t('chooseCount', 'Choose count')}
+        </div>
+        <div style={{ display: 'flex', justifyContent: 'flex-start', marginBottom: 16 }}>
+          <Controller
+            name="contractionCount"
+            control={control}
+            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>}
+              </>
+            )}
+          />
         </div>
       </div>
     </Modal>