From 4beee58a425013d3728d0d288ba1ae01625a9340 Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Sun, 8 May 2022 13:19:35 +0200
Subject: [PATCH] Aggiunto filtro numMaxPeopleHosp

---
 .env.development                              |   2 +-
 .env.example.production                       |   2 +-
 _ALL_SITES/insiemesipuo.app/.env.development  |   2 +-
 .../popolodelnuovomondo.app/.env.development  |   2 +-
 _ALL_SITES/riso.app/.env.development          |   2 +-
 _ALL_SITES/riso.app/.env.test                 |   2 +-
 package.json                                  |   2 +-
 src/common/shared_vuejs.ts                    |  41 ++++++-
 src/components/CDateTime/CDateTime.ts         |   2 +-
 src/components/CDateTime/CDateTime.vue        |   2 +-
 src/components/CFinder/CFinder.ts             |   8 ++
 src/components/CGridTableRec/CGridTableRec.ts |   7 ++
 src/components/CMyPopupEdit/CMyPopupEdit.ts   |   7 ++
 src/components/CMyPopupEdit/CMyPopupEdit.vue  |  20 +---
 src/components/CShareWithUs/CShareWithUs.ts   |   1 +
 src/components/CSignUp/CSignUp.vue            |  15 +--
 src/db/lang/ws_it.js                          |   2 +-
 src/db/static_data.ts                         | 107 ++++++++++++------
 src/model/GlobalStore.ts                      |   3 +
 src/rootgen/admin/importdata/importdata.ts    |   1 +
 src/rootgen/admin/movsList/index.ts           |   1 +
 src/rootgen/admin/movsList/movsList.scss      |   0
 src/rootgen/admin/movsList/movsList.ts        |  35 ++++++
 src/rootgen/admin/movsList/movsList.vue       |  22 ++++
 src/rootgen/admin/newsletter/newsletter.ts    |   2 +-
 src/statics/lang/it.js                        |  28 +++--
 src/store/Modules/fieldsTable.ts              |  67 ++++++++---
 src/store/Modules/tools.ts                    |   1 +
 src/store/globalStore.ts                      |  11 ++
 29 files changed, 294 insertions(+), 103 deletions(-)
 create mode 100755 src/rootgen/admin/movsList/index.ts
 create mode 100755 src/rootgen/admin/movsList/movsList.scss
 create mode 100755 src/rootgen/admin/movsList/movsList.ts
 create mode 100755 src/rootgen/admin/movsList/movsList.vue

diff --git a/.env.development b/.env.development
index a9327983..08668a21 100755
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.3.18"
+APP_VERSION="0.3.19"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/.env.example.production b/.env.example.production
index 29fe1d07..ee18921f 100755
--- a/.env.example.production
+++ b/.env.example.production
@@ -1,4 +1,4 @@
-APP_VERSION="0.3.18"
+APP_VERSION="0.3.19"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development
index 94544817..1e3497f0 100755
--- a/_ALL_SITES/insiemesipuo.app/.env.development
+++ b/_ALL_SITES/insiemesipuo.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.3.18"
+APP_VERSION="0.3.19"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development
index f68b6bc7..12ba628b 100755
--- a/_ALL_SITES/popolodelnuovomondo.app/.env.development
+++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.3.18"
+APP_VERSION="0.3.19"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="12"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development
index c4ec9c33..8e5c97cc 100755
--- a/_ALL_SITES/riso.app/.env.development
+++ b/_ALL_SITES/riso.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.3.18"
+APP_VERSION="0.3.19"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test
index b8a1147b..81038983 100755
--- a/_ALL_SITES/riso.app/.env.test
+++ b/_ALL_SITES/riso.app/.env.test
@@ -1,4 +1,4 @@
-APP_VERSION="0.3.18"
+APP_VERSION="0.3.19"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/package.json b/package.json
index 226b9065..3d1c0477 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "riso",
-  "version": "0.3.18",
+  "version": "0.3.19",
   "description": "Riso",
   "productName": "Riso",
   "author": "Paolo Arena",
diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts
index 64a5964f..1c94f661 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -95,6 +95,7 @@ export const shared_consts = {
   TABLES_USER_INCLUDE_MY: ['mygroups'],
   TABLES_GETCOMPLETEREC: ['myskills', 'mybachecas', 'myhosps', 'mygoods'],
   TABLES_WITH_FILTER_FIELD: ['caldate'],
+  COL_WITH_FILTER_GTE: ['numMaxPeopleHosp'],
   TABLES_WITH_DATE: ['mybachecas', 'myhosps'],
   TABLES_WITH_SORTING: ['mybachecas', 'myhosps'],
   TABLES_REC_ID: ['skills', 'goods', 'subskills', 'myskills', 'mybachecas', 'myhosps', 'mygoods'],
@@ -346,10 +347,6 @@ export const shared_consts = {
   ],
 
   Preferences: [
-    {
-      value: 1,
-      label: 'Si accettano bambini',
-    },
     {
       value: 2,
       label: 'Si accettano cani',
@@ -386,6 +383,42 @@ export const shared_consts = {
       value: 10,
       label: 'Cucina Vegana',
     },
+    {
+      value: 11,
+      label: 'Uso della Cucina',
+    },
+    {
+      value: 12,
+      label: 'Uso della Lavatrice',
+    },
+    {
+      value: 13,
+      label: 'Aria condizionata',
+    },
+    {
+      value: 14,
+      label: 'Ventilatore',
+    },
+    {
+      value: 15,
+      label: 'Doccia all\'aperto',
+    },
+    {
+      value: 16,
+      label: 'TV',
+    },
+    {
+      value: 17,
+      label: 'Eventi consentiti',
+    },
+    {
+      value: 18,
+      label: 'Adatto a bambini da 2 a 12 anni',
+    },
+    {
+      value: 19,
+      label: 'Adatto ai neonati (fino ai 2 anni)',
+    },
   ],
 
   Regions: [
diff --git a/src/components/CDateTime/CDateTime.ts b/src/components/CDateTime/CDateTime.ts
index 10a24417..6f2b945f 100755
--- a/src/components/CDateTime/CDateTime.ts
+++ b/src/components/CDateTime/CDateTime.ts
@@ -76,7 +76,7 @@ export default defineComponent({
     }
 
     function Opening() {
-      // console.log('Opening', 'myvalue', myvalue, 'value', value)
+      console.log('Opening', 'myvalue', myvalue.value)
       saveit.value = false
       valueprec.value = myvalue.value
       if (myvalue.value === '') {
diff --git a/src/components/CDateTime/CDateTime.vue b/src/components/CDateTime/CDateTime.vue
index e6fd1f45..782a3909 100755
--- a/src/components/CDateTime/CDateTime.vue
+++ b/src/components/CDateTime/CDateTime.vue
@@ -38,7 +38,7 @@
       </template>
       <template v-slot:append>
         <q-icon v-if="canEdit" name="event" class="cursor-pointer">
-          <q-popup-proxy v-model="showDateTimeScroller" @before-show="Opening" @before-hide="Closing">
+          <q-popup-proxy transition-show="flip-up" v-model="showDateTimeScroller" @before-show="Opening" @before-hide="Closing">
 
             <div class="q-gutter-md row items-start">
               <q-date
diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts
index a2c1895c..5e7f3a37 100755
--- a/src/components/CFinder/CFinder.ts
+++ b/src/components/CFinder/CFinder.ts
@@ -1025,8 +1025,15 @@ export default defineComponent({
         }
 
       } else if (props.table === toolsext.TABMYHOSPS) {
+        let obj2: any = {}
+
+        if (myrecfiltertoggle.value === tools.FILTER_ALL) {
+          obj2['visibile'] = true
+        }
+
         return {
           // Servizi
+          filtersearch2: [obj2],
           lookup1: {
             lk_tab: 'users',
             lk_LF: 'userId',
@@ -1041,6 +1048,7 @@ export default defineComponent({
             lk_as: 'mycities',
             af_objId_tab: '',
             lk_proj: {
+              visibile: 1,
               typeHosp: 1,
               numMaxPeopleHosp: 1,
               accomodation: 1,
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index f35f48d6..3d7ebb5c 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -445,6 +445,7 @@ export default defineComponent({
       let filtersearch3or: any[] = []
       let filtersearch3and: any[] = []
       let filtercustom: any[] = [...props.filtercustom]
+      let filter_gte: any[] = []
 
       let recSector = null
       let recSectorGood = null
@@ -550,6 +551,10 @@ export default defineComponent({
 
                 }
               }
+            } else if (shared_consts.COL_WITH_FILTER_GTE.includes(item.key)) {
+              objitem[item.key] = item.value
+              filter_gte.push(objitem)
+
             } else if (item.value > 0) {
               objitem[item.key] = item.value
                 filtersearch.push(objitem)
@@ -676,6 +681,8 @@ export default defineComponent({
         filtersearch3and: filtersearch3and,
         // @ts-ignore
         filtercustom: filtercustom,
+        // @ts-ignore
+        filter_gte,
         sortBy: myobj,
         descending,
         userId: userStore.my._id,
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts
index c3828676..5858eabf 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -395,6 +395,12 @@ export default defineComponent({
       emit('show')
     }
 
+    function OpenEditDateToday() {
+      // console.log('OpenEdit')
+      myvalue.value = new Date()
+      emit('show')
+    }
+
     /*function getval() {
       let myval: any = 'false'
 
@@ -721,6 +727,7 @@ export default defineComponent({
       changevalRecHours,
       updatedata,
       OpenEdit,
+      OpenEditDateToday,
       SaveValueInt,
       annulla,
       Savedb,
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index 7786c4b8..01ef3049 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -9,21 +9,9 @@
           <!-- Edit Value -->
           <div v-if="col.fieldtype === costanti.FieldType.boolean">
             <div v-if="isInModif">
-              <span v-if="insertMode">
-                <q-checkbox
-                  v-model="myvalue"
-                  @update:model-value="changevalRec"
-                  :label="col.label">
-                </q-checkbox>
-              </span>
-              <span v-else>
-                <q-checkbox
-                  v-model="myvalue"
-                  @update:model-value="changevalRec"
-                  :label="col.title">
-                </q-checkbox>
-                <span v-html="visuValByType(myvalue, col, row)"></span>
-              </span>
+              <q-toggle
+                dark color="green" v-model="myvalue" :label="col.title ? col.title : col.label"
+                @update:model-value="changevalRec"></q-toggle>
             </div>
             <div v-else>
               <q-toggle
@@ -288,7 +276,7 @@
             <div v-else-if="canEdit">
               <q-btn
                 dense
-                color="primary" @click="OpenEdit"
+                color="primary" @click="OpenEditDateToday"
                 icon="fas fa-calendar-day"
               />
             </div>
diff --git a/src/components/CShareWithUs/CShareWithUs.ts b/src/components/CShareWithUs/CShareWithUs.ts
index 7137ea10..a17a39ee 100755
--- a/src/components/CShareWithUs/CShareWithUs.ts
+++ b/src/components/CShareWithUs/CShareWithUs.ts
@@ -68,6 +68,7 @@ export default defineComponent({
         filtersearch: '',
         filtersearch2: '',
         filtercustom: '',
+        filter_gte: '',
         sortBy: myobj,
         descending,
         userId: userStore.my._id
diff --git a/src/components/CSignUp/CSignUp.vue b/src/components/CSignUp/CSignUp.vue
index 2359ee60..7e7a4960 100755
--- a/src/components/CSignUp/CSignUp.vue
+++ b/src/components/CSignUp/CSignUp.vue
@@ -28,16 +28,17 @@
 
           <q-btn class="q-ma-sm" color="positive" icon="fas fa-home" label="Se sei già Registrato CLICCA QUI" to="/"></q-btn>
 
+          <q-banner
+            rounded
+            class="bg-warning text-black"
+            style="text-align: center;"
+          >
+            <span class="mybanner" v-html="t('pages.need_Telegram')"></span>
+          </q-banner>
+
           <div v-if="!isalreadyReg">
             <CTitleBanner :title="$t('pages.SignUp')"></CTitleBanner>
 
-            <q-banner
-              rounded
-              class="bg-warning text-black"
-              style="text-align: center;"
-            >
-              <span class="mybanner" v-html="t('pages.need_Telegram')"></span>
-            </q-banner>
           </div>
 
         </div>
diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js
index 79bc9f79..ae327b73 100755
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -46,7 +46,7 @@ const msg_website_it = {
     presentazione: 'Presentazione',
     presentazione2: 'Presentazione',
     invita: 'Invita Persone',
-    SignUp: 'Nuova Registrazione',
+    SignUp: 'Modulo di Registrazione:',
     need_Telegram: 'Per poter utilizzare la Piattaforma occorre avere Telegram installato.<br><a href="https://play.google.com/store/apps/details?id=org.telegram.messenger" target="_blank">Clicca qui per scaricarlo</a>',
     Registrazione_Con_Bot: 'Per Registrarsi occorre prima verificarsi su Telegram sul <strong>BOT RISO</strong>',
     SignUpIscrizione: 'Diventa Socio CNM',
diff --git a/src/db/static_data.ts b/src/db/static_data.ts
index dba16c14..fc45a96f 100755
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -109,65 +109,112 @@ const routes_admin: IListRoutes[] = [
   }
 ]
 
+
 const routes_newsletter: IListRoutes[] = [
   {
     active: true,
     order: 10,
     name: 'newsletter.template', path: '/admin/newsletter/templemail', materialIcon: 'fas fa-users',
     component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
-    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
+    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
   },
   {
     active: true,
     order: 20,
     name: 'newsletter.sendemail', path: '/admin/newsletter/newnewsletter', materialIcon: 'fas fa-users',
     component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
-    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
+    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
   },
   {
     active: true,
     order: 30,
     name: 'newsletter.check', path: '/admin/newsletter/check', materialIcon: 'fas fa-users',
     component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
-    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
+    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
   },
   {
     active: true,
     order: 40,
     name: 'newsletter.sent', path: '/admin/newsletter/newslist', materialIcon: 'fas fa-users',
     component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
-    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
+    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
   },
   {
     active: true,
     order: 50,
     name: 'newsletter.mailinglist', path: '/admin/newsletter/mailinglist', materialIcon: 'fas fa-users',
     component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
-    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
+    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
   },
   {
     active: true,
     order: 60,
     name: 'newsletter.settings', path: '/admin/newsletter/settings', materialIcon: 'fas fa-users',
     component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
-    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
+    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
   },
   {
     active: true,
     order: 70,
     name: 'newsletter.serversettings', path: '/admin/newsletter/main_settings', materialIcon: 'fas fa-users',
     component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
-    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
+    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
   },
   {
     active: true,
     order: 80,
     name: 'newsletter.others', path: '/admin/newsletter/events', materialIcon: 'fas fa-users',
     component: () => import('@/rootgen/admin/newsletter/newsletter.vue'),
-    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true
+    inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true, noroute: true
   }
 ]
 
+const routes_ris: IListRoutes[] = [
+  {
+    active: true,
+    order: 10,
+    path: '/admin/ris/circuitslist',
+    materialIcon: 'fas fa-users',
+    name: 'otherpages.admin.circuitslist',
+    component: () => import('@/rootgen/admin/circuitsList/circuitsList.vue'),
+    inmenu: true,
+    submenu: true,
+    level_parent: 0.5,
+    level_child: 0.5,
+    onlyManager: true,
+    onlyTutor: true
+  },
+  {
+    active: true,
+    order: 20,
+    path: '/admin/ris/accountslist',
+    materialIcon: 'fas fa-users',
+    name: 'otherpages.admin.accountslist',
+    component: () => import('@/rootgen/admin/accountsList/accountsList.vue'),
+    inmenu: true,
+    submenu: true,
+    level_parent: 0.5,
+    level_child: 0.5,
+    onlyManager: true,
+    onlyTutor: true
+  },
+  {
+    active: true,
+    order: 30,
+    path: '/admin/ris/movslist',
+    materialIcon: 'fas fa-users',
+    name: 'otherpages.admin.movslist',
+    component: () => import('@/rootgen/admin/movsList/movsList.vue'),
+    inmenu: true,
+    submenu: true,
+    level_parent: 0.5,
+    level_child: 0.5,
+    onlyManager: true,
+    onlyTutor: true
+  },
+]
+
+
 const routes_manager: IListRoutes[] = [
   {
     active: functionality.BOOKING_EVENTS,
@@ -199,34 +246,6 @@ const routes_manager: IListRoutes[] = [
     onlyManager: true,
     onlyTutor: true
   },
-  {
-    active: true,
-    order: 11,
-    path: '/admin/circuitslist',
-    materialIcon: 'fas fa-users',
-    name: 'otherpages.admin.circuitslist',
-    component: () => import('@/rootgen/admin/circuitsList/circuitsList.vue'),
-    inmenu: true,
-    submenu: true,
-    level_parent: 0,
-    level_child: 0.5,
-    onlyManager: true,
-    onlyTutor: true
-  },
-  {
-    active: true,
-    order: 12,
-    path: '/admin/accountslist',
-    materialIcon: 'fas fa-users',
-    name: 'otherpages.admin.accountslist',
-    component: () => import('@/rootgen/admin/accountsList/accountsList.vue'),
-    inmenu: true,
-    submenu: true,
-    level_parent: 0,
-    level_child: 0.5,
-    onlyManager: true,
-    onlyTutor: true
-  },
   /*
   {
     active: true,
@@ -246,6 +265,22 @@ const routes_manager: IListRoutes[] = [
    */
   {
     active: true,
+    path: '/admin/ris',
+    order: 60,
+    faIcon: 'fa fa-list-alt',
+    materialIcon: 'fas fa-users',
+    name: 'otherpages.admin.monete',
+    routes2: routes_ris,
+    inmenu: false,
+    submenu: true,
+    level_parent: 0.5,
+    level_child: 0.5,
+    solotitle: true,
+    onlyAdmin: true,
+    onlyManager: true
+  },
+  {
+    active: false,
     order: 10,
     path: '/admin/zoomlist',
     materialIcon: 'fas fa-users',
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 6c2e135e..b927c551 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -344,6 +344,7 @@ export interface IListRoutes {
   solotitle?: boolean
   infooter?: boolean
   submenu?: boolean
+  noroute?: boolean
   onlyAdmin?: boolean
   onlyif_logged?: boolean
   onlyManager?: boolean
@@ -522,6 +523,7 @@ export interface IParamsQuery {
   filtersearch: string
   filtersearch2: string
   filtercustom: string
+  filter_gte: string
   lookup1?: IParLookup
   lookup2?: IParLookup
   lookup3?: IParLookup
@@ -844,6 +846,7 @@ export interface IAccomodation {
 
 export interface IMyHosp {
   _id: number
+  visibile: boolean
   typeHosp: number
   numMaxPeopleHosp: number
   accomodation: IAccomodation[]
diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts
index c15ed99c..12b2956b 100755
--- a/src/rootgen/admin/importdata/importdata.ts
+++ b/src/rootgen/admin/importdata/importdata.ts
@@ -93,6 +93,7 @@ export default defineComponent({
         filtersearch: '',
         filtersearch2: '',
         filtercustom: '',
+        filter_gte: '',
         sortBy: myobj,
         descending,
         userId: ''
diff --git a/src/rootgen/admin/movsList/index.ts b/src/rootgen/admin/movsList/index.ts
new file mode 100755
index 00000000..e69b0a59
--- /dev/null
+++ b/src/rootgen/admin/movsList/index.ts
@@ -0,0 +1 @@
+export {default as movsList} from './movsList.vue'
diff --git a/src/rootgen/admin/movsList/movsList.scss b/src/rootgen/admin/movsList/movsList.scss
new file mode 100755
index 00000000..e69de29b
diff --git a/src/rootgen/admin/movsList/movsList.ts b/src/rootgen/admin/movsList/movsList.ts
new file mode 100755
index 00000000..1c6d22e2
--- /dev/null
+++ b/src/rootgen/admin/movsList/movsList.ts
@@ -0,0 +1,35 @@
+import { defineComponent, onMounted, ref } from 'vue'
+
+import { CMyPage } from '@/components/CMyPage'
+import { CGridTableRec } from '@/components/CGridTableRec'
+import { tools } from '@store/Modules/tools'
+import { static_data } from '@/db/static_data'
+
+import { fieldsTable } from '@src/store/Modules/fieldsTable'
+import { shared_consts } from '@/common/shared_vuejs'
+
+export default defineComponent({
+  name: 'movsList',
+  // @ts-ignore
+  components: { CGridTableRec, CMyPage },
+  setup() {
+
+    const arrfilterand: any = ref([])
+
+    function mounted() {
+      if (tools.appid() === tools.IDAPP_RISO) {
+        arrfilterand.value = [
+        ]
+      }
+    }
+
+    onMounted(mounted)
+
+    return {
+      arrfilterand,
+      fieldsTable,
+    }
+  }
+})
+
+
diff --git a/src/rootgen/admin/movsList/movsList.vue b/src/rootgen/admin/movsList/movsList.vue
new file mode 100755
index 00000000..b0229fb3
--- /dev/null
+++ b/src/rootgen/admin/movsList/movsList.vue
@@ -0,0 +1,22 @@
+<template>
+  <CMyPage img="" :title="$t('otherpages.admin.movsList')" keywords="" description="Lista Movimenti">
+    <CGridTableRec
+      prop_mytable="movements"
+      prop_mytitle="Lista Movimenti"
+      :prop_mycolumns="fieldsTable.movslist()"
+      prop_colkey="_id"
+      nodataLabel="Nessun Movimento"
+      noresultLabel="Il filtro selezionato non ha trovato nessun risultato"
+      :arrfilters="arrfilterand">
+
+    </CGridTableRec>
+  </CMyPage>
+</template>
+<script lang="ts" src="./movsList.ts">
+</script>
+
+<style lang="scss" scoped>
+@import './movsList.scss';
+</style>
+
+
diff --git a/src/rootgen/admin/newsletter/newsletter.ts b/src/rootgen/admin/newsletter/newsletter.ts
index e136eb64..25246f28 100755
--- a/src/rootgen/admin/newsletter/newsletter.ts
+++ b/src/rootgen/admin/newsletter/newsletter.ts
@@ -56,7 +56,7 @@ export default defineComponent({
     const emailtextheader = ref('')
     const eseguipolling = ref(false)
 
-    const idparam = computed( () => $route.params.idparam.toString())
+    const idparam = computed( () => $route.params.idparam ? $route.params.idparam.toString() : '')
 
 
     async function mounted() {
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 7d11139a..ea630572 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -47,8 +47,9 @@ const msg_it = {
         eventlist: 'Le tue Prenotazioni',
         usereventlist: 'Prenotazioni Utenti',
         userlist: 'Lista Utenti',
-        circuitslist: 'Lista Circuiti',
-        accountslist: 'Lista Conti',
+        circuitslist: 'Circuiti',
+        accountslist: 'Conti',
+        movslist: 'Movimenti',
         iscritticonacreis: 'Iscritti Conacreis',
         zoomlist: 'Calendario Zoom',
         extralist: 'Lista Extra',
@@ -57,6 +58,7 @@ const msg_it = {
         navi: 'Navi',
         listadoni_navi: 'Lista Doni Navi',
         newsletter: 'Newsletter',
+        monete: 'Monete',
         pages: 'Pagine',
         media: 'Media',
         gallery: 'Gallerie',
@@ -792,6 +794,9 @@ const msg_it = {
       typol_code: 'Codice Tipologia',
       order: 'Ordinamento',
     },
+    ris: {
+      menu: 'Ris',
+    },
     newsletter: {
       title: 'Desideri ricevere la nostra Newsletter?',
       name: 'Il tuo Nome',
@@ -961,6 +966,7 @@ const msg_it = {
       link_grp: 'Link Territoriale',
     },
     hosps: {
+      visibile: 'Pubblica',
       typeHosp: 'Tipologia',
       numMaxPeopleHosp: 'N° max Ospiti',
       accomodation: {
@@ -1007,15 +1013,15 @@ const msg_it = {
     },
 
     movement: {
-      transactionDate: '',
-      accountFromId: '',
-      accountToId: '',
-      amount: '',
-      causal: '',
-      causal_table: '',
-      causal_IdRec: '',
-      residual: '',
-      expiringDate: '',
+      transactionDate: 'Data Transaz',
+      accountFromId: 'Dal Conto',
+      accountToId: 'Al Conto',
+      amount: 'Quantità',
+      causal: 'Causale',
+      causal_table: 'Tabella Causale',
+      causal_IdRec: 'Id Record Causale',
+      residual: 'Residuo',
+      expiringDate: 'Data Scadenza',
 
     },
 
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index ab95c26a..0f76ea0d 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -540,7 +540,7 @@ export const colmyUserGroup = [
     name: 'groupname', label_trans: 'reg.groupname', required: true,
     maxlength: 30,
     allowchar: costanti.ALLOWCHAR_CODE,
-    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage,
+    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
   }),
   AddCol({ name: 'title', label_trans: 'reg.name', required: true, noshowlabel: true, maxlength: 40 }),
   AddCol({
@@ -592,16 +592,20 @@ export const colmyUserGroup = [
     jointable: 'friendsandme',
     field_outtype: costanti.FieldType.object,
   }),
-  AddCol({ name: 'date_created', label_trans: 'reg.pub_created', fieldtype: costanti.FieldType.onlydate,
+  AddCol({
+    name: 'date_created', label_trans: 'reg.pub_created', fieldtype: costanti.FieldType.onlydate,
     required: false,
     visible: false,
     sortable: true,
-    showWhen: 0}),
-  AddCol({ name: 'date_updated', label_trans: 'reg.pub_updated', fieldtype: costanti.FieldType.onlydate,
+    showWhen: 0
+  }),
+  AddCol({
+    name: 'date_updated', label_trans: 'reg.pub_updated', fieldtype: costanti.FieldType.onlydate,
     required: false,
     visible: false,
     sortable: true,
-    showWhen: 0}),
+    showWhen: 0
+  }),
   AddCol({
     name: 'photos',
     label_trans: 'skill.photos',
@@ -729,11 +733,13 @@ export const colmyGoods = [
     //icon: 'fas fa-hands-helping',
     // isadvanced_field: true,
   }),
-  AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
+  AddCol({
+    name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
     required: false,
     visible: false,
     sortable: true,
-    showWhen: 0}),
+    showWhen: 0
+  }),
   AddCol({
     name: 'photos',
     label_trans: 'skill.photos',
@@ -911,11 +917,13 @@ export const colmySkills = [
     icon: 'grading',
     isadvanced_field: true,
   }),
-  AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
+  AddCol({
+    name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
     required: false,
     visible: false,
     sortable: true,
-    showWhen: 0}),
+    showWhen: 0
+  }),
   AddCol({
     name: 'photos',
     label_trans: 'skill.photos',
@@ -954,6 +962,11 @@ export const colmyHosp = [
     sortable: false,
   }),
 
+  AddCol({
+    name: 'visibile', label_trans: 'hosps.visibile', fieldtype: costanti.FieldType.boolean,
+    showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
+  }),
+
   AddCol({
     name: 'typeHosp',
     label_trans: 'hosps.typeHosp',
@@ -1064,11 +1077,13 @@ export const colmyHosp = [
     showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
     sortable: false,
   }),
-  AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
+  AddCol({
+    name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
     required: false,
     visible: false,
     sortable: true,
-    showWhen: 0}),
+    showWhen: 0
+  }),
   AddCol(DuplicateRec),
   AddCol(ModifRec),
   AddCol(DeleteRec),
@@ -1191,11 +1206,13 @@ export const colmyBachecas = [
     visible: false,
     sortable: false,
   }),*/
-  AddCol({ name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
+  AddCol({
+    name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
     required: false,
     visible: false,
     sortable: true,
-    showWhen: 0}),
+    showWhen: 0
+  }),
   AddCol({
     name: 'photos',
     label_trans: 'skill.photos',
@@ -1267,7 +1284,14 @@ export const colTableSites = [
   AddCol({ name: 'next_payment', label_trans: 'reg.next_payment', fieldtype: costanti.FieldType.onlydate }),
   // Configuration
   // AddCol({ name: 'confsite.notif_reg', field: 'confsite', subfield: 'notif_reg', label_trans: 'reg.notif_reg', fieldtype: costanti.FieldType.boolean }),
-  AddCol({ name: 'confsite.options', field: 'confsite', subfield: 'options', label_trans: 'reg.options', fieldtype: costanti.FieldType.binary, jointable: 'confsite_opt', }),
+  AddCol({
+    name: 'confsite.options',
+    field: 'confsite',
+    subfield: 'options',
+    label_trans: 'reg.options',
+    fieldtype: costanti.FieldType.binary,
+    jointable: 'confsite_opt',
+  }),
   AddCol(DeleteRec),
   AddCol(DuplicateRec),
 ]
@@ -2325,19 +2349,22 @@ export const colTableAccount = [
   AddCol({ name: 'deperibile', label_trans: 'account.deperibile', fieldtype: costanti.FieldType.boolean }),
   AddCol({ name: 'importo_iniziale', label_trans: 'account.importo_iniziale', fieldtype: costanti.FieldType.number }),
   AddCol({ name: 'saldo', label_trans: 'account.saldo', fieldtype: costanti.FieldType.number }),
+  AddCol(DeleteRec),
+  AddCol(DuplicateRec),
 ]
 
 export const colTableMovement = [
   AddCol({ name: 'transactionDate', label_trans: 'movement.transactionDate', fieldtype: costanti.FieldType.date }),
-  AddCol({ name: 'accountFromId', label_trans: 'movement.accountFromId', fieldtype: costanti.FieldType.number }),
-  AddCol({ name: 'accountToId', label_trans: 'movement.accountToId', fieldtype: costanti.FieldType.number }),
-  AddCol({ name: 'amount', label_trans: 'movement.amount', fieldtype: costanti.FieldType.number }),
+  AddCol({ name: 'accountFromId', label_trans: 'movement.accountFromId', fieldtype: costanti.FieldType.number, required: true }),
+  AddCol({ name: 'accountToId', label_trans: 'movement.accountToId', fieldtype: costanti.FieldType.number, required: true }),
+  AddCol({ name: 'amount', label_trans: 'movement.amount', fieldtype: costanti.FieldType.number, required: true }),
   AddCol({ name: 'causal', label_trans: 'movement.causal' }),
   AddCol({ name: 'causal_table', label_trans: 'movement.causal_table' }),
   AddCol({ name: 'causal_IdRec', label_trans: 'movement.causal_IdRec', fieldtype: costanti.FieldType.number }),
   AddCol({ name: 'residual', label_trans: 'movement.residual', fieldtype: costanti.FieldType.number }),
   AddCol({ name: 'expiringDate', label_trans: 'movement.expiringDate', fieldtype: costanti.FieldType.date }),
-
+  AddCol(DeleteRec),
+  AddCol(DuplicateRec),
 ]
 
 export const fieldsTable = {
@@ -2454,6 +2481,10 @@ export const fieldsTable = {
     return colTableAccount
   },
 
+  movslist() {
+    return colTableMovement
+  },
+
   userlist() {
     if (static_data.functionality.ENABLE_REG_AYNI) {
       return colTableUsers
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 6bda29e2..ae98d3cc 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -5252,6 +5252,7 @@ export const tools = {
 
   getdefaultnewrec_MyHosp(): any {
     return {
+      visibile: true,
       _id: 0,
       typeHosp: tools.getSelectionByTable(toolsext.TABTYPEHOSP, 2),
       idContribType: tools.getSelectionByTable('contribtypes', []),
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index 5f667714..ef7b4857 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -392,6 +392,16 @@ export const useGlobalStore = defineStore('GlobalStore', {
         static_data.routes = [...static_data.baseroutes, ...arrpagesroute, last]
       }
 
+      for (const menu of static_data.routes) {
+        if (menu.active && menu.routes2) {
+          for (const menu2 of menu.routes2) {
+            if (menu2.active && !menu2.noroute) {
+              arrpagesroute.push(menu2)
+            }
+          }
+        }
+      }
+
       // Sort array
       static_data.routes = static_data.routes.sort((a, myb) => a.order - myb.order)
 
@@ -836,6 +846,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
         filtersearch: '',
         filtersearch2: '',
         filtercustom: '',
+        filter_gte: '',
         sortBy: myobj,
         descending,
         userId: '',