From 6bee532b9bcd7747f7be1581f61d6cf5b4bb9c19 Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Sun, 8 May 2022 13:19:49 +0200 Subject: [PATCH] Aggiunto filtro numMaxPeopleHosp --- src/server/models/myhosp.js | 9 +++++++++ src/server/models/user.js | 7 ------- src/server/tools/general.js | 12 ++++++++++++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/server/models/myhosp.js b/src/server/models/myhosp.js index 3e6bae1..450c512 100755 --- a/src/server/models/myhosp.js +++ b/src/server/models/myhosp.js @@ -22,6 +22,9 @@ const MyHospSchema = new Schema({ required: true, }, userId: {type: Schema.Types.ObjectId, ref: 'User'}, + visibile: { + type: Boolean + }, typeHosp: { // scambio casa / ospitalità type: Number, }, @@ -143,6 +146,7 @@ MyHospSchema.statics.executeQueryTable = function(idapp, params) { lk_as: 'user', af_objId_tab: 'myId', lk_proj: { + visibile: 1, typeHosp: 1, numMaxPeopleHosp: 1, accomodation: 1, @@ -226,6 +230,7 @@ MyHospSchema.statics.getMyRecById = function(idapp, id) { }, { '$project': { + visibile: 1, typeHosp: 1, numMaxPeopleHosp: 1, accomodation: 1, @@ -274,6 +279,7 @@ MyHospSchema.statics.getMyRecById = function(idapp, id) { }, { '$project': { + visibile: 1, typeHosp: 1, numMaxPeopleHosp: 1, accomodation: 1, @@ -322,6 +328,7 @@ MyHospSchema.statics.getMyRecById = function(idapp, id) { }, { '$project': { + visibile: 1, typeHosp: 1, numMaxPeopleHosp: 1, accomodation: 1, @@ -370,6 +377,7 @@ MyHospSchema.statics.getMyRecById = function(idapp, id) { }, { '$project': { + visibile: 1, typeHosp: 1, numMaxPeopleHosp: 1, accomodation: 1, @@ -418,6 +426,7 @@ MyHospSchema.statics.getMyRecById = function(idapp, id) { }, { '$project': { + visibile: 1, typeHosp: 1, numMaxPeopleHosp: 1, accomodation: 1, diff --git a/src/server/models/user.js b/src/server/models/user.js index 82c18e6..c976a57 100755 --- a/src/server/models/user.js +++ b/src/server/models/user.js @@ -2822,13 +2822,6 @@ UserSchema.statics.calculateStat = async function(idapp, username) { {deleted: {$exists: true, $eq: false}}], }); - const numMySkills = await MySkill.countDocuments({idapp}); - const numMyGoods = await MyGood.countDocuments({idapp}); - - const numMyBachecas = await MyBacheca.countDocuments({idapp}); - - const numGroups = await MyGroup.countDocuments({idapp}); - let numByTab = {}; const globalTables = require('../tools/globalTables'); diff --git a/src/server/tools/general.js b/src/server/tools/general.js index d43614f..e6187dc 100755 --- a/src/server/tools/general.js +++ b/src/server/tools/general.js @@ -1537,6 +1537,18 @@ module.exports = { } } + if (params.filter_gte) { + for (let ind = 0; ind < params.filter_gte.length; ind++) { + for (const [key, value] of Object.entries(params.filter_gte[ind])) { + if (value > 0) { + let condition = {} + condition[key] = {$gte: value}; + filtriadded.push(condition); + } + } + } + } + if (params.filtersearch) { filtriadded.push(...params.filtersearch); }