Campo Citta di Nascita (nel profilo nuova maniera), manca ancora da sistemare l'edit

Se seleziono la Provincia , mi deve comparire la lista dei comuni
2022-02-21 13:12:27 +01:00
parent 9aa7518e31
commit 50c3018baa
33 changed files with 1402 additions and 369 deletions
--- a/src/server/tools/general.js
+++ b/src/server/tools/general.js
@@ -64,7 +64,7 @@ const textlang = {
    'partecipanti a Cena Condivisa': 'partecipanti a Cena Condivisa',
    'TESTO_ASSISTENZA': '<strong><a href="%s">👉 Per entrare nel Sito</a></strong>\n\n' +
        '👉 <strong><a href="https://freeplanet.app/requestresetpwd">Hai dimenticato la password?</a></strong>\n\n',
-    'BENVENUTO': 'Benvenuto',
+    'BENVENUTO': 'Benvenut@',
    'TUE_NAVI': 'Ecco le tue Navi programmate',
    'HAI_I_7_REQUISITI': 'PRIMI PASSI OK!\nHai i Primi Requisiti per Entrare nella Lista !',
    'NON_HAI_I_7_REQUISITI': 'Attenzione!\nAncora non hai i 7 Requisiti per Entrare nella Lista !',
--- a/src/server/tools/globalTables.js
+++ b/src/server/tools/globalTables.js
@@ -20,16 +20,20 @@ const {Contribtype} = require('../models/contribtype');
 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 {MyBacheca} = require('../models/mybacheca');
 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');
 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');
@@ -155,12 +159,16 @@ module.exports = {
      mytable = Graduatoria;
    else if (tablename === 'skills')
      mytable = Skill;
+    else if (tablename === 'goods')
+      mytable = Good;
    else if (tablename === 'subskills')
      mytable = SubSkill;
    else if (tablename === shared_consts.TABLES_MYSKILLS)
      mytable = MySkill;
    else if (tablename === shared_consts.TABLES_MYBACHECAS)
      mytable = MyBacheca;
+    else if (tablename === shared_consts.TABLES_MYGOODS)
+      mytable = MyGood;
    else if (tablename === 'statusSkills')
      mytable = StatusSkill;
    else if (tablename === 'cities')
@@ -169,10 +177,16 @@ module.exports = {
      mytable = Province;
    else if (tablename === 'sectors')
      mytable = Sector;
+    else if (tablename === 'sectorgoods')
+      mytable = SectorGood;
    else if (tablename === 'catgrps')
      mytable = CatGrp;
    else if (tablename === 'levels')
      mytable = Level;
+    else if (tablename === 'adtypes')
+      mytable = AdType;
+    else if (tablename === 'adtypegoods')
+      mytable = AdTypeGood;
    else if (shared_consts.TablePickup.includes(tablename))
      mytable = Pickup;
    //else if (shared_consts.TableCities.includes(tablename))
--- a/src/server/tools/shared_nodejs.js
+++ b/src/server/tools/shared_nodejs.js
@@ -32,9 +32,9 @@ module.exports = {
  FILTER_MEMBERSHIP_CARD_OK: 1048576,
  FILTER_USER_NO_VERIFIED_APORTADOR: 2097152,

-  FILTER_MYSKILL_SKILL: 1,
-
  OPTIONS_SEARCH_ONLY_FULL_WORDS: 1,
+  OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2,
+  OPTIONS_SEARCH_USER_ALL_WORDS: 4,

  FRIENDSCMD: {
    SETTRUST: 121,
@@ -80,29 +80,69 @@ module.exports = {
    'Nessuno',
    'Bonifico Bancario',
    'Paypal',
-    'In Contanti alla CNM'
+    'In Contanti alla CNM',
  ],

  PARAM_SHOW_PROVINCE: 1,

  TABLES_MYSKILLS: 'myskills',
  TABLES_MYBACHECAS: 'mybachecas',
+  TABLES_MYGOODS: 'mygoods',

  TABLES_ENABLE_GETREC_BYID: ['mybachecas'],

  TABLES_USER_INCLUDE_MY: ['mygroups'],
-  TABLES_GETCOMPLETEREC: ['myskills', 'mybachecas'],
-  TABLES_PERM_NEWREC: ['skills', 'subskills', 'mygroups'],
+  TABLES_GETCOMPLETEREC: ['myskills', 'mybachecas', 'mygoods'],
+  TABLES_PERM_NEWREC: ['skills', 'goods', 'subskills', 'mygroups'],
+  TABLES_REC_ID: ['skills', 'goods', 'subskills'],

-  TABLES_ID_NUMBER: ['permissions', 'levels', 'adtypes', 'statusSkills', 'sectors', 'catgrps', 'skills', 'subskills', 'cities', 'provinces', 'myskills', 'mybachecas', 'mygroups'],
-  TABLES_USER_ID: ['myskills', 'mybachecas'],
-  TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybachecas', 'mybots'],
-  TABLES_FINDER: ['myskills', 'mybachecas', 'mygroups'],
+  TABLES_ID_NUMBER: [
+    'permissions',
+    'levels',
+    'adtypes',
+    'adtypegoods',
+    'statusSkills',
+    'sectors',
+    'sectorgoods',
+    'catgrps',
+    'skills',
+    'subskills',
+    'cities',
+    'provinces',
+    'myskills',
+    'mybachecas',
+    'mygoods',
+    'mygroups'],
+  TABLES_USER_ID: ['myskills', 'mybachecas', 'mygoods'],
+  TABLES_UPDATE_LASTMODIFIED: ['myskills', 'mybachecas', 'mygoods', 'mybots'],
+  TABLES_FINDER: ['myskills', 'mybachecas', 'mygoods', 'mygroups'],
+  TABLES_VISU_CMYSRECCARD: ['myskills', 'mybachecas', 'mygoods'],

-  TABLES_PERM_CHANGE_FOR_USERS: ['myskills', 'mybachecas'],
-  TABLES_VISU_LISTA_USER: ['myskills', 'mybachecas', 'users'],
-  TABLES_NOT_SHOW_IF_USERNAME: ['myskills', 'mybachecas'],
+  TABLES_PERM_CHANGE_FOR_USERS: ['myskills', 'mybachecas', 'mygoods'],
+  TABLES_VISU_LISTA_USER: ['myskills', 'mybachecas', 'mygoods', 'users'],

+  TABLES_POPULATE_DATA: [
+    {
+      table: 'adtypegoods',
+      key: 'descr',
+    }, {
+      table: 'adtypes',
+      key: 'descr',
+    },
+    {table: 'catgrps', key: 'descr'},
+    {
+      table: 'contribtypes',
+      key: 'descr',
+    },
+    {table: 'goods', key: 'descr'},
+    {table: 'levels', key: 'descr'},
+    {table: 'cities', key: 'comune'},
+    {table: 'provinces', key: 'descr'},
+    {table: 'sectorgoods', key: 'descr'},
+    {table: 'sectors', key: 'descr'},
+    {table: 'skills', key: 'descr'},
+    {table: 'statusSkills', key: 'descr'},
+  ],

  VISIB_ALL: 0,
  VISIB_ONLYIF_VERIFIED: 1,
@@ -144,7 +184,7 @@ module.exports = {

  MessageOptions: {
    Notify_ByEmail: 2,
-    Notify_ByPushNotification: 4
+    Notify_ByPushNotification: 4,
  },

  TypeMsg: {
@@ -153,7 +193,7 @@ module.exports = {
    SEND_TO_SOCIO_RESIDENTE: 3,
    SEND_TO_CONSIGLIO: 5,
    SEND_TO_NON_SOCI: 10,
-    SEND_TO_PAOLO: 20
+    SEND_TO_PAOLO: 20,
  },

  TypeMsg_Actions: {
@@ -170,7 +210,7 @@ module.exports = {
    GET_VALBYTABLE: 400,
    SET_VALBYTABLE: 410,
    ZOOM_GIA_PARTECIPATO: 510,
-    REGISTRATION: 6
+    REGISTRATION: 6,
  },

  OrderStatus: {
@@ -189,12 +229,34 @@ module.exports = {
    ORDER_CONFIRMED: 3,
    PAYED: 4,
    RECEIVED: 6,
-    CANCELED: 10
+    CANCELED: 10,
  },

-
  fieldsUserToChange() {
-    return ['_id', 'index', 'username', 'group', 'email', 'name', 'surname', 'perm', 'date_reg', 'verified_email', 'verified_by_aportador', 'ipaddr', 'lasttimeonline', 'profile', 'calcstat', 'news_on', 'aportador_solidario', 'made_gift', 'ind_order', 'old_order', 'numinvitati', 'numinvitatiattivi', 'qualified']
-  }
+    return [
+      '_id',
+      'index',
+      'username',
+      'group',
+      'email',
+      'name',
+      'surname',
+      'perm',
+      'date_reg',
+      'verified_email',
+      'verified_by_aportador',
+      'ipaddr',
+      'lasttimeonline',
+      'profile',
+      'calcstat',
+      'news_on',
+      'aportador_solidario',
+      'made_gift',
+      'ind_order',
+      'old_order',
+      'numinvitati',
+      'numinvitatiattivi',
+      'qualified'];
+  },

 };