datepicker handling simplified, refs #187

2 files changed, 26 insertions, 38 deletions

diff --git a/app/views/resources/room_planning/_sidebar_date_selection.php b/app/views/resources/room_planning/_sidebar_date_selection.php
index 34962e6..b7693d4 100644
--- a/app/views/resources/room_planning/_sidebar_date_selection.php
+++ b/app/views/resources/room_planning/_sidebar_date_selection.php
@@ -6,15 +6,10 @@
         $default_date = strftime('%x', time());

     }

 ?>

-<?= \Studip\Button::create(

+<?= \Studip\LinkButton::create(

         _('Heute'),

-        'today',

-        [

-            'id' => 'booking-plan-jmpdate-button',

-            'onClick' => "$('#booking-plan-jmpdate').val('". strftime('%x', time()) ."');$('#booking-plan-jmpdate-submit').trigger('click');"

-        ]

+        URLHelper::getURL('', ['defaultDate' => date('Y-m-d', time())])

     ); ?>

 

 <input id="booking-plan-jmpdate" type="text"

  name="booking-plan-jmpdate" value="<?= $default_date; ?>">

- <?= Icon::create('accept', 'clickable')->asInput(['id'=>'booking-plan-jmpdate-submit', 'class' => 'text-top']) ?>

diff --git a/resources/assets/javascripts/bootstrap/resources.js b/resources/assets/javascripts/bootstrap/resources.js
index 2dc0302..da266af 100644
--- a/resources/assets/javascripts/bootstrap/resources.js
+++ b/resources/assets/javascripts/bootstrap/resources.js
@@ -507,36 +507,6 @@ STUDIP.ready(function () {
     );
 
     jQuery(document).on(
-        'click',
-        '#booking-plan-jmpdate-submit',
-        function () {
-            var picked = $('#booking-plan-jmpdate').val();
-            var iso_date_string = '';
-            if (picked.includes('.')) {
-                var good_format = picked.split('.');
-                var day = good_format[0];
-                var month = good_format[1];
-                var year = good_format[2];
-                iso_date_string = year.padStart(4, "20") + '-' + month.padStart(2, "0") + '-' + day.padStart(2, "0");
-            } else if (picked.includes('/')) {
-                var bad_format = picked.split('/');
-                var day = bad_format[1];
-                var month = bad_format[0];
-                var year = bad_format[2];
-                iso_date_string = year.padStart(4, "20") + '-' + month.padStart(2, "0") + '-' + day.padStart(2, "0");
-            } else if (picked.includes('-')) {
-                iso_date_string = picked;
-            }
-            if (iso_date_string) {
-                $('*[data-resources-fullcalendar="1"]').each(function () {
-                    $(this)[0].calendar.gotoDate(iso_date_string);
-                });
-                updateDateURL();
-            }
-        }
-    );
-
-    jQuery(document).on(
         'change',
         'select[name="special__time_range_semester_id"]',
         function () {
@@ -691,6 +661,28 @@ STUDIP.ready(function () {
         $('.booking-plan-allday_view').attr('href', std_day + '&allday=1');
     };
 
+    function submitDatePicker() {
+        var picked = $('#booking-plan-jmpdate').val();
+        var iso_date_string = '';
+        if(picked) {
+            if (picked.includes('.')) {
+                let [day, month, year] = picked.split('.');
+                iso_date_string = year.padStart(4, "20") + '-' + month.padStart(2, "0") + '-' + day.padStart(2, "0");
+            } else if (picked.includes('/')) {
+                let [day, month, year] = picked.split('/');
+                iso_date_string = year.padStart(4, "20") + '-' + month.padStart(2, "0") + '-' + day.padStart(2, "0");
+            } else if (picked.includes('-')) {
+                iso_date_string = picked;
+            }
+        }
+        if (iso_date_string) {
+            $('*[data-resources-fullcalendar="1"]').each(function () {
+                this.calendar.gotoDate(iso_date_string);
+            });
+            updateDateURL();
+        }
+    }
+
     function updateDateURL() {
         var changedmoment;
         $('*[data-resources-fullcalendar="1"]').each(function () {
@@ -755,7 +747,8 @@ STUDIP.ready(function () {
 
     jQuery('#booking-plan-jmpdate').datepicker(
         {
-            dateFormat: 'dd.mm.yy'
+            dateFormat: 'dd.mm.yy',
+            onClose: submitDatePicker
         }
     );
     jQuery('.resource-booking-time-fields input[type="date"]').datepicker(