fix(datefield): change event and comparison

pluginsGLPI · Nov 5, 2022 · 9da9477 · 9da9477
1 parent a959839
commit 9da9477
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/inc/field/datefield.class.php b/inc/field/datefield.class.php
@@ -147,7 +147,9 @@ public function equals($value): bool {
          $answer = $this->value;
       }
       $answerDatetime = DateTime::createFromFormat(self::DATE_FORMAT, $answer);
+      $answerDatetime->setTime(0,0,0,0);
       $compareDatetime = DateTime::createFromFormat(self::DATE_FORMAT, $value);
+      $compareDatetime->setTime(0,0,0,0);
       return $answerDatetime == $compareDatetime;
    }
 
@@ -162,7 +164,9 @@ public function greaterThan($value): bool {
          $answer = $this->value;
       }
       $answerDatetime = DateTime::createFromFormat(self::DATE_FORMAT, $answer);
+      $answerDatetime->setTime(0,0,0,0);
       $compareDatetime = DateTime::createFromFormat(self::DATE_FORMAT, $value);
+      $compareDatetime->setTime(0,0,0,0);
       return $answerDatetime > $compareDatetime;
    }
 

diff --git a/js/scripts.js b/js/scripts.js
@@ -1673,13 +1673,10 @@ function pluginFormcreatorInitializeCheckboxes(fieldName, rand) {
  * Initialize a date field
  */
 function pluginFormcreatorInitializeDate(fieldName, rand) {
-   var field = $('[name="_' + fieldName + '"]');
+   var field = $('[name="' + fieldName + '"]');
    field.on("change", function() {
       plugin_formcreator.showFields($(field[0].form));
    });
-   $('#resetdate' + rand).on("click", function() {
-      plugin_formcreator.showFields($(field[0].form));
-   });
 }
 
 /**