Grosse Modifiche Completate !

This commit is contained in:
Paolo Arena
2020-05-11 22:43:14 +02:00
parent ae77637d33
commit db12375935
10 changed files with 269 additions and 229 deletions

View File

@@ -122,6 +122,8 @@ router.post('/getnavi', authenticate, async (req, res) => {
let arrnavi = await NavePersistente.findAllIdApp(idapp);
// let arrnavi = await NavePersistente.find({idapp, date_gift_chat_open: { $gte: tools.IncDateNow(-1000 * 3600 * 24 * 7 ) } }).sort({ riga: 1, col: 1 });
for (nave of arrnavi) {
//nave.rec = await Nave.getNaveByRigaCol(idapp, nave.riga, nave.col);
nave._doc.rec = {
@@ -153,8 +155,14 @@ router.post('/getnavi', authenticate, async (req, res) => {
router.post('/getdoninavi', authenticate, async (req, res) => {
const idapp = req.body.idapp;
const ricalcola = req.body.ricalcola;
const showall = req.body.showall;
let arrnavi = null;
if (showall)
arrnavi = await NavePersistente.findAllIdApp(idapp);
else
arrnavi = await NavePersistente.find({idapp, date_gift_chat_open: { $gte: tools.IncDateNow(-1000 * 3600 * 24 * 7 ) } }).sort({ riga: 1, col: 1 });
let arrnavi = await NavePersistente.findAllIdApp(idapp);
let test = false;
//arrnavi.push({ riga: indriga, col: indcol, rigadon: indriga + 3, coldon: (indcol * 8) - 7 });
@@ -168,7 +176,7 @@ router.post('/getdoninavi', authenticate, async (req, res) => {
index++;
}
} else {
arrnavi = await NavePersistente.findAllIdApp(idapp);
// arrnavi = await NavePersistente.findAllIdApp(idapp);
for (nave of arrnavi) {
if (nave.provvisoria || nave.DoniTotali !== nave.DoniConfermati) {
nave._doc.rec = await Nave.getNaveByRigaCol(idapp, nave.riga1don, nave.col1don);