From 2f3b65880a72cfbeb9de2867ffa733d441b29623 Mon Sep 17 00:00:00 2001
From: Salih <salihozkara00@gmail.com>
Date: Sun, 31 Dec 2023 18:03:40 +0300
Subject: [PATCH] Update date-range-picker-extensions.js

---
 .../date-range-picker-extensions.js            | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js
index 9988e81595..b9e5321e28 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/date-range-picker/date-range-picker-extensions.js
@@ -215,7 +215,12 @@
                 var today = moment();
                 $dateRangePicker.setStartDate(today);
                 $dateRangePicker.setEndDate(today);
-                $dateRangePicker.updateView();
+                
+                if(options.singleDatePicker && options.autoApply){
+                    $dateRangePicker.clickApply();
+                }else{
+                    $dateRangePicker.updateView();
+                }
             });
 
             return $todayBtn;
@@ -568,14 +573,17 @@
                 });
 
                 $input.on('show.daterangepicker', function (ev, picker) {
+                    const today = moment();
                     if(isEmptyDate(startDate, options)){
-                        picker.setStartDate();
+                        picker.setStartDate(today);
                     }else{
                         picker.setStartDate(convertToMoment(startDate, options, options.inputDateFormat));
                     }
-
-                    if(isEmptyDate(endDate, options)){
-                        picker.setEndDate();
+                    
+                    if(singleDatePicker){
+                        picker.setEndDate(picker.startDate);
+                    }else if(isEmptyDate(endDate, options)){
+                        picker.setEndDate(today);
                     }
                     else{
                         picker.setEndDate(convertToMoment(endDate, options, options.inputDateFormat));