matt
/
opnform-host-nginx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix date condition logic (#510) 

Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
Favour Olayinka 2024-08-05 13:19:00 +01:00 committed by GitHub
parent 3280e38ee1
commit edf4d4bfe4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Service/Forms/FormLogicConditionChecker.php
View File

@ -148,22 +148,22 @@ class FormLogicConditionChecker
private 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): bool

12
client/lib/forms/FormLogicConditionChecker.js vendored
View File

@ -126,19 +126,19 @@ function checkLessThanEqual(condition, fieldValue) {
}
function checkBefore(condition, fieldValue) {
return condition.value && fieldValue && fieldValue > condition.value
}
function checkAfter(condition, fieldValue) {
return condition.value && fieldValue && fieldValue < condition.value
}
function checkAfter(condition, fieldValue) {
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) {