Skip to content
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

HTML-777: Validate that encounter dates times are within visit start and end date. #48

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

HTML-777: Validate that encounter dates times are within visit start and end date. #48

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fb916b8
HTML-777 - Validate date in Edit mode
icrc-toliveira May 24, 2021
f03b444
HTML-777 - Ident the file using the install
icrc-toliveira May 28, 2021
ad82966
HTML-777 - Add test for Changing date in edit mode
icrc-toliveira Jul 1, 2021
5ac2413
Merge branch 'master' of https://github.com/openmrs/openmrs-module-ht…
icrc-toliveira Jul 1, 2021
2173976
HTML-777 - Resolve conflict
icrc-toliveira Jul 1, 2021
f0f6345
HTML-777 - Clean indentation
icrc-toliveira Jul 1, 2021
2895a05
HTML-777 - Fix error found in testEditingHtmlFormDefinedInUiResourceS…
icrc-toliveira Jul 8, 2021
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
13 changes: 13 additions & 0 deletions .../module/htmlformentryui/fragment/controller/htmlform/EnterHtmlFormFragmentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,19 @@ && hasNoTimeComponent(formEncounter.getEncounterDatetime())) {
new FormSubmissionError("general-form-error", ui.message("htmlformentryui.datetimeBeforeVisitDate")));
}

if (validationErrors.size() > 0) {
return returnHelper(validationErrors, fes, null);
}
} else if(visit != null) {
Copy link

Choose a reason for hiding this comment

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

thanks @icrc-toliveira we can put this on the same line

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @HerbertYiga
I´m not sure if this was you mean, but I change the indentation to be on the same line.
However, I noticed that if I let the project auto-ident, the entire file will have changes

if (encounter.getEncounterDatetime().before(visit.getStartDatetime())) {
validationErrors.add(
new FormSubmissionError("general-form-error", ui.message("htmlformentryui.datetimeAfterVisitDate")));
}

if (visit.getStopDatetime() != null && encounter.getEncounterDatetime().after(visit.getStopDatetime())) {
validationErrors.add(
new FormSubmissionError("general-form-error", ui.message("htmlformentryui.datetimeBeforeVisitDate")));
}
if (validationErrors.size() > 0) {
return returnHelper(validationErrors, fes, null);
}
Expand Down