Date/time formatting simplifications

api/src/org/labkey/api/admin/FolderWriterImpl.java

@@ -143,8 +143,9 @@ private void writeFolderXml(Container c, FolderExportContext ctx, VirtualFile vf
         if (null != extraTimeParsingPattern)
             folderXml.setExtraTimeParsingPattern(extraTimeParsingPattern);
 
-        if (props.areRestrictedColumnsEnabled())
-            folderXml.setRestrictedColumnsEnabled(true);
+        Boolean areRestricted = props.areRestrictedColumnsEnabledStored();
+        if (null != areRestricted)
+            folderXml.setRestrictedColumnsEnabled(areRestricted);
 
         // Save the folder.xml file. This gets called last, after all other writers have populated the other sections.
         vf.saveXmlBean("folder.xml", ctx.getDocument());

api/src/org/labkey/api/data/Container.java

@@ -63,6 +63,7 @@
 import org.labkey.api.util.ContainerContext;
 import org.labkey.api.util.DateUtil;
 import org.labkey.api.util.FileUtil;
+import org.labkey.api.util.Formats;
 import org.labkey.api.util.GUID;
 import org.labkey.api.util.NetworkDrive;
 import org.labkey.api.util.PageFlowUtil;
@@ -1368,10 +1369,10 @@ private Container findDescendant(Container parent, String name)
 
     public Map<String, Object> toJSON(User user)
     {
-        return toJSON(user, true, true);
+        return toJSON(user, true, true, false);
     }
 
-    public Map<String, Object> toJSON(User user, boolean includePermissions, boolean includeStandardProps)
+    public Map<String, Object> toJSON(User user, boolean includePermissions, boolean includeStandardProps, boolean includeParentFormatProps)
     {
         Map<String, Object> containerProps = new HashMap<>();
         Container parent = getParent();
@@ -1384,10 +1385,27 @@ public Map<String, Object> toJSON(User user, boolean includePermissions, boolean
 
             LookAndFeelProperties props = LookAndFeelProperties.getInstance(this);
             Map<String, Object> formats = new HashMap<>();
-            formats.put("dateFormat", DateUtil.getDateFormatString(this));
+            formats.put("dateFormat", props.getDefaultDateFormat()); // when to use DateUtil.getDateFormatString vs laf.getDefaultDateFormat?
             formats.put("dateTimeFormat", props.getDefaultDateTimeFormat());
             formats.put("numberFormat", props.getDefaultNumberFormat());
-            formats.put("timeFormat", DateUtil.getTimeFormatString(this));
+            formats.put("timeFormat", props.getDefaultTimeFormat());
+
+            if (includeParentFormatProps)
+            {
+                formats.put("dateFormatInherited", StringUtils.isEmpty(props.getDefaultDateFormatStored()));
+                formats.put("dateTimeFormatInherited", StringUtils.isEmpty(props.getDefaultDateTimeFormatStored()));
+                formats.put("numberFormatInherited", StringUtils.isEmpty(props.getDefaultNumberFormatStored()));
+                formats.put("timeFormatInherited", StringUtils.isEmpty(props.getDefaultTimeFormatStored()));
+
+                if (!isRoot())
+                {
+                    Container parentContainer = getParent();  // when to use DateUtil.getDateFormatString vs laf.getDefaultDateFormat?
+                    formats.put("parentDateFormat", DateUtil.getDateFormatString(parentContainer));
+                    formats.put("parentDateTimeFormat", DateUtil.getDateTimeFormatString(parentContainer));
+                    formats.put("parentNumberFormat", Formats.getNumberFormatString(parentContainer));
+                    formats.put("parentTimeFormat", DateUtil.getTimeFormatString(parentContainer));
+                }
+            }
             containerProps.put("formats", formats);
         }
 

api/src/org/labkey/api/jsp/JspBase.java

@@ -814,7 +814,7 @@ protected HtmlString getScriptNonce()
         return _pageConfig.getScriptNonce();
     }
 
-    protected void addHandler(String id, String event, String handler)
+    public void addHandler(String id, String event, String handler)
     {
         _pageConfig.addHandler(id,event,handler);
     }

api/src/org/labkey/api/settings/AbstractWriteableSettingsGroup.java

@@ -186,7 +186,7 @@ public static void appendDiffRow(StringBuilder html, String key, String oldValue
 
     private static String obscureValue(String value)
     {
-        if(null == value || value.length() == 0)
+        if(null == value || value.isEmpty())
             return "";
         else
             return "*******"; //use fixed number to obscure num characters

api/src/org/labkey/api/settings/LookAndFeelFolderProperties.java

@@ -19,6 +19,8 @@
 import org.labkey.api.data.Container;
 import org.labkey.api.util.DateUtil;
 
+import java.util.Map;
+
 import static org.labkey.api.settings.LookAndFeelProperties.Properties.extraDateParsingPattern;
 import static org.labkey.api.settings.LookAndFeelProperties.Properties.extraDateTimeParsingPattern;
 import static org.labkey.api.settings.LookAndFeelProperties.Properties.extraTimeParsingPattern;
@@ -38,7 +40,6 @@ public class LookAndFeelFolderProperties extends AbstractWriteableSettingsGroup
     protected static final String defaultNumberFormatString = "defaultNumberFormatString";
     protected static final String defaultTimeFormatString = "defaultTimeFormatString";
 
-
     protected final Container _c;
 
     protected LookAndFeelFolderProperties(Container c)
@@ -58,12 +59,6 @@ protected String getGroupName()
         return LOOK_AND_FEEL_SET_NAME;
     }
 
-    public boolean isPropertyInherited(Container c, String name)
-    {
-        String value = super.lookupStringValue(c, name, null);
-        return null == value;
-    }
-
     @Override
     protected String lookupStringValue(String name, @Nullable String defaultValue)
     {
@@ -84,6 +79,19 @@ protected String lookupStringValue(Container c, String name, @Nullable String de
         return value;
     }
 
+    // Get the actual stored value in this container; no default handling, no walking the hierarchy
+    protected String getStoredValue(Container c, String name)
+    {
+        Map<String, String> props = getProperties(c);
+        return props.get(name);
+    }
+
+    // Get the actual stored value in this container; no default handling, no walking the hierarchy
+    protected String getStoredValue(Container c, Enum<?> e)
+    {
+        return getStoredValue(c, e.name());
+    }
+
     // TODO: consider enforcing usage of lookupBooleanValue with container
     /*@Override
     protected boolean lookupBooleanValue(String name, boolean defaultValue)
@@ -93,91 +101,105 @@ protected boolean lookupBooleanValue(String name, boolean defaultValue)
 
     public String getDefaultDateFormat()
     {
-        // Look up this value starting from the current container (unlike most look & feel settings)
+        // Look up this value starting from the current container
         return lookupStringValue(_c, defaultDateFormatString, DateUtil.getStandardDateFormatString());
     }
 
+    // Get the value that's actually stored in this container or null if inherited; don't look up the hierarchy
+    // This is useful for export and showing inheritance status in the UI.
+    public String getDefaultDateFormatStored()
+    {
+        return getStoredValue(_c, defaultDateFormatString);
+    }
+
     public String getDefaultDateTimeFormat()
     {
-        // Look up this value starting from the current container (unlike most look & feel settings)
+        // Look up this value starting from the current container
         return lookupStringValue(_c, defaultDateTimeFormatString, DateUtil.getStandardDateTimeFormatString());
     }
 
-    public String getDefaultTimeFormat()
+    // Get the value that's actually stored in this container or null if inherited; don't look up the hierarchy.
+    // This is useful for export and showing inheritance status in the UI.
+    public String getDefaultDateTimeFormatStored()
     {
-        // Look up this value starting from the current container (unlike most look & feel settings)
-        return lookupStringValue(_c, defaultTimeFormatString, DateUtil.getStandardTimeFormatString());
+        return getStoredValue(_c, defaultDateTimeFormatString);
     }
 
-    public String getDefaultNumberFormat()
+    public String getDefaultTimeFormat()
     {
-        // Look up this value starting from the current container (unlike most look & feel settings)
-        return lookupStringValue(_c, defaultNumberFormatString, null);
+        // Look up this value starting from the current container
+        return lookupStringValue(_c, defaultTimeFormatString, DateUtil.getStandardTimeFormatString());
     }
 
-    public String getExtraDateParsingPattern()
+    // Get the value that's actually stored in this container or null if inherited; don't look up the hierarchy.
+    // This is useful for export and showing inheritance status in the UI.
+    public String getDefaultTimeFormatStored()
     {
-        // Look up this value starting from the current container (unlike most look & feel settings)
-        return lookupStringValue(_c, extraDateParsingPattern, null);
+        return getStoredValue(_c, defaultTimeFormatString);
     }
 
-    public String getExtraDateTimeParsingPattern()
+    public String getDefaultNumberFormat()
     {
-        // Look up this value starting from the current container (unlike most look & feel settings)
-        return lookupStringValue(_c, extraDateTimeParsingPattern, null);
+        // Look up this value starting from the current container
+        return lookupStringValue(_c, defaultNumberFormatString, null);
     }
 
-    public String getExtraTimeParsingPattern()
+    // Get the value that's actually stored in this container or null if inherited; don't look up the hierarchy.
+    // This is useful for export and showing inheritance status in the UI.
+    public String getDefaultNumberFormatStored()
     {
-        // Look up this value starting from the current container (unlike most look & feel settings)
-        return lookupStringValue(_c, extraTimeParsingPattern, null);
+        return getStoredValue(_c, defaultNumberFormatString);
     }
 
-    public boolean areRestrictedColumnsEnabled()
+    public String getExtraDateParsingPattern()
     {
-        return lookupBooleanValue(_c, restrictedColumnsEnabled, false);
+        // Look up this value starting from the current container
+        return lookupStringValue(_c, extraDateParsingPattern, null);
     }
 
-    // Get the value that's actually stored in this container; don't look up the hierarchy. This is useful only for export.
-    public String getDefaultDateFormatStored()
+    // Get the value that's actually stored in this container or null if inherited; don't look up the hierarchy.
+    // This is useful for export and showing inheritance status in the UI.
+    public String getExtraDateParsingPatternStored()
     {
-        return super.lookupStringValue(_c, defaultDateFormatString, null);
+        return getStoredValue(_c, extraDateParsingPattern);
     }
 
-    // Get the value that's actually stored in this container; don't look up the hierarchy. This is useful only for export.
-    public String getDefaultDateTimeFormatStored()
+    public String getExtraDateTimeParsingPattern()
     {
-        return super.lookupStringValue(_c, defaultDateTimeFormatString, null);
+        // Look up this value starting from the current container
+        return lookupStringValue(_c, extraDateTimeParsingPattern, null);
     }
 
-    // Get the value that's actually stored in this container; don't look up the hierarchy. This is useful only for export.
-    public String getDefaultNumberFormatStored()
+    // Get the value that's actually stored in this container or null if inherited; don't look up the hierarchy.
+    // This is useful for export and showing inheritance status in the UI.
+    public String getExtraDateTimeParsingPatternStored()
     {
-        return super.lookupStringValue(_c, defaultNumberFormatString, null);
+        return getStoredValue(_c, extraDateTimeParsingPattern);
     }
 
-    // Get the value that's actually stored in this container; don't look up the hierarchy. This is useful only for export.
-    public String getDefaultTimeFormatStored()
+    public String getExtraTimeParsingPattern()
     {
-        return super.lookupStringValue(_c, defaultTimeFormatString, null);
+        // Look up this value starting from the current container
+        return lookupStringValue(_c, extraTimeParsingPattern, null);
     }
 
-
-    // Get the value that's actually stored in this container; don't look up the hierarchy. This is useful only for export.
-    public String getExtraDateParsingPatternStored()
+    // Get the value that's actually stored in this container or null if inherited; don't look up the hierarchy.
+    // This is useful for export and showing inheritance status in the UI.
+    public String getExtraTimeParsingPatternStored()
     {
-        return super.lookupStringValue(_c, extraDateParsingPattern, null);
+        return getStoredValue(_c, extraTimeParsingPattern);
     }
 
-    // Get the value that's actually stored in this container; don't look up the hierarchy. This is useful only for export.
-    public String getExtraDateTimeParsingPatternStored()
+    public boolean areRestrictedColumnsEnabled()
     {
-        return super.lookupStringValue(_c, extraDateTimeParsingPattern, null);
+        return lookupBooleanValue(_c, restrictedColumnsEnabled, false);
     }
 
-    // Get the value that's actually stored in this container; don't look up the hierarchy. This is useful only for export.
-    public String getExtraTimeParsingPatternStored()
+    // Get the value that's actually stored in this container or null if inherited; don't look up the hierarchy.
+    // This is useful for export and showing inheritance status in the UI.
+    public Boolean areRestrictedColumnsEnabledStored()
     {
-        return super.lookupStringValue(_c, extraTimeParsingPattern, null);
+        String stored = getStoredValue(_c, restrictedColumnsEnabled);
+        return null == stored ? null : "TRUE".equals(stored);
     }
 }