diff --git a/packages/esm-patient-registration-app/src/patient-registration/date-util.ts b/packages/esm-patient-registration-app/src/patient-registration/date-util.ts index a2d98a5d1..51b695edc 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/date-util.ts +++ b/packages/esm-patient-registration-app/src/patient-registration/date-util.ts @@ -46,7 +46,7 @@ export const generateFormatting = (order: Array, separator: string) => { }; const placeHolder = order.map((x) => (x === 'Y' ? 'YYYY' : x + x)).join(separator); - const dateFormat = order.join(separator).replace('YYYY', 'yyyy'); + const dateFormat = order.join(separator); return { parse, format, placeHolder, dateFormat }; }; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx index 98f10826a..0ba125d52 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.component.tsx @@ -1,15 +1,14 @@ import React, { useMemo } from 'react'; import classNames from 'classnames'; -import { Field, useField } from 'formik'; +import { Field } from 'formik'; import { useTranslation } from 'react-i18next'; -import { InlineNotification, Layer, Select, SelectItem, DatePicker, DatePickerInput } from '@carbon/react'; +import { InlineNotification, Layer, Select, SelectItem } from '@carbon/react'; import { useConfig } from '@openmrs/esm-framework'; import { type ConceptResponse } from '../../patient-registration.types'; import { type FieldDefinition, type RegistrationConfig } from '../../../config-schema'; import { Input } from '../../input/basic-input/input/input.component'; import { useConcept, useConceptAnswers } from '../field.resource'; import styles from './../field.scss'; -import { generateFormatting } from '../../date-util'; export interface ObsFieldProps { fieldDefinition: FieldDefinition; @@ -18,9 +17,6 @@ export interface ObsFieldProps { export function ObsField({ fieldDefinition }: ObsFieldProps) { const { t } = useTranslation(); const { data: concept, isLoading } = useConcept(fieldDefinition.uuid); - const [date, dateMeta] = useField('date'); - - const { format, dateFormat } = generateFormatting(['d', 'm', 'Y'], '/'); const config = useConfig(); @@ -55,18 +51,6 @@ export function ObsField({ fieldDefinition }: ObsFieldProps) { required={fieldDefinition.validation.required} /> ); - case 'Date': - return ( - - ); case 'Coded': return ( - - {({ field, form: { touched, errors }, meta }) => { - return ( - - - - ); - }} - - - ); -} - interface CodedObsFieldProps { concept: ConceptResponse; answerConceptSetUuid?: string; diff --git a/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.test.tsx b/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.test.tsx index a194641b9..661a35e64 100644 --- a/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.test.tsx +++ b/packages/esm-patient-registration-app/src/patient-registration/field/obs/obs-field.test.tsx @@ -5,7 +5,6 @@ import { useConfig } from '@openmrs/esm-framework'; import { type FieldDefinition } from '../../../config-schema'; import { useConcept, useConceptAnswers } from '../field.resource'; import { ObsField } from './obs-field.component'; -import '@testing-library/jest-dom'; const mockUseConfig = useConfig as jest.Mock; @@ -43,14 +42,6 @@ const useConceptMockImpl = (uuid: string) => { ], setMembers: [], }; - } else if (uuid == 'date-uuid') { - data = { - uuid: 'date-uuid', - display: 'Date', - datatype: { display: 'Date', uuid: 'dt' }, - answers: [], - setMembers: [], - }; } else { throw Error(`Programming error, you probably didn't mean to do this: unknown concept uuid '${uuid}'`); } @@ -127,21 +118,6 @@ const numberFieldDef: FieldDefinition = { customConceptAnswers: [], }; -const dateFieldDef: FieldDefinition = { - id: 'date', - type: 'obs', - label: '', - placeholder: '', - showHeading: false, - uuid: 'date-uuid', - validation: { - required: false, - matches: null, - }, - answerConceptSetUuid: null, - customConceptAnswers: [], -}; - const codedFieldDef: FieldDefinition = { id: 'nationality', type: 'obs', @@ -187,12 +163,6 @@ describe('ObsField', () => { expect(screen.getByRole('spinbutton')).toBeInTheDocument(); }); - it('renders a date picker for date concept', async () => { - render(); - // expect(screen.getByLabelText("Date")).toBeInTheDocument(); - expect(screen.getByRole('textbox')).toBeInTheDocument(); - }); - it('renders a select for a coded concept', () => { render(); // expect(screen.getByLabelText("Nationality")).toBeInTheDocument();