From 8f723f462472228c874bc662b8374de12b3d9fb7 Mon Sep 17 00:00:00 2001
From: Engincan VESKE <43685404+EngincanV@users.noreply.github.com>
Date: Thu, 25 May 2023 10:28:43 +0300
Subject: [PATCH] Refactor #16651

---
 .../DatePicker/AbpDatePickerBaseTagHelperService.cs | 13 +++++++++----
 .../DatePicker/AbpDatePickerTagHelperService.cs     |  3 +--
 .../bootstrap/dom-event-handlers.js                 |  2 --
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs
index 16ca178055..92bb48b974 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerBaseTagHelperService.cs
@@ -22,8 +22,10 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form.DatePicker;
 public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelperService<TTagHelper>
     where TTagHelper : AbpDatePickerBaseTagHelper<TTagHelper>
 {
-    protected readonly Dictionary<Type,Func<object,string>> SupportedInputTypes = new() {
-        {typeof(string), o =>
+    protected readonly Dictionary<Type, Func<object, string>> SupportedInputTypes = new() 
+    {
+        {
+            typeof(string), o =>
             {
                 if(o is string s && DateTime.TryParse(s, out var dt))
                 {
@@ -33,17 +35,20 @@ public abstract class AbpDatePickerBaseTagHelperService<TTagHelper> : AbpTagHelp
                 return string.Empty;
             }
         },
-        {typeof(DateTime), o =>
+        {
+            typeof(DateTime), o =>
             {
                 if(o is DateTime dt && dt != default)
                 {
                     return dt.ToString("O");
                 }
+                
                 return string.Empty;
             }
         },
         {typeof(DateTime?), o => ((DateTime?) o)?.ToString("O")},
-        {typeof(DateTimeOffset), o =>
+        {
+            typeof(DateTimeOffset), o =>
             {
                 if(o is DateTimeOffset dto && dto != default)
                 {
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelperService.cs
index 2542ea770a..727ab1a239 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/DatePicker/AbpDatePickerTagHelperService.cs
@@ -63,8 +63,7 @@ public class AbpDatePickerTagHelperService : AbpDatePickerBaseTagHelperService<A
 
     protected override void AddBaseTagAttributes(TagHelperAttributeList attributes)
     {
-        if (TagHelper.AspFor != null && 
-            TagHelper.AspFor.Model != null &&
+        if (TagHelper.AspFor?.Model != null &&
             SupportedInputTypes.TryGetValue(TagHelper.AspFor.Metadata.ModelType, out var convertFunc))
         {
             var convert = convertFunc(TagHelper.AspFor.Model);
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js
index 8b31bf7026..a9625d1f1f 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/dom-event-handlers.js
@@ -619,10 +619,8 @@
                     options.separator = separator;
                 }
 
-                
                 fillInput($input, startDate, endDate, options);
                 
-                
                 $input.on('apply.daterangepicker', function (ev, picker) {
                     if (singleDatePicker) {
                         $(this).val(picker.startDate.format(dateFormat));