1.0.48

Aggiornamento APP RISO:
✅ Inviando i RIS, deve comparire prima il Circuito della Provincia, e poi quello Nazionale
✅ Risolto problema per vecchie registrazioni, la provincia compariva "undefined".

src/server/tools/general.js

@@ -4960,7 +4960,7 @@ module.exports = {
     const result = [];
 
     text = text.replace(",", ".");
-    const regex = /^(\d+\.?\d*)\s*(ml|gr|l|kg|uova)\s*$/; // Aggiunto un punto dopo \d+ per accettare anche i numeri con la virgola
+    const regex = /^(\d+\.?\d*)\s*(ml|gr|g|l|kg|uova)\s*$/; // Aggiunto un punto dopo \d+ per accettare anche i numeri con la virgola
 
     const match = regex.exec(text);
     if (match) {

src/server/tools/globalTables.js

@@ -24,6 +24,7 @@ const { Skill } = require('../models/skill');
 const { Good } = require('../models/good');
 const { SubSkill } = require('../models/subskill');
 const { MySkill } = require('../models/myskill');
+const { Attivita } = require('../models/attivita');
 const { MyGood } = require('../models/mygood');
 const { MyBacheca } = require('../models/mybacheca');
 const { MyHosp } = require('../models/myhosp');
@@ -212,6 +213,8 @@ module.exports = {
       mytable = SubSkill;
     else if (tablename === shared_consts.TABLES_MYSKILLS)
       mytable = MySkill;
+    else if (tablename === shared_consts.TABLES_ATTIVITAS)
+      mytable = Attivita;
     else if (tablename === shared_consts.TABLES_MYBACHECAS)
       mytable = MyBacheca;
     else if (tablename === shared_consts.TABLES_MYHOSPS)

src/server/tools/shared_nodejs.js

@@ -149,13 +149,15 @@ module.exports = {
   TABLES_MYEVENTS: 'myevents',
   TABLES_CIRCUITS: 'circuits',
   TABLES_MYGROUPS: 'mygroups',
+  TABLES_ATTIVITAS: 'attivitas',
 
   MYTABS: [{ id: 0, table: 'none' },
   { id: 1, table: 'myskills' },
   { id: 2, table: 'mybachecas' },
   { id: 3, table: 'myhosps' },
   { id: 4, table: 'mygoods' },
-  { id: 5, table: 'myevents' }],
+  { id: 5, table: 'myevents' },
+  { id: 6, table: 'attivitas' }],
 
   CMD_REACTION: {
     SET_FAVORITE: 1,
@@ -172,17 +174,20 @@ module.exports = {
     numattend: 1,
   },
 
-  TABLES_ENABLE_GETREC_BYID: ['mybachecas', 'myhosps', 'myskills', 'mygoods'],
-  TABLES_REACTIONS: ['mybachecas', 'myhosps', 'myskills', 'mygoods'],
+  // Condivise
+  TABLES_FAVORITE_BOOKMARK: ['myskills', 'mygoods', 'mybachecas', 'myhosps', 'attivitas'],
 
+  // Solo per NODEJS
+
+  TABLES_ENABLE_GETREC_BYID: ['mybachecas', 'myhosps', 'myskills', 'mygoods', 'attivitas'],
   TABLES_USER_INCLUDE_MY: ['mygroups', 'circuits'],
-  TABLES_GETCOMPLETEREC: ['myskills', 'mybachecas', 'myhosps', 'mygoods'],
-  TABLES_INSERT_ALMOST_ONE_TO_ENABLE_CIRCUIT: ['myskills', 'myhosps', 'mygoods'],
+  TABLES_GETCOMPLETEREC: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'attivitas'],
+  
   //++Todo: per abilitare gli utenti ad inserire un Circuito aggiungere 'circuits' alla lista TABLES_PERM_NEWREC
   TABLES_PERM_NEWREC: ['skills', 'goods', 'subskills', 'mygroups', 'myhosps'],
-  TABLES_REC_ID: ['skills', 'goods', 'subskills'],
-  TABLES_FAVORITE_BOOKMARK: ['myskills', 'mygoods', 'mybachecas', 'myhosps'],
-
+  
+  TABLES_REACTIONS: ['mybachecas', 'myhosps', 'myskills', 'mygoods', 'attivitas'],
+  
   TABLES_VISU_STAT_IN_HOME: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups', 'circuits'],
 
   TABLES_ADV_NOTIFICATION: ['myskills', 'myhosps', 'mygoods'],
@@ -221,8 +226,8 @@ module.exports = {
     // 'mygroups'
   ],
   TABLES_USER_ID: ['mygroups', 'myskills', 'mybachecas', 'myhosps', 'mygoods'],
-  TABLES_CREATEDBY: ['mygroups', 'circuits'],
-  TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'bots', 'mygroups', 'circuits'],
+  TABLES_CREATEDBY: ['mygroups', 'circuits', 'attivitas'],
+  TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'bots', 'mygroups', 'circuits', 'attivitas'],
 
   TABLES_FIELDS_DESCR_AND_CITY_AND_USER: ['myskills', 'mybachecas', 'myhosps', 'mygoods'],
 
@@ -855,6 +860,31 @@ module.exports = {
         link_maplocation: 1,
       }
 
+    } else if (table === this.TABLES_ATTIVITAS) {
+      proj = {
+        recSkill: 1,
+        sector: 1,
+        idSector: 1,
+        idSkill: 1,
+        idCity: 1,
+        logo: 1,
+        photos: 1,    
+        note: 1,
+        descr: 1,
+        website: 1,
+        date_created: 1,
+        date_updated: 1,
+        tipodiAttivita: 1,
+        name: 1,
+        coordinate_gps: 1,
+        email: 1,
+        telegram_username: 1,
+        cell_phone: 1,
+        whatsapp: 1,
+        createdBy: 1,
+        //**ADDFIELD_ATTIVITA
+      };
+    
     } else if (table === this.TABLES_MYBACHECAS) {
       proj = {
         recSkill: 1,