surya/freeplanet_serverside
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Versione 1.0.21 - RIS ITALIA

Browse Source
This commit is contained in:
Surya Paolo
2023-12-02 15:23:35 +01:00
parent 8e42baf79e
commit 6edba03eff
11 changed files with 180 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/models/circuit.js
View File

@@ -1161,7 +1161,7 @@ CircuitSchema.statics.SetDefMinMaxCollettivi = async function (idapp, valmin, va
CircuitSchema.statics.setFido = async function (idapp, username, circuitName, groupname) {
mycircuit = await Circuit.findOne({ idapp, name: circuitName });
mycircuit = await Circuit.findOne({ idapp, name: circuitName }).lean();
if (mycircuit) {
const circuitId = mycircuit._id;
let account = null;
@@ -1178,7 +1178,7 @@ CircuitSchema.statics.setFido = async function (idapp, username, circuitName, gr
const accountsuser = await Account.getUserAccounts(idapp, username);
if (accountsuser) {
// Se lo trovo della mia provincia, prendo quello
account = accountsuser.find((account) => account.circuit.strProv === myuser.profile.resid_province && account.circuit.card === myuser.profile.resid_card)
account = accountsuser.find((account) => account.circuit.strProv === myuser.profile.resid_province && ((account.circuit.card === myuser.profile.resid_card) || !myuser.profile.resid_card))
if (!account && accountsuser.length > 0) {
// Se non lo trovo, prendo il primo in cui sono entrato !
account = accountsuser[0];

2
src/server/models/user.js
View File

@@ -4696,7 +4696,7 @@ UserSchema.statics.calcnumRegUntilDay = async function (idapp) {
UserSchema.statics.calcRegDaily = async function (idapp) {
const User = this;
return await User.aggregate(User.getUsersRegDaily(idapp, 90)).then(ris => {
return await User.aggregate(User.getUsersRegDaily(idapp, 120)).then(ris => {
// console.table(ris);
return ris;
});