@openmrs/esm-service-queues-app 8.3.2-pre.4950 → 8.3.2-pre.4955

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -4,8 +4,6 @@ import {
4
4
  Button,
5
5
  ButtonSet,
6
6
  Column,
7
- DatePicker,
8
- DatePickerInput,
9
7
  Dropdown,
10
8
  Form,
11
9
  Layer,
@@ -18,6 +16,7 @@ import {
18
16
  import dayjs from 'dayjs';
19
17
  import {
20
18
  type DefaultWorkspaceProps,
19
+ OpenmrsDatePicker,
21
20
  toDateObjectStrict,
22
21
  toOmrsIsoString,
23
22
  useLayoutType,
@@ -129,18 +128,13 @@ const QueueLinelistFilter: React.FC<DefaultWorkspaceProps> = ({ closeWorkspace }
129
128
  <Column md={2}>
130
129
  <p className={styles.heading}> {t('returnDate', 'Return Date')}</p>
131
130
  <Layer>
132
- <DatePicker
133
- datePickerType="single"
134
- dateFormat={datePickerFormat}
131
+ <OpenmrsDatePicker
135
132
  value={returnDate}
136
- onChange={([date]) => setReturnDate(date)}>
137
- <DatePickerInput
138
- id="returnDate"
139
- placeholder={datePickerPlaceHolder}
140
- labelText={t('date', 'Date')}
141
- type="date"
142
- />
143
- </DatePicker>
133
+ onChange={setReturnDate}
134
+ id="returnDate"
135
+ data-testid="returnDate"
136
+ labelText={t('date', 'Date')}
137
+ />
144
138
  </Layer>
145
139
  <Button
146
140
  kind="ghost"
@@ -4,8 +4,6 @@ import {
4
4
  Button,
5
5
  Checkbox,
6
6
  ContentSwitcher,
7
- DatePicker,
8
- DatePickerInput,
9
7
  InlineNotification,
10
8
  ModalBody,
11
9
  ModalFooter,
@@ -21,8 +19,8 @@ import {
21
19
  TimePickerSelect,
22
20
  } from '@carbon/react';
23
21
  import { useTranslation } from 'react-i18next';
24
- import { showSnackbar, type FetchResponse } from '@openmrs/esm-framework';
25
- import { datePickerFormat, datePickerPlaceHolder, time12HourFormatRegexPattern } from '../../constants';
22
+ import { OpenmrsDatePicker, showSnackbar, type FetchResponse } from '@openmrs/esm-framework';
23
+ import { time12HourFormatRegexPattern } from '../../constants';
26
24
  import { convertTime12to24, type amPm } from '../../helpers/time-helpers';
27
25
  import { useMutateQueueEntries } from '../../hooks/useQueueEntries';
28
26
  import { useQueues } from '../../hooks/useQueues';
@@ -334,21 +332,15 @@ export const QueueEntryActionModal: React.FC<QueueEntryActionModalProps> = ({
334
332
  }}
335
333
  />
336
334
  <div className={styles.dateTimeFields}>
337
- <DatePicker
338
- datePickerType="single"
339
- dateFormat={datePickerFormat}
335
+ <OpenmrsDatePicker
340
336
  value={formState.transitionDate}
341
- maxDate={new Date().setHours(23, 59, 59, 59)}
342
- onChange={([date]) => {
343
- setTransitionDate(date);
344
- }}>
345
- <DatePickerInput
346
- id="datePickerInput"
347
- labelText={t('date', 'Date')}
348
- placeholder={datePickerPlaceHolder}
349
- disabled={!formState.modifyDefaultTransitionDateTime}
350
- />
351
- </DatePicker>
337
+ maxDate={new Date()}
338
+ onChange={setTransitionDate}
339
+ id="datePickerInput"
340
+ data-testid="datePickerInput"
341
+ labelText={t('date', 'Date')}
342
+ isDisabled={!formState.modifyDefaultTransitionDateTime}
343
+ />
352
344
 
353
345
  <TimePicker
354
346
  labelText={t('time', 'Time')}