Skip to content

Commit 289145b

Browse files
(#3202) Add yyyy.mm.dd hh:mm:ss format
1 parent 6ccec00 commit 289145b

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

WebApp/junit/resources/testsets/DateTimeFormatsBeanDateTimeTest.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,4 @@ dummy,ALL
5151
01.01.01 25:01:01,ALL
5252
20010101010101,YYYYMMDDhhmmss
5353
20010130010101,YYYYMMDDhhmmss
54+
2025.01.30 12:12:12,YYYY.MM.DD hh:mm:ss

WebApp/junit/uk/ac/exeter/QuinCe/web/Instrument/NewInstrument/DateTimeFormatsBeanDateTimeTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public class DateTimeFormatsBeanDateTimeTest extends TestSetTest {
3333
DateTimeFormatsBean.DT_YYYYMMDD_HYPHEN_MS_D,
3434
DateTimeFormatsBean.DT_YYYYMMDD_SLASH_D,
3535
DateTimeFormatsBean.DT_YYYYMMDD_SLASH_MS_D,
36+
DateTimeFormatsBean.DT_YYYYMMDD_DOT_D,
3637
DateTimeFormatsBean.DT_MMDDYYYY_SLASH_D,
3738
DateTimeFormatsBean.DT_MMDDYY_SLASH_D,
3839
DateTimeFormatsBean.DT_DDMMYYYY_SLASH_D,

WebApp/src/uk/ac/exeter/QuinCe/web/Instrument/NewInstrument/DateTimeFormatsBean.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,13 @@ public class DateTimeFormatsBean {
8686

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

89+
protected static final String DT_YYYYMMDD_DOT_S = "yyyy.MM.dd HH:mm:ss";
90+
91+
public static final DateTimeFormatter DT_YYYYMMDD_DOT_F = DateTimeFormatter
92+
.ofPattern(DT_YYYYMMDD_DOT_S);
93+
94+
public static final String DT_YYYYMMDD_DOT_D = "YYYY.MM.DD hh:mm:ss";
95+
8996
protected static final String DT_MMDDYYYY_SLASH_S = "MM/dd/yyyy HH:mm:ss";
9097

9198
public static final DateTimeFormatter DT_MMDDYYYY_SLASH_F = DateTimeFormatter
@@ -360,6 +367,13 @@ public Map<String, String> getDateTimeFormats() {
360367
// noop
361368
}
362369

370+
try {
371+
LocalDateTime.parse(dateTimeValue, DT_YYYYMMDD_DOT_F);
372+
formats.put(DT_YYYYMMDD_DOT_D, DT_YYYYMMDD_DOT_S);
373+
} catch (DateTimeParseException e) {
374+
// noop
375+
}
376+
363377
try {
364378
LocalDateTime.parse(dateTimeValue, DT_YYYYMMDD_SLASH_MS_F);
365379
formats.put(DT_YYYYMMDD_SLASH_MS_D, DT_YYYYMMDD_SLASH_MS_S);
@@ -441,6 +455,7 @@ public Map<String, String> getDateTimeFormats() {
441455
formats.put(DT_YYYYMMDD_HYPHEN_D, DT_YYYYMMDD_HYPHEN_S);
442456
formats.put(DT_YYYYMMDD_HYPHEN_MS_D, DT_YYYYMMDD_HYPHEN_MS_S);
443457
formats.put(DT_YYYYMMDD_SLASH_D, DT_YYYYMMDD_SLASH_S);
458+
formats.put(DT_YYYYMMDD_DOT_D, DT_YYYYMMDD_DOT_S);
444459
formats.put(DT_YYYYMMDD_SLASH_MS_D, DT_YYYYMMDD_SLASH_MS_S);
445460
formats.put(DT_MMDDYYYY_SLASH_D, DT_MMDDYYYY_SLASH_S);
446461
formats.put(DT_MMDDYY_SLASH_D, DT_MMDDYY_SLASH_S);

0 commit comments

Comments
 (0)