(feat) O3-4342: Split allergy form fields #2193
Open
Conversation
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
denniskigen
changed the title
denniskigen
changed the title
|
@Muppasanipraneeth could you add screenshots to support your changes? |
denniskigen
reviewed
Jan 17, 2025
| @@ -45,7 +45,7 @@ const AllergiesDetailedSummary: React.FC<AllergiesDetailedSummaryProps> = ({ pat | |||
| { key: 'reaction', header: t('reaction', 'Reaction') }, | |||
| { | |||
| key: 'note', | |||
| header: t('onsetDateAndComments', 'Onset date and comments'), | |||
| header: t('onsetDate', 'Onset date '), | |||
There was a problem hiding this comment.
Suggested change
| header: t('onsetDate', 'Onset date '), | |
| header: t('onsetDate', 'Onset date'), |
| return currentDate <= new Date(); | ||
| }, | ||
| { | ||
| message: 'Date cannot be in the future', |
There was a problem hiding this comment.
Wrap this in a t function for i18n.
denniskigen
reviewed
Jan 20, 2025
| render={({ field: { onBlur, onChange, value } }) => ( | ||
| <OpenmrsDatePicker | ||
| id="onsetDate" | ||
| label={t('DateofOnset', 'Date of Onset ')} |
There was a problem hiding this comment.
Suggested change
| label={t('DateofOnset', 'Date of Onset ')} | |
| label={t('dateOfOnset', 'Date of Onset')} |
Comment on lines
426
to
428
| onChange={(selectedDate) => { | ||
| return onChange(selectedDate); | ||
| }} |
There was a problem hiding this comment.
Suggested change
| onChange={(selectedDate) => { | |
| return onChange(selectedDate); | |
| }} | |
| onChange={(selectedDate) => onChange(selectedDate}) |
| @@ -410,7 +443,7 @@ function AllergyForm(props: AllergyFormProps) { | |||
| <TextArea | |||
| id="comments" | |||
| invalidText={t('invalidComment', 'Invalid comment, try again')} | |||
There was a problem hiding this comment.
Suggested change
| invalidText={t('invalidComment', 'Invalid comment, try again')} |
In which circumstances would the comment field be invalid? Per the zod schema, it's an optional field (comment: z.string().optional()). It has no calidation rules that could make it invalid. We should only use the invalid and invalidText props if there are validation rules in place.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requirements
Summary
This PR separates the 'Onset date' and 'Additional comments' fields in the allergy form. Presently, the two are combined in a single field. Separating them aligns them with the designs and allows for proper validation of the individual fields.
Screenshots
Related Issue
https://issues.openmrs.org/browse/O3-4342
Other