Beautiful Open-Source Form Builder
fix date condition logic (#510)
Favour Olayinkaedf4d4bfe47a
diff --git a/app/Service/Forms/FormLogicConditionChecker.php b/app/Service/Forms/FormLogicConditionChecker.phpindex dac6a900a..11f2794d7 100644--- a/app/Service/Forms/FormLogicConditionChecker.php+++ b/app/Service/Forms/FormLogicConditionChecker.php@@ -148,22 +148,22 @@ class FormLogicConditionCheckerprivate function checkBefore($condition, $fieldValue): bool{- return $condition['value'] && $fieldValue && $fieldValue > $condition['value'];+ return $condition['value'] && $fieldValue && $fieldValue < $condition['value'];}private function checkAfter($condition, $fieldValue): bool{- return $condition['value'] && $fieldValue && $fieldValue < $condition['value'];+ return $condition['value'] && $fieldValue && $fieldValue > $condition['value'];}private function checkOnOrBefore($condition, $fieldValue): bool{- return $condition['value'] && $fieldValue && $fieldValue >= $condition['value'];+ return $condition['value'] && $fieldValue && $fieldValue <= $condition['value'];}private function checkOnOrAfter($condition, $fieldValue): bool{- return $condition['value'] && $fieldValue && $fieldValue <= $condition['value'];+ return $condition['value'] && $fieldValue && $fieldValue >= $condition['value'];}private function checkPastWeek($condition, $fieldValue): booldiff --git a/client/lib/forms/FormLogicConditionChecker.js b/client/lib/forms/FormLogicConditionChecker.jsindex 6772f06c3..f80aef114 100644--- a/client/lib/forms/FormLogicConditionChecker.js+++ b/client/lib/forms/FormLogicConditionChecker.js@@ -126,19 +126,19 @@ function checkLessThanEqual(condition, fieldValue) {}function checkBefore(condition, fieldValue) {- return condition.value && fieldValue && fieldValue > condition.value+ return condition.value && fieldValue && fieldValue < condition.value}function checkAfter(condition, fieldValue) {- return condition.value && fieldValue && fieldValue < condition.value+ return condition.value && fieldValue && fieldValue > condition.value}function checkOnOrBefore(condition, fieldValue) {- return condition.value && fieldValue && fieldValue >= condition.value+ return condition.value && fieldValue && fieldValue <= condition.value}function checkOnOrAfter(condition, fieldValue) {- return condition.value && fieldValue && fieldValue <= condition.value+ return condition.value && fieldValue && fieldValue >= condition.value}function checkPastWeek(condition, fieldValue) {