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-1988 - Setting the timezone were instead of having it already as… #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

HTML-1988 - Setting the timezone were instead of having it already as… #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions api/src/main/java/org/openmrs/module/htmlformentryui/element/ObsFromFragmentElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant;
import java.time.OffsetDateTime;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import javax.servlet.http.HttpServletRequest;

import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -163,12 +165,16 @@ protected Object convertToType(String val) {
}
if (dataType.isDateTime() || dataType.isTime()) {
try {
DateFormat df = new SimpleDateFormat(WebConstants.DATE_FORMAT_DATETIME);
df.setLenient(false);
if (dataType.isDateTime() && uiUtils.convertTimezones() && uiUtils.getClientTimezone() != null) {
df.setTimeZone(TimeZone.getTimeZone(uiUtils.getClientTimezone()));
// Datetimepicker can send one of 2 formats "yyyy-MM-dd HH:mm:ss" / "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
Copy link
Member

Choose a reason for hiding this comment

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

What are the conditions which lead to the widget sending either of the two formats?

try {
Instant instant = OffsetDateTime.parse(val).toInstant();
return Date.from(instant);
}
catch (DateTimeParseException e) {
DateFormat df = new SimpleDateFormat(WebConstants.DATE_FORMAT_DATETIME);
df.setLenient(false);
Copy link
Member

Choose a reason for hiding this comment

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

Did you intentionally leave out df.setTimeZone()?

return df.parse(val);
}
return df.parse(val);
}
catch (ParseException e) {
throw new IllegalArgumentException("Failed to parse date: " + val, e);
Expand Down