Fixed that date can be cleared

Author: cz-lucas

public/js/dist/filterFormManager.js

@@ -4,7 +4,7 @@ import {
     AssignedEntityFilterInput,
     DateFilterInput,
     TextFilterInput
-} from '/js/dist/filterInputs.js';
+} from '/js/dist/filterInputs.min.js';
 import { container } from '/js/dist/simpleDIContainer.min.js';
 
 export default class FilterFormManager {
@@ -61,9 +61,7 @@ export default class FilterFormManager {
     clearAll() {
         //this.collectFilterData();
         this.inputs.forEach(field => {
-            queueMicrotask(() => {
                 field.clear();
-            })
         });
     }
 

public/js/dist/filterFormManager.min.js

@@ -325,32 +325,22 @@ class DateFilterInput extends FilterInput {
         return result;
     }
 
-    /*setValue() {
-        $(this.container).datepicker('setStartDate', '2020-01-01');
-        //console.error("Currently not implemented");
-        //throw new Error("Currently not implemented");
-        //return this.hasValue() ? this.element.value : null;
-    }*/
-
     setValue(newValue, logic, operator) {
 
         return new Promise((resolve, reject) => {
             try {
 
                 if (newValue.startDate != undefined) {
                     const startDateObject = new Date(newValue.startDate);
-                    console.log("start", newValue.startDate, startDateObject);
                     this.startDatepicker.datepicker('setDate', startDateObject);
                 }
 
                 if (newValue.endDate != undefined) {
                     const endDateObject = new Date(newValue.endDate);
-                    console.log("end", newValue.endDate, endDateObject);
                     this.endDatepicker.datepicker('setDate', endDateObject);
                 }
 
                 this.setSearchOperator(logic, operator);
-                console.log("this.getvalues", this.getValue());
                 resolve(newValue);
             }
             catch (e) {
@@ -361,16 +351,16 @@ class DateFilterInput extends FilterInput {
     }
 
     clear() {
-        /*const r = this.getValue();
-        if (r.startDate !== undefined || r.endDate !== undefined) {
-            // I don't know why this is needed but without it won't reset properly
-            $(this.container).datepicker('setDates', ['2000-01-01', '2000-01-02']);
-            $(this.container).datepicker('clearDates');
-        }*/
-        //this.startDatepicker.datepicker('clearDates');
-        //this.endDatepicker.datepicker('clearDates');
-        this.startDate = undefined;
-        this.endDate = undefined;
+        const r = this.getValue();
+        console.log("r", r);
+        if (r.startDate !== undefined || jQuery.isEmptyObject(r) === false) {
+            this.startDatepicker.datepicker('clearDates');
+            this.startDate = undefined;
+        }
+        if (r.endDate !== undefined || jQuery.isEmptyObject(r) === false) {
+            this.endDatepicker.datepicker('clearDates');
+            this.endDate = undefined;
+        }
 
         super.clear();
     }

public/js/dist/filterInputs.js

@@ -36,10 +36,10 @@
     "/js/dist/floating-buttons.min.js": "/js/dist/floating-buttons.min.js?id=bef97dca53c8ad4bda54f1009628a121",
     "/js/dist/apiService.js": "/js/dist/apiService.js?id=4e838fdc8aaf6a0de54c69b1b84f9669",
     "/js/dist/apiService.min.js": "/js/dist/apiService.min.js?id=4e838fdc8aaf6a0de54c69b1b84f9669",
-    "/js/dist/filterInputs.js": "/js/dist/filterInputs.js?id=933ea8e03c23d15bdd3a59fa738e4cd4",
-    "/js/dist/filterInputs.min.js": "/js/dist/filterInputs.min.js?id=933ea8e03c23d15bdd3a59fa738e4cd4",
-    "/js/dist/filterFormManager.js": "/js/dist/filterFormManager.js?id=3da42798a17a2a3c0f73033238fc5b12",
-    "/js/dist/filterFormManager.min.js": "/js/dist/filterFormManager.min.js?id=3da42798a17a2a3c0f73033238fc5b12",
+    "/js/dist/filterInputs.js": "/js/dist/filterInputs.js?id=06b3104923015d3457ef67eae0185494",
+    "/js/dist/filterInputs.min.js": "/js/dist/filterInputs.min.js?id=06b3104923015d3457ef67eae0185494",
+    "/js/dist/filterFormManager.js": "/js/dist/filterFormManager.js?id=b33f0f7fe668173f6a04964b3cb2c2f2",
+    "/js/dist/filterFormManager.min.js": "/js/dist/filterFormManager.min.js?id=b33f0f7fe668173f6a04964b3cb2c2f2",
     "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
     "/js/select2/i18n/ar.js": "/js/select2/i18n/ar.js?id=65aa8e36bf5da57ff4e3f22a835ab035",
     "/js/select2/i18n/az.js": "/js/select2/i18n/az.js?id=270c257daf8140a0cf23ad5de6f8ed1b",

public/js/dist/filterInputs.min.js

@@ -4,7 +4,7 @@ import {
     AssignedEntityFilterInput,
     DateFilterInput,
     TextFilterInput
-} from '/js/dist/filterInputs.js';
+} from '/js/dist/filterInputs.min.js';
 import { container } from '/js/dist/simpleDIContainer.min.js';
 
 export default class FilterFormManager {
@@ -61,9 +61,7 @@ export default class FilterFormManager {
     clearAll() {
         //this.collectFilterData();
         this.inputs.forEach(field => {
-            queueMicrotask(() => {
                 field.clear();
-            })
         });
     }