Pannello Utente
Aggiornamento Yarn - Notifiche (1)
This commit is contained in:
@@ -55,6 +55,7 @@ const {CalZoom} = require('../models/calzoom');
|
||||
const {Gallery} = require('../models/gallery');
|
||||
const {Settings} = require('../models/settings');
|
||||
const {SendMsg} = require('../models/sendmsg');
|
||||
const {SendNotif} = require('../models/sendnotif');
|
||||
const {Permission} = require('../models/permission');
|
||||
const Producer = require('../models/producer');
|
||||
const Cart = require('../models/cart');
|
||||
@@ -138,7 +139,6 @@ router.post(process.env.LINK_REQUEST_NEWPASSWORD, async (req, res) => {
|
||||
'POST ' + process.env.LINK_REQUEST_NEWPASSWORD + ' idapp= ' + idapp +
|
||||
' email = ' + email);
|
||||
|
||||
|
||||
try {
|
||||
const ris = await User.createNewRequestPwd(idapp, email);
|
||||
if (ris) {
|
||||
@@ -148,7 +148,7 @@ router.post(process.env.LINK_REQUEST_NEWPASSWORD, async (req, res) => {
|
||||
return res.status(200).
|
||||
send({code: server_constants.RIS_CODE_EMAIL_NOT_EXIST, msg: ''});
|
||||
}
|
||||
} catch(e) {
|
||||
} catch (e) {
|
||||
console.log(process.env.LINK_REQUEST_NEWPASSWORD, e.message);
|
||||
res.status(400).send();
|
||||
res.send({code: server_constants.RIS_CODE_ERR, msg: e});
|
||||
@@ -304,11 +304,11 @@ router.post('/settable', authenticate, async (req, res) => {
|
||||
// Controlla se esiste già con lo stesso nome
|
||||
let alreadyexist = await MyGroup.findOne({idapp, groupname: mydata.groupname});
|
||||
if (alreadyexist) {
|
||||
return res.send({code: server_constants.RIS_CODE_REC_ALREADY_EXIST_CODE });
|
||||
return res.send({code: server_constants.RIS_CODE_REC_ALREADY_EXIST_CODE});
|
||||
}
|
||||
alreadyexist = await MyGroup.findOne({idapp, title: mydata.title});
|
||||
if (alreadyexist) {
|
||||
return res.send({code: server_constants.RIS_CODE_REC_ALREADY_EXIST_NAME });
|
||||
return res.send({code: server_constants.RIS_CODE_REC_ALREADY_EXIST_NAME});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -444,6 +444,57 @@ router.post('/gettable', authenticate, (req, res) => {
|
||||
|
||||
});
|
||||
|
||||
router.post('/getexp', authenticate, (req, res) => {
|
||||
const params = req.body;
|
||||
let idapp = req.user.idapp;
|
||||
const myUser = globalTables.getTableByTableName('users');
|
||||
// console.log('mytable', mytable);
|
||||
if (!myUser || params.filtersearch2 !== 'fdsgas1') {
|
||||
return res.status(400).send({});
|
||||
}
|
||||
|
||||
if ((!User.isAdmin(req.user.perm) && !User.isManager(req.user.perm) &&
|
||||
!User.isTutor(req.user.perm))) {
|
||||
// If without permissions, exit
|
||||
return res.status(404).
|
||||
send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
|
||||
}
|
||||
|
||||
try {
|
||||
|
||||
if (params.table === 'exp') {
|
||||
return myUser.find({
|
||||
idapp,
|
||||
$or: [
|
||||
{deleted: {$exists: false}},
|
||||
{deleted: {$exists: true, $eq: false}}],
|
||||
},
|
||||
{
|
||||
username: 1,
|
||||
email: 1,
|
||||
'profile.teleg_id': 1,
|
||||
'verified_by_aportador': 1,
|
||||
'profile.username_telegram': 1,
|
||||
'profile.firstname_telegram': 1,
|
||||
'profile.lastname_telegram': 1,
|
||||
}).then(ris => {
|
||||
|
||||
return res.send({data: ris});
|
||||
|
||||
}).catch((e) => {
|
||||
console.error('getexp: ' + e.message);
|
||||
res.status(400).send(e);
|
||||
});
|
||||
}
|
||||
|
||||
} catch (e) {
|
||||
console.error(`ERROR getexp ${params.table}: `, e.message, 'params',
|
||||
params);
|
||||
res.status(500).send(e);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
router.post('/pickup', authenticate, (req, res) => {
|
||||
const params = req.body;
|
||||
let idapp = req.user.idapp;
|
||||
@@ -1249,8 +1300,8 @@ router.get(process.env.LINK_CHECK_UPDATES, authenticate, async (req, res) => {
|
||||
// const sall = '0';
|
||||
|
||||
// msgs = SendMsg.findAllByUserIdAndIdApp(userId, req.user.username, req.user.idapp);
|
||||
let last_msgs = SendMsg.findLastGroupByUserIdAndIdApp(userId,
|
||||
req.user.username, idapp);
|
||||
let last_msgs = SendMsg.findLastGroupByUserIdAndIdApp(userId, req.user.username, idapp);
|
||||
let last_notifs = SendNotif.findLastGroupByUserIdAndIdApp(userId, req.user.username, idapp);
|
||||
|
||||
let usersList = null;
|
||||
|
||||
@@ -1265,12 +1316,13 @@ router.get(process.env.LINK_CHECK_UPDATES, authenticate, async (req, res) => {
|
||||
}
|
||||
}
|
||||
|
||||
return Promise.all([usersList, last_msgs]).then((arrdata) => {
|
||||
return Promise.all([usersList, last_msgs, last_notifs]).then((arrdata) => {
|
||||
// console.table(arrdata);
|
||||
return res.send({
|
||||
CfgServer: arrcfgrec,
|
||||
usersList: arrdata[0],
|
||||
last_msgs: arrdata[1],
|
||||
last_notifs: arrdata[2],
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1413,43 +1465,41 @@ function uploadFile(req, res, version) {
|
||||
// SMALL
|
||||
|
||||
// questa opzione 'failOnError' serve per risolvere l'errore (Error: VipsJpeg: Invalid SOS parameters for sequential JPEG
|
||||
sharp(newname, { failOnError: false }).
|
||||
sharp(newname, {failOnError: false}).
|
||||
resize(64, 64).
|
||||
withMetadata().
|
||||
toFile(resized_img_small);
|
||||
|
||||
// MEDIUM
|
||||
let resized_img = tools.extractFilePath(newname) + '/' + server_constants.PREFIX_IMG + tools.extractFileName(newname);
|
||||
sharp(newname, { failOnError: false }).
|
||||
resize( {
|
||||
sharp(newname, {failOnError: false}).
|
||||
resize({
|
||||
width: 512,
|
||||
height: 512,
|
||||
fit: sharp.fit.cover,
|
||||
position: sharp.strategy.entropy
|
||||
})
|
||||
.withMetadata()
|
||||
.toFile(resized_img, function(err) {
|
||||
position: sharp.strategy.entropy,
|
||||
}).withMetadata().toFile(resized_img, function(err) {
|
||||
|
||||
// console.log('3) Ridimensionata Immagine ' + newname, 'in', resized_img);
|
||||
// console.log('3) Ridimensionata Immagine ' + newname, 'in', resized_img);
|
||||
|
||||
if (tools.isFileExists(resized_img)) {
|
||||
// console.log('4) Cancella l \'immagine grande originale:', newname);
|
||||
// DELETE THE ORIGINAL BIG
|
||||
tools.delete(newname, false, () => {});
|
||||
|
||||
// console.log('5) Rinomina l\'immagine Media da', resized_img, 'a:', newname);
|
||||
// RENAME THE MEDIUM IN THE ORIGINAL NAME
|
||||
tools.move(resized_img, newname, (err) => {
|
||||
if (err)
|
||||
console.error('err', err);
|
||||
else
|
||||
console.log('move', newname);
|
||||
});
|
||||
}
|
||||
if (tools.isFileExists(resized_img)) {
|
||||
// console.log('4) Cancella l \'immagine grande originale:', newname);
|
||||
// DELETE THE ORIGINAL BIG
|
||||
tools.delete(newname, false, () => {});
|
||||
|
||||
// console.log('5) Rinomina l\'immagine Media da', resized_img, 'a:', newname);
|
||||
// RENAME THE MEDIUM IN THE ORIGINAL NAME
|
||||
tools.move(resized_img, newname, (err) => {
|
||||
if (err)
|
||||
console.error('Error Upload: ', err);
|
||||
console.error('err', err);
|
||||
else
|
||||
console.log('move', newname);
|
||||
});
|
||||
}
|
||||
|
||||
if (err)
|
||||
console.error('Error Upload: ', err);
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('Error Upload(2) ', e);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user