Pagina con i link dei Canali territoriali di RISO

Lista Tabelle "Aggiungi" da errore userId...
Aggiunto "Servizi" e alcune sue sottocategorie
Aggiunto anche la conversione della foto piccola alla Foto Profilo

src/server/router/index_router.js

@@ -3,14 +3,8 @@ const router = express.Router(),
     fs = require('fs'),
     path = require('path');
 
-const jwt = require('jsonwebtoken');
-
 const telegrambot = require('../telegram/telegrambot');
 
-const sendemail = require('../sendemail');
-
-const resizer = require('node-image-resizer');
-
 const sharp = require('sharp');
 
 const {authenticate, authenticate_noerror} = require(
@@ -23,11 +17,11 @@ const {Graduatoria} = require('../models/graduatoria');
 const mongoose = require('mongoose').set('debug', false);
 const cfgserver = mongoose.model('cfgserver');
 
-const uuidv4 = require('uuid/v4'); // I chose v4 ‒ you can select others
+// const uuidv4 = require('uuid/v4'); // I chose v4 ‒ you can select others
 
-const ftp = require('../ftp/FTPClient'),
-    formidable = require('formidable'),
-    folder = path.join(__dirname, 'upload');
+// const ftp = require('../ftp/FTPClient');
+const formidable = require('formidable');
+const folder = path.join(__dirname, 'upload');
 
 if (!fs.existsSync(folder)) {
   fs.mkdirSync(folder);
@@ -37,7 +31,6 @@ const _ = require('lodash');
 
 const {User} = require('../models/user');
 const {MyGroup} = require('../models/mygroup');
-// const { ExtraList } = require('../models/extralist');
 const {Booking} = require('../models/booking');
 const {Operator} = require('../models/operator');
 const {Where} = require('../models/where');
@@ -47,11 +40,7 @@ const {PaymentType} = require('../models/paymenttype');
 const {Discipline} = require('../models/discipline');
 const {Skill} = require('../models/skill');
 const {Good} = require('../models/good');
-const {SubSkill} = require('../models/subskill');
-const {MySkill} = require('../models/myskill');
-const {MyGood} = require('../models/mygood');
 const {StatusSkill} = require('../models/statusSkill');
-const {City} = require('../models/city');
 const {Province} = require('../models/province');
 const {Sector} = require('../models/sector');
 const {SectorGood} = require('../models/sectorgood');
@@ -59,15 +48,10 @@ const {CatGrp} = require('../models/catgrp');
 const {Level} = require('../models/level');
 const {AdType} = require('../models/adtype');
 const {AdTypeGood} = require('../models/adtypegood');
-const Pickup = require('../models/pickup');
 const {Newstosent} = require('../models/newstosent');
 const {MyPage} = require('../models/mypage');
-const {MyBot} = require('../models/bot');
 const {CalZoom} = require('../models/calzoom');
 const {Gallery} = require('../models/gallery');
-const {TemplEmail} = require('../models/templemail');
-const {OpzEmail} = require('../models/opzemail');
-const {MailingList} = require('../models/mailinglist');
 const {Settings} = require('../models/settings');
 const {SendMsg} = require('../models/sendmsg');
 const {Permission} = require('../models/permission');
@@ -110,7 +94,6 @@ router.post(process.env.LINKVERIF_REG, (req, res) => {
   const body = _.pick(req.body, ['idapp', 'idlink']);
   const idapp = body.idapp;
   const idlink = body.idlink;
-  // console.log("LINKVERIF_REG POST " + process.env.LINKVERIF_REG + " idapp= " + idapp + " idlink = " + idlink);
 
   // Cerco l'idlink se è ancora da Verificare
 
@@ -1087,7 +1070,8 @@ function load(req, res, version) {
   let sectors = Sector.findAllIdApp(idapp);
   let sectorgoods = SectorGood.findAllIdApp(idapp);
   let catgrps = CatGrp.findAllIdApp(idapp);
-  let cities = City.findAllIdApp(idapp);
+  // let cities = City.findAllIdApp(idapp);
+  let provinces = Province.findAllIdApp(idapp);
   let cart = null;
   let orderscart = null;
   if (gestoredelSito) {
@@ -1143,7 +1127,9 @@ function load(req, res, version) {
     myuserextra,
     sectors,
     statusSkills,
-    cities,
+    provinces,
+    // cities,
+    provinces,
     catgrps,
     adtypes,
     adtypegoods,
@@ -1220,7 +1206,7 @@ function load(req, res, version) {
         // myuser arrdata[26]
         sectors: arrdata[27],
         statusSkills: arrdata[28],
-        cities: arrdata[29],
+        provinces: arrdata[29],
         catgrps: arrdata[30],
         adtypes: arrdata[31],
         adtypegoods: arrdata[32],

src/server/router/push_router.js

@@ -125,20 +125,30 @@ router.post('/send', authenticate, async (req, res) => {
         send({code: server_constants.RIS_CODE_ERR_UNAUTHORIZED, msg: ''});
   }
 
+  let msgcosa = 'da Inviare';
+  if (params.sendreally) {
+    msgcosa = 'Inviati';
+  }
+
   try {
     if (params.typesend === 0)
       params.typesend = shared_consts.TypeSend.PUSH_NOTIFICATION;
-    params.sendreally = true;
+
+    if (params.typemsg === shared_consts.TypeMsg.SEND_TO_MYSELF) {
+      params.usernameDest = req.user.username;
+    }
+
     const ris = await globalTables.SendMsgToParam(idapp, params);
 
+
     return res.send({
       code: server_constants.RIS_CODE_OK,
-      msg: ris.nummsgsent + ' Msg Inviati su ' + ris.numrec + ' !',
+      msg: ris.nummsgsent + ` Msg ${msgcosa} su ` + ris.numrec + ' !',
       nummsg: ris.nummsgsent,
     });
   } catch (e) {
     return res.send(
-        {code: server_constants.RIS_CODE_ERR, msg: nummsg + ' Msg Inviati !'});
+        {code: server_constants.RIS_CODE_ERR, msg: nummsg + ` Msg ${msgcosa} !`});
   }
 
 });