-
Notifications
You must be signed in to change notification settings - Fork 211
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/metrics
- Loading branch information
Showing
38 changed files
with
2,005 additions
and
1,520 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 6 additions & 4 deletions
10
packages/esm-appointments-app/src/calendar/monthly/days-of-week.component.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
packages/esm-appointments-app/src/calendar/monthly/monthly-header.component.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| import React, { useCallback, useContext } from 'react'; | ||
| import dayjs from 'dayjs'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { Button } from '@carbon/react'; | ||
| import { formatDate } from '@openmrs/esm-framework'; | ||
| import { omrsDateFormat } from '../../constants'; | ||
| import DaysOfWeekCard from './days-of-week.component'; | ||
| import SelectedDateContext from '../../hooks/selectedDateContext'; | ||
| import styles from './monthly-header.scss'; | ||
|
|
||
| const DAYS_IN_WEEK = ['SUN', 'MON', 'TUE', 'WED', 'THUR', 'FRI', 'SAT']; | ||
|
|
||
| const MonthlyHeader: React.FC = () => { | ||
| const { t } = useTranslation(); | ||
| const { selectedDate, setSelectedDate } = useContext(SelectedDateContext); | ||
|
|
||
| const handleSelectPrevMonth = useCallback(() => { | ||
| setSelectedDate(dayjs(selectedDate).subtract(1, 'month').format(omrsDateFormat)); | ||
| }, [selectedDate, setSelectedDate]); | ||
|
|
||
| const handleSelectNextMonth = useCallback(() => { | ||
| setSelectedDate(dayjs(selectedDate).add(1, 'month').format(omrsDateFormat)); | ||
| }, [selectedDate, setSelectedDate]); | ||
|
|
||
| return ( | ||
| <> | ||
| <div className={styles.container}> | ||
| <Button | ||
| aria-label={t('previousMonth', 'Previous month')} | ||
| kind="tertiary" | ||
| onClick={handleSelectPrevMonth} | ||
| size="sm"> | ||
| {t('prev', 'Prev')} | ||
| </Button> | ||
| <span>{formatDate(new Date(selectedDate), { day: false, time: false, noToday: true })}</span> | ||
| <Button aria-label={t('nextMonth', 'Next month')} kind="tertiary" onClick={handleSelectNextMonth} size="sm"> | ||
| {t('next', 'Next')} | ||
| </Button> | ||
| </div> | ||
| <div className={styles.workLoadCard}> | ||
| {DAYS_IN_WEEK.map((day) => ( | ||
| <DaysOfWeekCard key={day} dayOfWeek={day} /> | ||
| ))} | ||
| </div> | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default MonthlyHeader; |
40 changes: 0 additions & 40 deletions
40
packages/esm-appointments-app/src/calendar/monthly/monthly-header.module.tsx
This file was deleted.
Oops, something went wrong.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
...gistration-app/src/patient-registration/field/cause-of-death/cause-of-death.component.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| import React, { useMemo } from 'react'; | ||
| import classNames from 'classnames'; | ||
| import { Field, useField } from 'formik'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { InlineNotification, Layer, Select, SelectItem, SelectSkeleton, TextInput } from '@carbon/react'; | ||
| import { useConfig } from '@openmrs/esm-framework'; | ||
| import { type RegistrationConfig } from '../../../config-schema'; | ||
| import { useConceptAnswers } from '../field.resource'; | ||
| import styles from '../field.scss'; | ||
|
|
||
| export const CauseOfDeathField: React.FC = () => { | ||
| const { t } = useTranslation(); | ||
| const { fieldConfigurations, freeTextFieldConceptUuid } = useConfig<RegistrationConfig>(); | ||
| const [deathCause, deathCauseMeta] = useField('deathCause'); | ||
|
|
||
| const conceptUuid = fieldConfigurations?.causeOfDeath?.conceptUuid; | ||
| const required = fieldConfigurations?.causeOfDeath?.required; | ||
|
|
||
| const { | ||
| data: conceptAnswers, | ||
| isLoading: isLoadingConceptAnswers, | ||
| error: errorLoadingConceptAnswers, | ||
| } = useConceptAnswers(conceptUuid); | ||
|
|
||
| const answers = useMemo(() => { | ||
| if (!isLoadingConceptAnswers && conceptAnswers) { | ||
| return conceptAnswers.map((answer) => ({ ...answer, label: answer.display })); | ||
| } | ||
| return []; | ||
| }, [conceptAnswers, isLoadingConceptAnswers]); | ||
|
|
||
| if (isLoadingConceptAnswers) { | ||
| return ( | ||
| <div className={classNames(styles.customField, styles.halfWidthInDesktopView)}> | ||
| <h4 className={styles.productiveHeading02Light}>{t('causeOfDeathInputLabel', 'Cause of death')}</h4> | ||
| <SelectSkeleton /> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| return ( | ||
| <div className={classNames(styles.customField, styles.halfWidthInDesktopView)}> | ||
| <h4 className={styles.productiveHeading02Light}>{t('causeOfDeathInputLabel', 'Cause of death')}</h4> | ||
| {errorLoadingConceptAnswers || !conceptUuid ? ( | ||
| <InlineNotification | ||
| hideCloseButton | ||
| kind="error" | ||
| title={t('errorFetchingCodedCausesOfDeath', 'Error fetching coded causes of death')} | ||
| subtitle={t('refreshOrContactAdmin', 'Try refreshing the page or contact your system administrator')} | ||
| /> | ||
| ) : ( | ||
| <> | ||
| <Field name="deathCause"> | ||
| {({ field, form: { touched, errors }, meta }) => { | ||
| return ( | ||
| <Layer> | ||
| <Select | ||
| {...field} | ||
| id="deathCause" | ||
| invalid={errors.deathCause && touched.deathCause} | ||
| invalidText={errors.deathCause?.message} | ||
| labelText={t('causeOfDeathInputLabel', 'Cause of Death')} | ||
| name="deathCause" | ||
| required={required}> | ||
| <SelectItem id="empty-default-option" value={null} text={t('selectAnOption', 'Select an option')} /> | ||
| {answers.map((answer) => ( | ||
| <SelectItem id={answer.uuid} key={answer.uuid} text={answer.label} value={answer.uuid} /> | ||
| ))} | ||
| </Select> | ||
| </Layer> | ||
| ); | ||
| }} | ||
| </Field> | ||
| {deathCause.value === freeTextFieldConceptUuid && ( | ||
| <div className={styles.nonCodedCauseOfDeath}> | ||
| <Field name="nonCodedCauseOfDeath"> | ||
| {({ field, form: { touched, errors }, meta }) => { | ||
| return ( | ||
| <Layer> | ||
| <TextInput | ||
| {...field} | ||
| id="nonCodedCauseOfDeath" | ||
| invalid={errors?.nonCodedCauseOfDeath && touched.nonCodedCauseOfDeath} | ||
| invalidText={errors?.nonCodedCauseOfDeath?.message} | ||
| labelText={t('nonCodedCauseOfDeath', 'Non-coded cause of death')} | ||
| placeholder={t('enterNonCodedCauseOfDeath', 'Enter non-coded cause of death')} | ||
| /> | ||
| </Layer> | ||
| ); | ||
| }} | ||
| </Field> | ||
| </div> | ||
| )} | ||
| </> | ||
| )} | ||
| </div> | ||
| ); | ||
| }; |
Oops, something went wrong.