Merge pull request #128 from NLilley/date-handling

Improve date handling
programcsharp · Oct 31, 2024 · 2c2cfa0 · 2c2cfa0
2 parents f031b22 + c23ceee
commit 2c2cfa0
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 61 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,6 @@ _ReSharper*/
 packages/
 .vs
 #/.nuget/NuGet.exe
+
+# JetBrains Rider exclusion
+/.idea
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -12,7 +12,7 @@
 //      Minor Version
 //      Build Number
 //      Revision
-[assembly: AssemblyVersion("3.7.8")]
-[assembly: AssemblyFileVersion("3.7.8")]
+[assembly: AssemblyVersion("3.7.9")]
+[assembly: AssemblyFileVersion("3.7.9")]
 // Uncomment the informational version to create a pre-release package
-//[assembly: AssemblyInformationalVersion("3.7.8-beta")]
+//[assembly: AssemblyInformationalVersion("3.7.9-beta")]
diff --git a/Griddly.NetCore.Razor/wwwroot/js/griddly.js b/Griddly.NetCore.Razor/wwwroot/js/griddly.js
@@ -50,7 +50,7 @@
 
                 return val;
             case "Date":
-                return String(val).replace(/[^0-9a-zA-Z-\/]/g, "");
+                return $.fn.griddly.defaults.getCleanedDate(val);
             default:
                 return val;
         }
@@ -122,12 +122,7 @@
 
                 return val;
             case "Date":
-                val = parseForValidDate(val);
-
-                if (val == null || !isFinite(val))
-                    return null;
-                else
-                    return (val.getMonth() + 1) + "/" + val.getDate() + "/" + val.getFullYear();
+                return $.fn.griddly.defaults.getFormattedDate(val);
             default:
                 return val;
         }
@@ -315,7 +310,6 @@
     // http://stackoverflow.com/q/8098202
     var parseForValidDate = function (text)
     {
-
         var date = Date.parse(text);
 
         if (isNaN(date))
@@ -347,26 +341,7 @@
             switch (datatype)
             {
                 case "Date":
-                    var date;
-                    var pos;
-
-                    if (typeof (value) === "string" && (pos = value.indexOf("T")) != -1)
-                    {
-                        value = value.substr(0, pos);
-
-                        // Strip time, we only want date
-                        var parts = value.split('-');
-
-                        // new Date(year, month [, day [, hours[, minutes[, seconds[, ms]]]]])
-                        date = new Date(parts[0], parts[1] - 1, parts[2]); // Note: months are 0-based
-                    }
-                    else
-                        date = new Date(value);
-
-                    date.setHours(0, 0, 0, 0);
-
-                    value = date.toLocaleDateString();
-
+                    value = $.fn.griddly.defaults.getFilterDate(value);
                     break;
                 case "Currency":
                     value = parseFloat(value).toFixed(2);
@@ -2044,6 +2019,35 @@
             return this;
     };
 
+    var defaultCleanedDate = function(str) {return String(str).replace(/[^0-9a-zA-Z-\/]/g, "");};
+    var defaultFormatedDate = function(str) {
+        var val = parseForValidDate(str);
+        return (val == null || !isFinite(val))
+            ? null
+            : (val.getMonth() + 1) + "/" + val.getDate() + "/" + val.getFullYear();
+    };
+    var defaultFilterDate = function(strOrDate) {
+        var date;
+        var pos;
+
+        if (typeof (strOrDate) === "string" && (pos = strOrDate.indexOf("T")) != -1)
+        {
+            strOrDate = strOrDate.substr(0, pos);
+
+            // Strip time, we only want date
+            var parts = strOrDate.split('-');
+
+            // new Date(year, month [, day [, hours[, minutes[, seconds[, ms]]]]])
+            date = new Date(parts[0], parts[1] - 1, parts[2]); // Note: months are 0-based
+        }
+        else
+            date = new Date(strOrDate);
+
+        date.setHours(0, 0, 0, 0);
+
+        return date.toLocaleDateString();
+    };
+
     $.fn.griddly.defaults = $.extend({},
     {
         pageNumber: 0,
@@ -2065,7 +2069,10 @@
         serializeSkipEmpty: true,
         filtersSelector: "input[name], select[name]",
         exportCustomFunction: null,
-        exportFunction: null
+        exportFunction: null,
+        getCleanedDate: defaultCleanedDate,
+        getFormattedDate: defaultFormatedDate,
+        getFilterDate: defaultFilterDate
     }, $.fn.griddlyGlobalDefaults);
 
     var GriddlyFilterBar = function (element, options)

diff --git a/Griddly/Scripts/griddly.js b/Griddly/Scripts/griddly.js
@@ -50,7 +50,7 @@
 
                 return val;
             case "Date":
-                return String(val).replace(/[^0-9a-zA-Z-\/]/g, "");
+                return $.fn.griddly.defaults.getCleanedDate(val);
             default:
                 return val;
         }
@@ -122,12 +122,7 @@
 
                 return val;
             case "Date":
-                val = parseForValidDate(val);
-
-                if (val == null || !isFinite(val))
-                    return null;
-                else
-                    return (val.getMonth() + 1) + "/" + val.getDate() + "/" + val.getFullYear();
+                return $.fn.griddly.defaults.getFormattedDate(val);
             default:
                 return val;
         }
@@ -315,7 +310,6 @@
     // http://stackoverflow.com/q/8098202
     var parseForValidDate = function (text)
     {
-
         var date = Date.parse(text);
 
         if (isNaN(date))
@@ -347,26 +341,7 @@
             switch (datatype)
             {
                 case "Date":
-                    var date;
-                    var pos;
-
-                    if (typeof (value) === "string" && (pos = value.indexOf("T")) != -1)
-                    {
-                        value = value.substr(0, pos);
-
-                        // Strip time, we only want date
-                        var parts = value.split('-');
-
-                        // new Date(year, month [, day [, hours[, minutes[, seconds[, ms]]]]])
-                        date = new Date(parts[0], parts[1] - 1, parts[2]); // Note: months are 0-based
-                    }
-                    else
-                        date = new Date(value);
-
-                    date.setHours(0, 0, 0, 0);
-
-                    value = date.toLocaleDateString();
-
+                    value = $.fn.griddly.defaults.getFilterDate(value);
                     break;
                 case "Currency":
                     value = parseFloat(value).toFixed(2);
@@ -2044,6 +2019,35 @@
             return this;
     };
 
+    var defaultCleanedDate = function(str) {return String(str).replace(/[^0-9a-zA-Z-\/]/g, "");};
+    var defaultFormatedDate = function(str) {
+        var val = parseForValidDate(str);
+        return (val == null || !isFinite(val))
+            ? null
+            : (val.getMonth() + 1) + "/" + val.getDate() + "/" + val.getFullYear();
+    };
+    var defaultFilterDate = function(strOrDate) {
+        var date;
+        var pos;
+
+        if (typeof (strOrDate) === "string" && (pos = strOrDate.indexOf("T")) != -1)
+        {
+            strOrDate = strOrDate.substr(0, pos);
+
+            // Strip time, we only want date
+            var parts = strOrDate.split('-');
+
+            // new Date(year, month [, day [, hours[, minutes[, seconds[, ms]]]]])
+            date = new Date(parts[0], parts[1] - 1, parts[2]); // Note: months are 0-based
+        }
+        else
+            date = new Date(strOrDate);
+
+        date.setHours(0, 0, 0, 0);
+
+        return date.toLocaleDateString();
+    };
+
     $.fn.griddly.defaults = $.extend({},
     {
         pageNumber: 0,
@@ -2065,7 +2069,10 @@
         serializeSkipEmpty: true,
         filtersSelector: "input[name], select[name]",
         exportCustomFunction: null,
-        exportFunction: null
+        exportFunction: null,
+        getCleanedDate: defaultCleanedDate,
+        getFormattedDate: defaultFormatedDate,
+        getFilterDate: defaultFilterDate
     }, $.fn.griddlyGlobalDefaults);
 
     var GriddlyFilterBar = function (element, options)