From 12d2eff24a2cb5b389b9dbeb767b58b0195a025e Mon Sep 17 00:00:00 2001
From: paoloar77 <paolo.arena77@gmail.com>
Date: Mon, 28 Feb 2022 00:07:47 +0100
Subject: [PATCH] Aggiungere Sito internet anche ai gruppi Pare che quando creo
 un gruppo compaia il mio username tra gli amministratori ! Il filtro per
 Categoria in Servizi non filtra bene !

---
 src/server/models/site.js          |  1 +
 src/server/router/index_router.js  | 20 +++++++-------------
 src/server/server.js               |  2 +-
 src/server/telegram/telegrambot.js |  2 +-
 src/server/tools/shared_nodejs.js  |  3 ++-
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/server/models/site.js b/src/server/models/site.js
index 9691e62..70da521 100755
--- a/src/server/models/site.js
+++ b/src/server/models/site.js
@@ -117,6 +117,7 @@ module.exports.executeQueryTable = async function (idapp, params, userreq) {
     return await Site.findOne({idapp: extrapar}, {name: 1, manageremail: 1, confsite: 1}).lean();
   }
 
+
   if (User.isAdmin(userreq.perm)) {
     const myarr = await Site.find({});
 
diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js
index 706526c..9522fe5 100755
--- a/src/server/router/index_router.js
+++ b/src/server/router/index_router.js
@@ -281,21 +281,14 @@ router.post('/settable', authenticate, (req, res) => {
 
     if (shared_consts.TABLES_USER_INCLUDE_MY.includes(params.table)) {
       if (!mydata.admins) {
+        // Aggiungi solo se non esistono Admin:
         mydata.admins = [];
-      } else {
-        /*const arrnew = [];
-        for (const username of mydata.admins) {
-          arrnew.push({username});
+        const indfind = mydata.admins.findIndex(
+            (rec) => (rec.username === req.user.username));
+
+        if (indfind < 0) {
+          mydata.admins.push({username: req.user.username});
         }
-        mydata.admins = arrnew;
-
-         */
-      }
-      const indfind = mydata.admins.findIndex(
-          (rec) => (rec.username === req.user.username));
-
-      if (indfind < 0) {
-        mydata.admins.push({username: req.user.username});
       }
     }
 
@@ -584,6 +577,7 @@ router.patch('/chval', authenticate, async (req, res) => {
 
   }
 
+
   await mytable.findByIdAndUpdate(id, {$set: fieldsvalue}).then(async (rec) => {
     // tools.mylogshow(' REC TO MODIFY: ', rec);
     if (!rec) {
diff --git a/src/server/server.js b/src/server/server.js
index a1c3415..138273b 100755
--- a/src/server/server.js
+++ b/src/server/server.js
@@ -431,7 +431,7 @@ async function faitest() {
 
   // const $vers = tools.getVersionint('1.92.45');
 
-  if (true){
+  if (false){
     const prova = tools.getConfSiteOptionEnabledByIdApp('13', shared_consts.ConfSite.Notif_Reg_Push_Admin)
     console.log('prova', prova);
   }
diff --git a/src/server/telegram/telegrambot.js b/src/server/telegram/telegrambot.js
index 7a08047..9066005 100755
--- a/src/server/telegram/telegrambot.js
+++ b/src/server/telegram/telegrambot.js
@@ -731,7 +731,7 @@ module.exports = {
     let text = '';
     if (phase === this.phase.REGISTRATION) {
 
-      if (tools.getConfSiteOptionEnabledByIdApp(mylocalsconf.idapp, shared_consts.ConfSite.Notif_Reg_Bot)) {
+      if (tools.getConfSiteOptionEnabledByIdApp(mylocalsconf.idapp, shared_consts.ConfSite.Notif_Reg_Bot_ToManagers)) {
         if (userdest) {
           NameFrom = await User.getNameSurnameByUsername(mylocalsconf.idapp,
               userdest, true) + aportador;
diff --git a/src/server/tools/shared_nodejs.js b/src/server/tools/shared_nodejs.js
index b7de109..7d2bcc4 100755
--- a/src/server/tools/shared_nodejs.js
+++ b/src/server/tools/shared_nodejs.js
@@ -233,8 +233,9 @@ module.exports = {
     CANCELED: 10,
   },
 
+
   ConfSite: {
-    Notif_Reg_Bot: 1,
+    Notif_Reg_Bot_ToManagers: 1,
     Notif_Reg_Push_Admin: 2,
     Need_Aportador_On_DataReg_To_Verify_Reg: 4,
   },