test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

fix: added in & not in operator in filter

Browse Source
This commit is contained in:
Shariq Ansari 2024-01-30 12:27:39 +05:30
parent 26f0592509
commit 5a736827d4
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frontend/src/components/Filter.vue
View File

@ -200,6 +200,8 @@ function getOperators(fieldtype, fieldname) {
{ label: 'Not Equals', value: 'not equals' }, { label: 'Not Equals', value: 'not equals' },
{ label: 'Like', value: 'like' }, { label: 'Like', value: 'like' },
{ label: 'Not Like', value: 'not like' }, { label: 'Not Like', value: 'not like' },
{ label: 'In', value: 'in' },
{ label: 'Not In', value: 'not in' },
{ label: 'Is', value: 'is' }, { label: 'Is', value: 'is' },
] ]
) )
@ -215,13 +217,17 @@ function getOperators(fieldtype, fieldname) {
if (typeNumber.includes(fieldtype)) { if (typeNumber.includes(fieldtype)) {
options.push( options.push(
...[ ...[
{ label: 'Equals', value: 'equals' },
{ label: 'Not Equals', value: 'not equals' },
{ label: 'Like', value: 'like' },
{ label: 'Not Like', value: 'not like' },
{ label: 'In', value: 'in' },
{ label: 'Not In', value: 'not in' },
{ label: 'Is', value: 'is' },
{ label: '<', value: '<' }, { label: '<', value: '<' },
{ label: '>', value: '>' }, { label: '>', value: '>' },
{ label: '<=', value: '<=' }, { label: '<=', value: '<=' },
{ label: '>=', value: '>=' }, { label: '>=', value: '>=' },
{ label: 'Equals', value: 'equals' },
{ label: 'Not Equals', value: 'not equals' },
{ label: 'Is', value: 'is' },
] ]
) )
} }
@ -230,6 +236,8 @@ function getOperators(fieldtype, fieldname) {
...[ ...[
{ label: 'Equals', value: 'equals' }, { label: 'Equals', value: 'equals' },
{ label: 'Not Equals', value: 'not equals' }, { label: 'Not Equals', value: 'not equals' },
{ label: 'In', value: 'in' },
{ label: 'Not In', value: 'not in' },
{ label: 'Is', value: 'is' }, { label: 'Is', value: 'is' },
] ]
) )
@ -239,9 +247,11 @@ function getOperators(fieldtype, fieldname) {
...[ ...[
{ label: 'Equals', value: 'equals' }, { label: 'Equals', value: 'equals' },
{ label: 'Not Equals', value: 'not equals' }, { label: 'Not Equals', value: 'not equals' },
{ label: 'Is', value: 'is' },
{ label: 'Like', value: 'like' }, { label: 'Like', value: 'like' },
{ label: 'Not Like', value: 'not like' }, { label: 'Not Like', value: 'not like' },
{ label: 'In', value: 'in' },
{ label: 'Not In', value: 'not in' },
{ label: 'Is', value: 'is' },
] ]
) )
} }
@ -253,6 +263,8 @@ function getOperators(fieldtype, fieldname) {
...[ ...[
{ label: 'Like', value: 'like' }, { label: 'Like', value: 'like' },
{ label: 'Not Like', value: 'not like' }, { label: 'Not Like', value: 'not like' },
{ label: 'In', value: 'in' },
{ label: 'Not In', value: 'not in' },
{ label: 'Is', value: 'is' }, { label: 'Is', value: 'is' },
] ]
) )
@ -295,7 +307,7 @@ function getValSelect(f) {
type: 'select', type: 'select',
options: timespanOptions, options: timespanOptions,
}) })
} else if (operator == 'like') { } else if (['like', 'not like', 'in', 'not in'].includes(operator)) {
return h(FormControl, { type: 'text' }) return h(FormControl, { type: 'text' })
} else if (typeSelect.includes(fieldtype) || typeCheck.includes(fieldtype)) { } else if (typeSelect.includes(fieldtype) || typeCheck.includes(fieldtype)) {
const _options = const _options =
@ -422,6 +434,8 @@ function isSameTypeOperator(oldOperator, newOperator) {
'not like', 'not like',
'equals', 'equals',
'not equals', 'not equals',
'in',
'not in',
'>', '>',
'<', '<',
'>=', '>=',
@ -472,6 +486,8 @@ function transformIn(f) {
const operatorMap = { const operatorMap = {
is: 'is', is: 'is',
'is not': 'is not', 'is not': 'is not',
in: 'in',
'not in': 'not in',
equals: '=', equals: '=',
'not equals': '!=', 'not equals': '!=',
yes: true, yes: true,
@ -496,6 +512,8 @@ const oppositeOperatorMap = {
false: 'no', false: 'no',
LIKE: 'like', LIKE: 'like',
'NOT LIKE': 'not like', 'NOT LIKE': 'not like',
in: 'in',
'not in': 'not in',
'>': '>', '>': '>',
'<': '<', '<': '<',
'>=': '>=', '>=': '>=',