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

Lista Doni Navi

Browse Source
This commit is contained in:
Paolo Arena
2020-03-25 09:25:31 +01:00
parent b2696d1898
commit b9d899ba72
6 changed files with 183 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/server/router/dashboard_router.js
View File

@@ -58,11 +58,23 @@ router.post('/msgnave', authenticate, async (req, res) => {
const idapp = req.body.idapp;
let mydata = req.body;
const ris = await telegrambot.sendMsgTelegramToNave(idapp, mydata);
if (ris)
res.send({ code: server_constants.RIS_CODE_OK, ris });
else
try {
let ris = null;
if (mydata.tipomsg === tools.TipoMsg.SEND_MSG_SINGOLO)
ris = await telegrambot.sendMsgTelegram(idapp, mydata.username, mydata.msgpar1, true); // Anche a STAFF
else
ris = await telegrambot.sendMsgTelegramToNave(idapp, mydata);
if (ris)
res.send({ code: server_constants.RIS_CODE_OK, ris });
else
res.send({ code: server_constants.RIS_CODE_ERR, ris: null });
}catch (e) {
res.status(400).send(e);
}
});
@@ -122,10 +134,12 @@ router.post('/getdoninavi', authenticate, async (req, res) => {
navi_partenza.push(mynave);
let numcol = Math.pow(2, indriga - 1);
let quanti = Math.ceil(numcol / 8);
// let quanti = Math.ceil(numcol / 8);
for (let indcol = 1; indcol <= numcol; indcol++) {
arrnavi.push({ riga: indriga, col: indcol });
arrnavi.push({ riga: indriga, col: indcol, rigadon: indriga + 3, coldon: (indcol * 8) - 7 });
}
}
}
@@ -133,24 +147,30 @@ router.post('/getdoninavi', authenticate, async (req, res) => {
let index = 1;
for (nave of arrnavi) {
nave.rec = await Nave.getNaveByRigaCol(idapp, nave.riga, nave.col);
mypos = {
nave.rec = await Nave.getNaveByRigaCol(idapp, nave.rigadon, nave.coldon);
/*mypos = {
riga: nave.riga,
col: nave.col,
numup: 3,
};
tools.getRigaColByPosUp(mypos);
tools.getRigaColByPosUp(mypos);*/
nave.index = index;
if (!!nave.rec.donatore.recmediatore) {
nave.id = nave.rec.donatore.recmediatore._id;
nave.note = nave.rec.donatore.recmediatore.note;
} else {
nave.id = null;
}
nave.DoniAttesaDiConferma = 0;
nave.DoniMancanti = 0;
nave.DoniMancanti = 0;
if (!!nave.rec) {
if (!!nave.rec.mediatore) {
nave.DoniAttesaDiConferma = nave.rec.mediatore.arrdonatori.filter((rec) => (!!rec.date_made_gift && !rec.made_gift)).reduce((sum, item) => sum + 1, 0);
nave.DoniMancanti = nave.rec.mediatore.arrdonatori.filter((rec) => (!rec.made_gift && !rec.date_made_gift)).reduce((sum, item) => sum + 1, 0);
nave.DoniConfermati = nave.rec.mediatore.arrdonatori.filter((rec) => rec.made_gift).reduce((sum, item) => sum + 1, 0);
if (!!nave.rec.donatore) {
nave.DoniAttesaDiConferma = nave.rec.donatore.arrdonatori.filter((rec) => (!!rec.date_made_gift && !rec.made_gift && !(rec.ind_order === nave.rec.donatore.recmediatore.ind_order && rec.num_tess === 2))).reduce((sum, item) => sum + 1, 0);
nave.DoniMancanti = nave.rec.donatore.arrdonatori.filter((rec) => (!rec.made_gift && !(rec.ind_order === nave.rec.donatore.recmediatore.ind_order && rec.num_tess === 2))).reduce((sum, item) => sum + 1, 0);
nave.DoniConfermati = nave.rec.donatore.arrdonatori.filter((rec) => rec.made_gift && !(rec.ind_order === nave.rec.donatore.recmediatore.ind_order && rec.num_tess === 2)).reduce((sum, item) => sum + 1, 0);
}
}
index++;

19
src/server/router/users_router.js
View File

@@ -433,7 +433,7 @@ router.post('/dbop', authenticate, async (req, res) => {
} else if (mydata.dbop === 'delNaviNoStarted') {
await Nave.setRiga(idapp, 1);
await Nave.setCol(idapp, 1);
const num = await Nave.remove({ idapp, date_start : { $gte: tools.IncDateNow(-1000 * 60 * 60 * 24 * 3) } });
const num = await Nave.remove({ idapp, date_start: { $gte: tools.IncDateNow(-1000 * 60 * 60 * 24 * 3) } });
ris = { num };
} else if (mydata.dbop === 'delNaviProvvisorie') {
const num = await Nave.remove({ idapp, provvisoria: true });
@@ -491,6 +491,23 @@ router.post('/dbop', authenticate, async (req, res) => {
}
ris = { num };
} else if (mydata.dbop === 'Corregginumtess') {
const listanavi = await Nave.find({ idapp });
let num = 0;
for (let rec of listanavi) {
const myarrrec = await Nave.find({ idapp, ind_order: rec.ind_order }).sort({ riga: 1, col: 1 });
let indextess = 1;
for (let ind = 0; ind < myarrrec.length; ind++) {
if (myarrrec[ind].num_tess !== indextess) {
myarrrec[ind].num_tess = indextess;
const risu = await Nave.findOneAndUpdate({ _id: myarrrec[ind]._id }, { $set: { num_tess: myarrrec[ind].num_tess } }, { new: false });
num++;
}
indextess++;
}
}
ris = { num };
} else if (mydata.dbop === 'creaUtentiTest') {