diff --git a/kernel/av/av.go b/kernel/av/av.go index e38af8f1c..7dcc2bfa2 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -81,16 +81,20 @@ type AttributeViewFilter struct { type FilterOperator string const ( - FilterOperatorEq FilterOperator = "=" - FilterOperatorNe FilterOperator = "!=" - FilterOperatorGt FilterOperator = ">" - FilterOperatorGe FilterOperator = ">=" - FilterOperatorLt FilterOperator = "<" - FilterOperatorLe FilterOperator = "<=" - FilterOperatorContains FilterOperator = "CONTAINS" - FilterOperatorNotContains FilterOperator = "NOT CONTAINS" - FilterOperatorIsEmpty FilterOperator = "IS EMPTY" - FilterOperatorIsNotEmpty FilterOperator = "IS NOT EMPTY" + FilterOperatorIsEqual FilterOperator = "=" + FilterOperatorIsNotEqual FilterOperator = "!=" + FilterOperatorIsGreater FilterOperator = ">" + FilterOperatorIsGreaterOrEqual FilterOperator = ">=" + FilterOperatorIsLess FilterOperator = "<" + FilterOperatorIsLessOrEqual FilterOperator = "<=" + FilterOperatorContains FilterOperator = "Contains" + FilterOperatorDoesNotContain FilterOperator = "Does not contains" + FilterOperatorIsEmpty FilterOperator = "Is empty" + FilterOperatorIsNotEmpty FilterOperator = "Is not empty" + FilterOperatorStartsWith FilterOperator = "Starts with" + FilterOperatorEndsWith FilterOperator = "Ends with" + FilterOperatorIsBetween FilterOperator = "Is between" + FilterOperatorIsRelativeToToday FilterOperator = "Is relative to today" ) type AttributeViewSort struct { diff --git a/kernel/av/cell.go b/kernel/av/cell.go index a0e7b1aae..8be93b97b 100644 --- a/kernel/av/cell.go +++ b/kernel/av/cell.go @@ -110,33 +110,33 @@ func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool } if nil != value.Number && nil != other.Number { switch operator { - case FilterOperatorEq: + case FilterOperatorIsEqual: return value.Number.Content == other.Number.Content - case FilterOperatorNe: + case FilterOperatorIsNotEqual: return value.Number.Content != other.Number.Content - case FilterOperatorGt: + case FilterOperatorIsGreater: return value.Number.Content > other.Number.Content - case FilterOperatorGe: + case FilterOperatorIsGreaterOrEqual: return value.Number.Content >= other.Number.Content - case FilterOperatorLt: + case FilterOperatorIsLess: return value.Number.Content < other.Number.Content - case FilterOperatorLe: + case FilterOperatorIsLessOrEqual: return value.Number.Content <= other.Number.Content } } if nil != value.Date && nil != other.Date { switch operator { - case FilterOperatorEq: + case FilterOperatorIsEqual: return value.Date.Content == other.Date.Content - case FilterOperatorNe: + case FilterOperatorIsNotEqual: return value.Date.Content != other.Date.Content - case FilterOperatorGt: + case FilterOperatorIsGreater: return value.Date.Content > other.Date.Content - case FilterOperatorGe: + case FilterOperatorIsGreaterOrEqual: return value.Date.Content >= other.Date.Content - case FilterOperatorLt: + case FilterOperatorIsLess: return value.Date.Content < other.Date.Content - case FilterOperatorLe: + case FilterOperatorIsLessOrEqual: return value.Date.Content <= other.Date.Content } }