Merge pull request #15 from hargata/Hargata/ghcr.auto

fixed short date pattern for datetimepicker.
hargata · Jan 7, 2024 · 42f7bd2 · 42f7bd2
2 parents b972d5b + e64d4f7
commit 42f7bd2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 8 deletions.
diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml
@@ -3,6 +3,16 @@
 @{
     var useDarkMode = bool.Parse(Configuration["UseDarkMode"]);
     var enableCsvImports = bool.Parse(Configuration["EnableCsvImports"]);
+    var shortDatePattern = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern;
+    shortDatePattern = shortDatePattern.ToLower();
+    if (!shortDatePattern.Contains("dd"))
+    {
+        shortDatePattern = shortDatePattern.Replace("d", "dd");
+    }
+    if (!shortDatePattern.Contains("mm"))
+    {
+        shortDatePattern = shortDatePattern.Replace("m", "mm");
+    }
 }
 <html lang="en" data-bs-theme="@(useDarkMode ? "dark" : "light")">
 <head>
@@ -28,6 +38,11 @@
                 enableCsvImport : "@enableCsvImports" == "True"
             }
         }
+        function getShortDatePattern() {
+            return {
+                pattern: "@shortDatePattern"
+            }
+        }
     </script>
     @await RenderSectionAsync("Scripts", required: false)
 </head>

diff --git a/wwwroot/js/collisionrecord.js b/wwwroot/js/collisionrecord.js
@@ -4,7 +4,8 @@
             $("#collisionRecordModalContent").html(data);
             //initiate datepicker
             $('#collisionRecordDate').datepicker({
-                endDate: "+0d"
+                endDate: "+0d",
+                format: getShortDatePattern().pattern
             });
             $('#collisionRecordModal').modal('show');
         }
@@ -16,7 +17,8 @@ function showEditCollisionRecordModal(collisionRecordId) {
             $("#collisionRecordModalContent").html(data);
             //initiate datepicker
             $('#collisionRecordDate').datepicker({
-                endDate: "+0d"
+                endDate: "+0d",
+                format: getShortDatePattern().pattern
             });
             $('#collisionRecordModal').modal('show');
         }

diff --git a/wwwroot/js/gasrecord.js b/wwwroot/js/gasrecord.js
@@ -4,7 +4,8 @@
             $("#gasRecordModalContent").html(data);
             //initiate datepicker
             $('#gasRecordDate').datepicker({
-                endDate: "+0d"
+                endDate: "+0d",
+                format: getShortDatePattern().pattern
             });
             $('#gasRecordModal').modal('show');
         }
@@ -16,7 +17,8 @@ function showEditGasRecordModal(gasRecordId) {
             $("#gasRecordModalContent").html(data);
             //initiate datepicker
             $('#gasRecordDate').datepicker({
-                endDate: "+0d"
+                endDate: "+0d",
+                format: getShortDatePattern().pattern
             });
             $('#gasRecordModal').modal('show');
         }

diff --git a/wwwroot/js/servicerecord.js b/wwwroot/js/servicerecord.js
@@ -4,7 +4,8 @@
             $("#serviceRecordModalContent").html(data);
             //initiate datepicker
             $('#serviceRecordDate').datepicker({
-                endDate: "+0d"
+                endDate: "+0d",
+                format: getShortDatePattern().pattern
             });
             $('#serviceRecordModal').modal('show');
         }
@@ -16,7 +17,8 @@ function showEditServiceRecordModal(serviceRecordId) {
             $("#serviceRecordModalContent").html(data);
             //initiate datepicker
             $('#serviceRecordDate').datepicker({
-                endDate: "+0d"
+                endDate: "+0d",
+                format: getShortDatePattern().pattern
             });
             $('#serviceRecordModal').modal('show');
         }

diff --git a/wwwroot/js/taxrecord.js b/wwwroot/js/taxrecord.js
@@ -4,7 +4,8 @@
             $("#taxRecordModalContent").html(data);
             //initiate datepicker
             $('#taxRecordDate').datepicker({
-                endDate: "+0d"
+                endDate: "+0d",
+                format: getShortDatePattern().pattern
             });
             $('#taxRecordModal').modal('show');
         }
@@ -16,7 +17,8 @@ function showEditTaxRecordModal(taxRecordId) {
             $("#taxRecordModalContent").html(data);
             //initiate datepicker
             $('#taxRecordDate').datepicker({
-                endDate: "+0d"
+                endDate: "+0d",
+                format: getShortDatePattern().pattern
             });
             $('#taxRecordModal').modal('show');
         }