From e64d4f75b556e60826e1492f849dcc58cc73c850 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GENO133\\IvanPlex" Date: Sun, 7 Jan 2024 07:52:45 -0700 Subject: [PATCH] fixed short date pattern for datetimepicker. --- Views/Shared/_Layout.cshtml | 15 +++++++++++++++ wwwroot/js/collisionrecord.js | 6 ++++-- wwwroot/js/gasrecord.js | 6 ++++-- wwwroot/js/servicerecord.js | 6 ++++-- wwwroot/js/taxrecord.js | 6 ++++-- 5 files changed, 31 insertions(+), 8 deletions(-) diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index e7fdc7c2..a74dc37b 100644 --- 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"); + } } @@ -28,6 +38,11 @@ enableCsvImport : "@enableCsvImports" == "True" } } + function getShortDatePattern() { + return { + pattern: "@shortDatePattern" + } + } @await RenderSectionAsync("Scripts", required: false) diff --git a/wwwroot/js/collisionrecord.js b/wwwroot/js/collisionrecord.js index 6732d0af..d48c7c88 100644 --- 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 index a175bca2..406cf7fd 100644 --- 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 index e224a792..47dbb3c0 100644 --- 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 index 1e665abc..09550e07 100644 --- 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'); }