Aggiornamento Traduzioni ...

This commit is contained in:
Paolo Arena
2020-03-31 20:34:24 +02:00
parent d59ee578c9
commit 8c9a5f7518
14 changed files with 946 additions and 269 deletions

View File

@@ -83,11 +83,7 @@ router.post('/getnavi', authenticate, async (req, res) => {
const idapp = req.body.idapp;
let arrnavi = [];
let navi_partenza = [];
let test = false;
for (let indriga = 1; indriga <= 4; indriga++) {
navi_partenza.push(await Nave.getPrimaNaveByRiga(idapp, indriga));
}
if (test) {
let indriga = 7;
let indcol = 49;
@@ -96,7 +92,6 @@ router.post('/getnavi', authenticate, async (req, res) => {
} else {
for (let indriga = 4; indriga <= 9; indriga++) {
navi_partenza.push(await Nave.getPrimaNaveByRiga(idapp, indriga));
let numcol = Math.pow(2, indriga - 1);
let quanti = Math.ceil(numcol / 8);
@@ -112,6 +107,8 @@ router.post('/getnavi', authenticate, async (req, res) => {
nave.rec = await Nave.getNaveByRigaCol(idapp, nave.riga, nave.col);
}
const navi_partenza = await NavePersistente.findAllIdApp(idapp);
ris = { arrnavi, navi_partenza };
if (ris)
@@ -186,5 +183,23 @@ router.post('/getdoninavi', authenticate, async (req, res) => {
});
router.post('/getdata', authenticate, async (req, res) => {
const idapp = req.body.idapp;
const data = req.body.data;
try {
const mystr = await Nave.getNavePos(idapp, parseInt(data.riga), parseInt(data.col));
if (mystr)
res.send({ code: server_constants.RIS_CODE_OK, ris: mystr });
else
res.status(400).send(e);
} catch (e) {
console.log(e)
}
});
module.exports = router;

View File

@@ -331,6 +331,32 @@ async function getInfoUser(idapp, username) {
}
router.patch('/setlang', authenticate, async (req, res) => {
const username = req.body.data.username;
const idapp = req.body.idapp;
const mydata = req.body.data;
const lang = mydata.lang;
const fieldsvalue = {
lang
};
if (!!lang) {
const rec = await User.findByUsername(idapp, username, false);
let ris = null;
if (!!rec)
ris = await User.findByIdAndUpdate(rec.id, { $set: fieldsvalue });
if (!!ris) {
return res.send({ code: server_constants.RIS_CODE_OK, msg: '' });
}
res.status(400).send();
}
});
router.patch('/chval', authenticate, async (req, res) => {
// const idapp = req.body.idapp;

View File

@@ -420,12 +420,7 @@ router.post('/dbop', authenticate, async (req, res) => {
try {
if (mydata.dbop === 'creaNaviProvvisorie') {
mydata.provvisoria = true;
const num = await Nave.generaNave(idapp, mydata);
ris = { num };
} else if (mydata.dbop === 'creaNaviDefinitive') {
mydata.provvisoria = false;
if (mydata.dbop === 'creaNavi') {
const num = await Nave.generaNave(idapp, mydata);
ris = { num };
} else if (mydata.dbop === 'delNavi') {
@@ -439,7 +434,22 @@ router.post('/dbop', authenticate, async (req, res) => {
// 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 });
let num = 0;
const arrnavi = await Nave.find({ idapp });
for (const nave of arrnavi) {
let persistente = await NavePersistente.findByRigaColByDonatore(idapp, nave.riga, nave.col, 0);
if (!!persistente) {
if (persistente.provvisoria) {
let ris = await Nave.remove({ _id: nave._id });
if (!!ris) {
num++;
}
}
}
}
const data = await Nave.getLastRigaCol(idapp);
await Nave.setRiga(idapp, data.riga);
@@ -456,7 +466,10 @@ router.post('/dbop', authenticate, async (req, res) => {
const mystr = await Nave.checkIfDevoAggiungereInNave(idapp);
ris = { mystr };
} else if (mydata.dbop === 'visuListaIngresso') {
const mystr = await ListaIngresso.showListaOrd(idapp);
const mystr = await ListaIngresso.showListaOrd(idapp, false);
ris = { mystr };
} else if (mydata.dbop === 'visuListaIngressoNuovi') {
const mystr = await ListaIngresso.showListaOrd(idapp, true);
ris = { mystr };
} else if (mydata.dbop === 'initListaIngresso') {
// const aaa = await User.updateMany({ idapp }, { $set: { 'profile.nationality': 'IT' } });
@@ -512,45 +525,47 @@ router.post('/dbop', authenticate, async (req, res) => {
}
ris = { num };
} else if (mydata.dbop === 'CreaNaviPersistenti') {
const listanavi = await Nave.find({ idapp }).sort({riga: 1, col: 1});
let params = {
idapp
};
let num = 0;
for (let rec of listanavi) {
let mypos = {
idapp,
riga: rec.riga,
col: rec.col,
numup: 3
};
tools.getRigaColByPosUp(mypos);
let persistente = await NavePersistente.findByRigaCol(idapp, mypos.riga, mypos.col, 0);
if (!persistente) {
params.date_start = rec.date_start;
params.date_gift_chat_open = rec.date_gift_chat_open;
params.provvisoria = rec.provvisoria;
params.riga = mypos.riga;
params.col = mypos.col;
if (rec.riga > 3) {
params.riga1don = rec.riga;
params.col1don = rec.col;
} else {
params.riga1don = rec.riga;
params.col1don = rec.col;
}
if (params.riga > 0) {
await NavePersistente.addRecordNavePersistenteByParams(params);
num++;
}
}
/*
}
ris = { num };
else if (mydata.dbop === 'CreaNaviPersistenti') {
const listanavi = await Nave.find({ idapp }).sort({riga: 1, col: 1});
let params = {
idapp
};
let num = 0;
for (let rec of listanavi) {
let mypos = {
idapp,
riga: rec.riga,
col: rec.col,
numup: 3
};
tools.getRigaColByPosUp(mypos);
let persistente = await NavePersistente.findByRigaCol(idapp, mypos.riga, mypos.col, 0);
if (!persistente) {
params.date_start = rec.date_start;
params.date_gift_chat_open = rec.date_gift_chat_open;
params.riga = mypos.riga;
params.col = mypos.col;
if (rec.riga > 3) {
params.riga1don = rec.riga;
params.col1don = rec.col;
} else {
params.riga1don = rec.riga;
params.col1don = rec.col;
}
if (params.riga > 0) {
await NavePersistente.addRecordNavePersistenteByParams(params);
num++;
}
}
}
ris = { num }; */
} else if (mydata.dbop === 'CorreggiDataGiftChat') {
const listanavi = await NavePersistente.find({ idapp });
let num = 0;