Skip to content

Commit edf4d4b

Browse files
madassdevJhumanJ
andauthored
fix date condition logic (#510)
Co-authored-by: Julien Nahum <julien@nahum.net>
1 parent 3280e38 commit edf4d4b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/Service/Forms/FormLogicConditionChecker.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -148,22 +148,22 @@ private function checkLessThanEqual($condition, $fieldValue): bool
148148

149149
private function checkBefore($condition, $fieldValue): bool
150150
{
151-
return $condition['value'] && $fieldValue && $fieldValue > $condition['value'];
151+
return $condition['value'] && $fieldValue && $fieldValue < $condition['value'];
152152
}
153153

154154
private function checkAfter($condition, $fieldValue): bool
155155
{
156-
return $condition['value'] && $fieldValue && $fieldValue < $condition['value'];
156+
return $condition['value'] && $fieldValue && $fieldValue > $condition['value'];
157157
}
158158

159159
private function checkOnOrBefore($condition, $fieldValue): bool
160160
{
161-
return $condition['value'] && $fieldValue && $fieldValue >= $condition['value'];
161+
return $condition['value'] && $fieldValue && $fieldValue <= $condition['value'];
162162
}
163163

164164
private function checkOnOrAfter($condition, $fieldValue): bool
165165
{
166-
return $condition['value'] && $fieldValue && $fieldValue <= $condition['value'];
166+
return $condition['value'] && $fieldValue && $fieldValue >= $condition['value'];
167167
}
168168

169169
private function checkPastWeek($condition, $fieldValue): bool

client/lib/forms/FormLogicConditionChecker.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -126,19 +126,19 @@ function checkLessThanEqual(condition, fieldValue) {
126126
}
127127

128128
function checkBefore(condition, fieldValue) {
129-
return condition.value && fieldValue && fieldValue > condition.value
129+
return condition.value && fieldValue && fieldValue < condition.value
130130
}
131131

132132
function checkAfter(condition, fieldValue) {
133-
return condition.value && fieldValue && fieldValue < condition.value
133+
return condition.value && fieldValue && fieldValue > condition.value
134134
}
135135

136136
function checkOnOrBefore(condition, fieldValue) {
137-
return condition.value && fieldValue && fieldValue >= condition.value
137+
return condition.value && fieldValue && fieldValue <= condition.value
138138
}
139139

140140
function checkOnOrAfter(condition, fieldValue) {
141-
return condition.value && fieldValue && fieldValue <= condition.value
141+
return condition.value && fieldValue && fieldValue >= condition.value
142142
}
143143

144144
function checkPastWeek(condition, fieldValue) {

0 commit comments

Comments
 (0)