diff --git a/src/server/models/myskill.js b/src/server/models/myskill.js index 1e68412..310656e 100755 --- a/src/server/models/myskill.js +++ b/src/server/models/myskill.js @@ -98,7 +98,7 @@ const MySkillSchema = new Schema( }, }, ...Reaction.getFieldsForReactions() - }); + }, { strict: false }); MySkillSchema.index({ 'idapp': 1 }); diff --git a/src/server/models/province.js b/src/server/models/province.js index 2d27f44..4d45f6b 100755 --- a/src/server/models/province.js +++ b/src/server/models/province.js @@ -35,11 +35,32 @@ const ProvinceSchema = new Schema({ link_grp: { type: String, }, + card : { + type: String, + }, + link_telegram: { type: String, }, }, { _id : false }); +ProvinceSchema.pre('save', async function (next) { + if (this.isNew) { + const myrec = await Province.findOne().limit(1).sort({_id:-1}); + if (!!myrec) { + if (myrec._doc._id === 0) + this._id = 1; + else + this._id = myrec._doc._id + 1; + + } else { + this._id = 1; + } + } + + next(); +}); + ProvinceSchema.statics.getRegionByStrProvince = async function(strprovince) { const myrec = await Province.findOne({prov: strprovince}).lean(); if (myrec) { diff --git a/src/server/populate/provinces.js b/src/server/populate/provinces.js index 1552bf2..655037e 100644 --- a/src/server/populate/provinces.js +++ b/src/server/populate/provinces.js @@ -113,13 +113,14 @@ module.exports = { {_id: 111, reg: 'RSM', prov: 'RSM', descr: 'Repubblica di San Marino', link_grp: 'https://t.me/+HSdNurm0IXY1MGI0', link_telegram: ''}, {_id: 112, reg: 'EST', prov: 'EST', descr: 'Estero', link_grp: '', link_telegram: ''}, {_id: 113, reg: 'ONL', prov: 'ONL', descr: 'On Line', link_grp: '', link_telegram: ''}, - {_id: 114, reg: 'LAZ', prov: 'RM', descr: 'Roma Nord-Est', link_grp: 'https://t.me/c/1614195634/64?thread=57', link_telegram: ''}, - {_id: 115, reg: 'LAZ', prov: 'RM', descr: 'Roma Sud-Est', link_grp: 'https://t.me/c/1614195634/65?thread=58', link_telegram: ''}, - {_id: 116, reg: 'LAZ', prov: 'RM', descr: 'Roma Nord', link_grp: 'https://t.me/c/1614195634/75?thread=73', link_telegram: ''}, - {_id: 117, reg: 'LAZ', prov: 'RM', descr: 'Roma Nord-Ovest', link_grp: 'https://t.me/c/1614195634/62?thread=47', link_telegram: ''}, - {_id: 118, reg: 'LAZ', prov: 'RM', descr: 'Roma Sud e Litorale', link_grp: 'https://t.me/c/1614195634/67?thread=43', link_telegram: ''}, + {_id: 114, reg: 'LAZ', prov: 'RM', descr: 'Roma Nord-Est', card: 'NORD-EST', link_grp: 'https://t.me/c/1614195634/64?thread=57', link_telegram: ''}, + {_id: 115, reg: 'LAZ', prov: 'RM', descr: 'Roma Sud-Est', card: 'SUD-EST', link_grp: 'https://t.me/c/1614195634/65?thread=58', link_telegram: ''}, + {_id: 116, reg: 'LAZ', prov: 'RM', descr: 'Roma Nord', card: 'NORD', link_grp: 'https://t.me/c/1614195634/75?thread=73', link_telegram: ''}, + {_id: 117, reg: 'LAZ', prov: 'RM', descr: 'Roma Nord-Ovest', card: 'NORD-OVEST', link_grp: 'https://t.me/c/1614195634/62?thread=47', link_telegram: ''}, + {_id: 118, reg: 'LAZ', prov: 'RM', descr: 'Roma Sud e Litorale', card: 'SUD', link_grp: 'https://t.me/c/1614195634/67?thread=43', link_telegram: ''}, {_id: 119, reg: 'PUG', prov: 'VAL', descr: 'Valle D\'Itria', link_grp: 'https://t.me/progettoriso/7016?thread=7015', link_telegram: ''}, {_id: 120, reg: 'SAR', prov: 'SUS', descr: 'Sud Sardegna', link_grp: 'https://t.me/c/1614195634/552?thread=545', link_telegram: ''}, {_id: 121, reg: 'ITA', prov: 'ITA', descr: 'Italia', link_grp: '', link_telegram: ''}, + {_id: 122, reg: 'LOM', prov: 'MI', card: 'EST', descr: 'Milano Est', link_grp: '', link_telegram: ''}, ], }; diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js index 1bc2d12..91d8810 100755 --- a/src/server/router/index_router.js +++ b/src/server/router/index_router.js @@ -360,7 +360,7 @@ router.post('/settable', authenticate, async (req, res) => { const mytablestrutt = globalTables.getTableByTableName(params.table); - if (mydata['_id'] !== undefined && mydata['_id'] !== 0) { + if (mydata['_id'] !== undefined && mydata['_id'] !== 0 && mydata['_id'] !== '') { mytablerec.isNew = false; }