From 9b459c703c9a1350378d689793b961103c7dfe33 Mon Sep 17 00:00:00 2001
From: enured <enis.nuredini@uzh.ch>
Date: Thu, 13 Oct 2022 14:32:08 +0200
Subject: [PATCH] B14844: Refs 14844 Fixed bug of no working dynamic update and
 empty output in Form Store with Datetimepicker

---
 javascript/src/Form.js    | 3 ++-
 javascript/src/QfqForm.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/javascript/src/Form.js b/javascript/src/Form.js
index 31216f71c..359f7a230 100644
--- a/javascript/src/Form.js
+++ b/javascript/src/Form.js
@@ -78,7 +78,8 @@ var QfqNS = QfqNS || {};
         }
 
         var formObject = this;
-        this.$form.find(".qfq-datepicker").on("click", function(e){
+        // Open datetimepicker over click event even if first element is already focused and get all changes of datetimepicker for dirty lock
+        this.$form.find(".qfq-datepicker").on("click", function(){
             triggerFocus(this);
             getDatetimePickerChanges();
         });
diff --git a/javascript/src/QfqForm.js b/javascript/src/QfqForm.js
index 9c523b77c..798d41a9c 100644
--- a/javascript/src/QfqForm.js
+++ b/javascript/src/QfqForm.js
@@ -513,7 +513,7 @@ var QfqNS = QfqNS || {};
 
     /* Dynamic Update Trigger */
     n.QfqForm.prototype.setupFormUpdateHandler = function () {
-        $('textarea[data-load],input[data-load],select[data-load]').on('change', this.formUpdateHandler.bind(this));
+        $('textarea[data-load],input[data-load],select[data-load]').on('change dp.change', this.formUpdateHandler.bind(this));
     };
 
     n.QfqForm.prototype.formUpdateHandler = function () {
-- 
GitLab