github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 04:57:07 -04:00
Code Issues Projects Releases Packages Wiki Activity

Testing 'or' condition for advanced Filter

Browse source
This commit is contained in:
IgnatzHome 2018-05-20 09:47:20 +02:00
parent 39974c9532
commit 9ac1164440
1 changed files with 59 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

83
client/lib/filter.js
View file

@ -147,7 +147,7 @@ class AdvancedFilter {
_fieldNameToId(field)
{
console.log("searching: "+field);
console.log(`searching: ${field}`);
const found = CustomFields.findOne({'name':field});
console.log(found);
return found._id;
@ -158,34 +158,69 @@ class AdvancedFilter {
console.log(commands);
try {
//let changed = false;
for (let i = 0; i < commands.length; i++)
{
if (!commands[i].string && commands[i].cmd)
{
switch (commands[i].cmd)
{
case '=':
case '==':
case '===':
{
const field = commands[i-1].cmd;
const str = commands[i+1].cmd;
commands[i] = {'customFields._id':this._fieldNameToId(field), 'customFields.value':str};
commands.splice(i-1, 1);
commands.splice(i, 1);
//changed = true;
i--;
break;
}
}
}
}
this._processConditions(commands);
this._processLogicalOperators(commands);
}
catch (e){return { $in: [] };}
return {$or: commands};
}
_processConditions(commands)
{
for (let i = 0; i < commands.length; i++)
{
if (!commands[i].string && commands[i].cmd)
{
switch (commands[i].cmd)
{
case '=':
case '==':
case '===':
{
const field = commands[i-1].cmd;
const str = commands[i+1].cmd;
commands[i] = {'customFields._id':this._fieldNameToId(field), 'customFields.value':str};
commands.splice(i-1, 1);
commands.splice(i, 1);
//changed = true;
i--;
break;
}
}
}
}
}
_processLogicalOperators(commands)
{
for (let i = 0; i < commands.length; i++)
{
if (!commands[i].string && commands[i].cmd)
{
switch (commands[i].cmd)
{
case 'or':
case 'Or':
case 'OR':
case '|':
case '||':
{
const op1 = commands[i-1].cmd;
const op2 = commands[i+1].cmd;
commands[i] = {$or: [op1, op2]};
commands.splice(i-1, 1);
commands.splice(i, 1);
//changed = true;
i--;
break;
}
}
}
}
}
_getMongoSelector() {
this._dep.depend();
const commands = this._filterToCommands();