Skip to content

355 carer in entry form is not required #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 26, 2025
Merged

355 carer in entry form is not required #357

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
234f60c
fix: validation for carer not selected
stampaaaron Feb 26, 2025
1143d5f
ci: add changeset
stampaaaron Feb 26, 2025
d947f83
feat: enhance resetting and validating entity select
stampaaaron Feb 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/small-wombats-beg.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@quassel/frontend": patch
---

Fix validation if no carer is selected in Entry form
4 changes: 2 additions & 2 deletions apps/frontend/src/components/questionnaire/calendar/EntryForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@
initialValues: {
startedAt: "",
endedAt: "",
carer: 0,
carer: -1,

Check warning on line 56 in apps/frontend/src/components/questionnaire/calendar/EntryForm.tsx

View check run for this annotation

Codecov / codecov/patch

apps/frontend/src/components/questionnaire/calendar/EntryForm.tsx#L56 

Added line #L56 was not covered by tests
weekday: 0,
entryLanguages: [{ ratio: 100 }],
},
validate: {
startedAt: isNotEmpty(t.validationNotEmpty),
endedAt: isNotEmpty(t.validationNotEmpty),
carer: isNotEmpty(t.validationNotEmpty),
carer: (value) => (value === -1 || !value ? t.validationNotEmpty : undefined),

Check warning on line 63 in apps/frontend/src/components/questionnaire/calendar/EntryForm.tsx

View check run for this annotation

Codecov / codecov/patch

apps/frontend/src/components/questionnaire/calendar/EntryForm.tsx#L63 

Added line #L63 was not covered by tests
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When someone selected a carer and then empty the input field, the validation isn't triggered. The previously selected carer is used. Maybe this can be improved?

entryLanguages: {
ratio: (value) => {
const fieldError = isInRange({ min: 1, max: 100 }, t.validationRatio)(value);
Expand Down