diff --git a/src/server/populate/statusSkills.js b/src/server/populate/statusSkills.js index 888f49f..fcb8806 100644 --- a/src/server/populate/statusSkills.js +++ b/src/server/populate/statusSkills.js @@ -1,6 +1,6 @@ module.exports = { list: [ - {_id: 1, descr: 'Di Persona', icon:'fas fa-people-carry' }, - {_id: 2, descr: 'On Line', icon:'fas fa-desktop'}, + {_id: 1, descr: 'Di Persona', icon:'fas fa-people-carry', color:'green-8' }, + {_id: 2, descr: 'On Line', icon:'fas fa-desktop', color: 'indigo-7'}, ], }; diff --git a/src/server/tools/general.js b/src/server/tools/general.js index 9c828ad..1e74afa 100755 --- a/src/server/tools/general.js +++ b/src/server/tools/general.js @@ -2110,6 +2110,21 @@ module.exports = { return myquery; }, + contieneIdStatusSkill(filtersearch) { + for (let i = 0; i < filtersearch.length; i++) { + const obj = filtersearch[i]; + if (obj.$or) { + for (let j = 0; j < obj.$or.length; j++) { + const condition = obj.$or[j]; + if (condition.idStatusSkill) { + return true; + } + } + } + } + return false; + }, + addNumFavoriteAndBookmarkToQuery(idapp, numtab) { let query = []; @@ -2881,11 +2896,26 @@ module.exports = { if (params.filtersearch3and) { if (params.filtersearch3and.length > 0) { - query.push({ $match: { $and: params.filtersearch3and } }); + // Se c'รจ statusskill allora glielo metto in OR + + if (params.table === 'myskills' && params.filtersearch && !this.contieneIdStatusSkill(params.filtersearch)) { + + query.push({ + $match: { + $or: [ + { $and: params.filtersearch3and }, + { idStatusSkill: { $in: [2]} } + ] + } + }); + } else { + query.push({ $match: { $and: params.filtersearch3and } }); + } + + } } - if (params.filter && params.fieldsearch_last) { const querytemp = this.getFilterParam(params.filter, params.fieldsearch_last);