Skip to content

(#3202) Add yyyy.mm.dd hh:mm:ss format #3205

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 1 commit into from
Nov 6, 2025
Merged

(#3202) Add yyyy.mm.dd hh:mm:ss format #3205

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions WebApp/junit/resources/testsets/DateTimeFormatsBeanDateTimeTest.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,4 @@ dummy,ALL
01.01.01 25:01:01,ALL
20010101010101,YYYYMMDDhhmmss
20010130010101,YYYYMMDDhhmmss
2025.01.30 12:12:12,YYYY.MM.DD hh:mm:ss
1 change: 1 addition & 0 deletions ...nit/uk/ac/exeter/QuinCe/web/Instrument/NewInstrument/DateTimeFormatsBeanDateTimeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class DateTimeFormatsBeanDateTimeTest extends TestSetTest {
DateTimeFormatsBean.DT_YYYYMMDD_HYPHEN_MS_D,
DateTimeFormatsBean.DT_YYYYMMDD_SLASH_D,
DateTimeFormatsBean.DT_YYYYMMDD_SLASH_MS_D,
DateTimeFormatsBean.DT_YYYYMMDD_DOT_D,
DateTimeFormatsBean.DT_MMDDYYYY_SLASH_D,
DateTimeFormatsBean.DT_MMDDYY_SLASH_D,
DateTimeFormatsBean.DT_DDMMYYYY_SLASH_D,
Expand Down
15 changes: 15 additions & 0 deletions WebApp/src/uk/ac/exeter/QuinCe/web/Instrument/NewInstrument/DateTimeFormatsBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@ public class DateTimeFormatsBean {

public static final String DT_YYYYMMDD_SLASH_MS_D = "YYYY/MM/DD hh:mm:ss.SSS";

protected static final String DT_YYYYMMDD_DOT_S = "yyyy.MM.dd HH:mm:ss";

public static final DateTimeFormatter DT_YYYYMMDD_DOT_F = DateTimeFormatter
.ofPattern(DT_YYYYMMDD_DOT_S);

public static final String DT_YYYYMMDD_DOT_D = "YYYY.MM.DD hh:mm:ss";

protected static final String DT_MMDDYYYY_SLASH_S = "MM/dd/yyyy HH:mm:ss";

public static final DateTimeFormatter DT_MMDDYYYY_SLASH_F = DateTimeFormatter
Expand Down Expand Up @@ -360,6 +367,13 @@ public Map<String, String> getDateTimeFormats() {
// noop
}

try {
LocalDateTime.parse(dateTimeValue, DT_YYYYMMDD_DOT_F);
formats.put(DT_YYYYMMDD_DOT_D, DT_YYYYMMDD_DOT_S);
} catch (DateTimeParseException e) {
// noop
}

try {
LocalDateTime.parse(dateTimeValue, DT_YYYYMMDD_SLASH_MS_F);
formats.put(DT_YYYYMMDD_SLASH_MS_D, DT_YYYYMMDD_SLASH_MS_S);
Expand Down Expand Up @@ -441,6 +455,7 @@ public Map<String, String> getDateTimeFormats() {
formats.put(DT_YYYYMMDD_HYPHEN_D, DT_YYYYMMDD_HYPHEN_S);
formats.put(DT_YYYYMMDD_HYPHEN_MS_D, DT_YYYYMMDD_HYPHEN_MS_S);
formats.put(DT_YYYYMMDD_SLASH_D, DT_YYYYMMDD_SLASH_S);
formats.put(DT_YYYYMMDD_DOT_D, DT_YYYYMMDD_DOT_S);
formats.put(DT_YYYYMMDD_SLASH_MS_D, DT_YYYYMMDD_SLASH_MS_S);
formats.put(DT_MMDDYYYY_SLASH_D, DT_MMDDYYYY_SLASH_S);
formats.put(DT_MMDDYY_SLASH_D, DT_MMDDYY_SLASH_S);
Expand Down