Allow case insensitive special date/time format for datetime fields (#…

…6044)
LabKey · Nov 12, 2024 · 7a84f7d · 7a84f7d
1 parent 74a6301
commit 7a84f7d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/api/src/org/labkey/api/util/DateUtil.java b/api/src/org/labkey/api/util/DateUtil.java
@@ -26,6 +26,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.junit.Assert;
 import org.junit.Test;
+import org.labkey.api.collections.CaseInsensitiveHashSet;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
 import org.labkey.api.pipeline.PipelineJobService;
@@ -1368,14 +1369,16 @@ public static String getTimeFormatString(Container c)
         return FolderSettingsCache.getDefaultTimeFormat(c);
     }
 
+    public static final Set<String> META_FORMATS = CaseInsensitiveHashSet.of("Date", "DateTime", "Time");
+
     /**
      * Test a date format string to determine if it matches one of LabKey's special named date formats (Date, DateTime, Time)
      * @param dateFormat Format string to test
      * @return True if the dateFormat matches one of LabKey's special named date formats, otherwise False
      */
     public static boolean isSpecialNamedFormat(String dateFormat)
     {
-        return "Date".equals(dateFormat) || "DateTime".equals(dateFormat) || "Time".equals(dateFormat);
+        return META_FORMATS.contains(dateFormat);
     }
 
     private static final FastDateFormat jsonDateFormat = FastDateFormat.getInstance(getJsonDateTimeFormatString());

diff --git a/core/src/org/labkey/core/admin/DisplayFormatAnalyzer.java b/core/src/org/labkey/core/admin/DisplayFormatAnalyzer.java
@@ -36,6 +36,7 @@
 
 import static org.labkey.api.settings.AbstractSettingsGroup.SITE_CONFIG_USER;
 import static org.labkey.api.settings.LookAndFeelFolderProperties.LOOK_AND_FEEL_SET_NAME;
+import static org.labkey.api.util.DateUtil.META_FORMATS;
 
 public class DisplayFormatAnalyzer
 {
@@ -98,8 +99,6 @@ public DisplayFormatAnalyzer()
             .forEach(candidate -> _propertyCandidateMap.put(candidate.container(), candidate));
     }
 
-    private static final Set<String> META_FORMATS = CaseInsensitiveHashSet.of("Date", "DateTime", "Time");
-
     // Allows standard formats and standard meta formats
     private boolean isNonStandardFormat(DateDisplayFormatType type, String format)
     {

diff --git a/experiment/src/org/labkey/experiment/api/property/DomainImpl.java b/experiment/src/org/labkey/experiment/api/property/DomainImpl.java
@@ -447,7 +447,7 @@ private void validatePropertyFormat(DomainProperty dp) throws ChangePropertyDesc
             if (!StringUtils.isEmpty(dp.getFormat()))
             {
                 String ptype = dp.getRangeURI();
-                if (ptype.equalsIgnoreCase(PropertyType.DATE_TIME.getTypeUri()))
+                if (ptype.equalsIgnoreCase(PropertyType.DATE_TIME.getTypeUri())) // TODO: Check Date and Time also?
                 {
                     type = " for type " + PropertyType.DATE_TIME.getXarName();
                     // Allow special named formats (these would otherwise fail validation)