- Chart Maps Nationality

- Username lowercase
- Statistics
- Telegram

src/server/router/dashboard_router.js

@@ -21,7 +21,7 @@ router.post('/', authenticate, async (req, res) => {
 
   const aportador_solidario = req.user.aportador_solidario;
 
-  const dashboard = User.getDashboard(idapp, aportador_solidario, req.user.username);
+  const dashboard = await User.getDashboard(idapp, aportador_solidario, req.user.username);
   if (dashboard)
     res.send({ dashboard });
   else

src/server/router/notevole_router.js

@@ -26,26 +26,35 @@ router.post('/load', async (req, res) => {
     num_tot_lista: await ExtraList.getTotInLista(idapp),
     num_reg_lista: await ExtraList.getRegDellaLista(idapp),
     num_reg: await User.getUsersRegistered(idapp),
+    email_non_verif: await User.getEmailNotVerified(idapp),
+    num_teleg_attivo: await User.getUsersTelegramAttivo(idapp),
+    num_teleg_pending: await User.getUsersTelegramPending(idapp),
+    num_part_zoom: await User.getUsersZoom(idapp),
+    num_users_dream: await User.getUsersDreams(idapp),
+    arr_nations: await User.findAllDistinctNationality(idapp),
+    reg_daily: await User.calcRegDaily(idapp),
     lastsreg: await User.getLastUsers(idapp),
     checkuser: await User.checkUser(idapp, username),
   };
 
+
+
   // console.table(datastat.lastsreg);
 
-/*
-  let datastat = {
-    num_tot_lista: 80,
-    num_reg: 40,
-    lastsreg: [
-      { username: 'prova3', name: 'Datti', surname: 'Una Mossa', nationality: 'gb', date_reg: new Date()},
-      { username: 'prova2', name: 'Pinco', surname: 'Pallino', nationality: 'de', date_reg: new Date()},
-      { username: 'paoloar77', name: 'Paolo', surname: 'Arena', nationality: 'it', date_reg: new Date()},
-      { username: 'mariorossi', name: 'Mario', surname: 'Rossi', nationality: 'es', date_reg: new Date()},
-      { username: 'prova4', name: 'Quanto', surname: 'Siamo Fighi', nationality: 'uk', date_reg: new Date()},
-      { username: 'prova5', name: 'Secondo', surname: 'PPP', nationality: 'sl', date_reg: new Date()},
-    ]
-  };
-*/
+  /*
+    let datastat = {
+      num_tot_lista: 80,
+      num_reg: 40,
+      lastsreg: [
+        { username: 'prova3', name: 'Datti', surname: 'Una Mossa', nationality: 'gb', date_reg: new Date()},
+        { username: 'prova2', name: 'Pinco', surname: 'Pallino', nationality: 'de', date_reg: new Date()},
+        { username: 'paoloar77', name: 'Paolo', surname: 'Arena', nationality: 'it', date_reg: new Date()},
+        { username: 'mariorossi', name: 'Mario', surname: 'Rossi', nationality: 'es', date_reg: new Date()},
+        { username: 'prova4', name: 'Quanto', surname: 'Siamo Fighi', nationality: 'uk', date_reg: new Date()},
+        { username: 'prova5', name: 'Secondo', surname: 'PPP', nationality: 'sl', date_reg: new Date()},
+      ]
+    };
+  */
 
   res.send({ datastat });
 });

src/server/router/users_router.js

@@ -53,7 +53,7 @@ router.post('/', async (req, res) => {
 
   user.linkreg = reg.getlinkregByEmail(body.idapp, body.email, body.username);
   user.verified_email = false;
-  user.ipaddr = reg.getiPAddressUser(req);
+  user.ipaddr = tools.getiPAddressUser(req);
   user.lasttimeonline = new Date();
   user.date_reg = new Date();
   user.date_temp_reg = new Date();
@@ -62,6 +62,11 @@ router.post('/', async (req, res) => {
     user.verified_email = true;
   }
 
+  if (user.profile.intcode_cell) {
+    if (user.profile.cell.substring(0, user.profile.intcode_cell.length) === user.profile.intcode_cell) {
+      user.profile.cell = user.profile.cell.substring(user.profile.intcode_cell.length)
+    }
+  }
   let exit;
 
   // Check if already esist email or username
@@ -98,6 +103,21 @@ router.post('/', async (req, res) => {
       nomeaportador_corretto = recextra.aportador_solidario_originale_name_surname;
   }
 
+  const lastuser = await User.getLastUser(user.idapp);
+  const lastextra = await ExtraList.getLastUser(user.idapp);
+  let lastindorder = 0;
+
+  if (lastuser) {
+    lastindorder = lastuser.ind_order;
+  }
+  if (lastextra) {
+    if (lastextra.ind_order > lastindorder)
+      lastindorder = lastextra.ind_order;
+  }
+
+  if (lastindorder > 0)
+    user.ind_order = lastindorder + 1;
+
 
   namesurname_aportador_reg = await User.getNameSurnameByUsername(user.idapp, user.aportador_solidario);
 
@@ -119,6 +139,9 @@ router.post('/', async (req, res) => {
   if (already_registered) {
     // Check in the extraList if is present!
     if (!recextra) {
+      console.log('Utente non trovato; ', user);
+      const msg = 'Utente non trovato: ' + user.name + ' ' + user.surname + ' ' + user.profile.nationality + ' ' + user.profile.intcode_cell + user.profile.cell + ' email: ' + user.email + ' username: ' + user.username;
+      telegrambot.sendMsgTelegramToTheManagers(user.idapp, msg);
       res.status(400).send({ code: server_constants.RIS_CODE_USER_EXTRALIST_NOTFOUND, msg: '' });
       return 1;
     } else {
@@ -247,7 +270,9 @@ router.post('/login', (req, res) => {
     .then((user) => {
       // tools.mylog("CREDENZIALI ! ");
       if (!user) {
-        tools.mylogshow("NOT FOUND !");
+        tools.mylogshow("Errore LOGIN ! Username o password Errati: ", body.username, body.password);
+        const msg = "Tentativo di Login ERRATO [" + body.username + ' , ' + body.password + ']\n' + '[IP: ' + tools.getiPAddressUser(req) + ']';
+        telegrambot.sendMsgTelegramToTheManagers(body.idapp, msg);
         res.status(404).send({ code: server_constants.RIS_CODE_LOGIN_ERR });
       }
       return user