From ef4751dfb2c52b29718eacc7bffb046e83321255 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Sun, 18 Jun 2023 22:29:12 +0200
Subject: [PATCH] =?UTF-8?q?la=20creazione=20dell'annuncio=20impiega=20trop?=
 =?UTF-8?q?po=20tempo=20(e=20le=20persone=20cliccavano=20su=20"Salva"=20pi?=
 =?UTF-8?q?=C3=B9=20volte)...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .env.example.production                       |  2 +-
 .env.test.risosrv                             |  2 +-
 _ALL_SITES/riso.app/.env.development          |  2 +-
 _ALL_SITES/riso.app/.env.production           |  2 +-
 .../terradellavisione.app/.env.development    |  2 +-
 .../CGridTableRec/CGridTableRec.vue           |  1 -
 .../CMyCardService/CMyCardService.vue         | 40 +++++++++++++------
 .../CNotifSettings/CNotifSettings.vue         |  2 +
 src/db/static_data.ts                         | 24 +++++++----
 src/router/routesAdmin.ts                     |  4 +-
 src/statics/lang/it.js                        |  4 +-
 src/views/user/myprofile/myprofile.vue        |  6 ++-
 13 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/.env.development b/.env.development
index b6ef94c1..a8824a9e 100755
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.6.7"
+APP_VERSION="1.0.10"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/.env.example.production b/.env.example.production
index 1d9e8a98..c0480b71 100755
--- a/.env.example.production
+++ b/.env.example.production
@@ -1,4 +1,4 @@
-APP_VERSION="0.6.7"
+APP_VERSION="1.0.10"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.test.risosrv b/.env.test.risosrv
index 84109295..ac0bf3fb 100755
--- a/.env.test.risosrv
+++ b/.env.test.risosrv
@@ -1,4 +1,4 @@
-APP_VERSION="0.6.7"
+APP_VERSION="1.0.10"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development
index b6ef94c1..a8824a9e 100755
--- a/_ALL_SITES/riso.app/.env.development
+++ b/_ALL_SITES/riso.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.6.7"
+APP_VERSION="1.0.10"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/_ALL_SITES/riso.app/.env.production b/_ALL_SITES/riso.app/.env.production
index 9a0b8aca..38234940 100644
--- a/_ALL_SITES/riso.app/.env.production
+++ b/_ALL_SITES/riso.app/.env.production
@@ -1,4 +1,4 @@
-APP_VERSION="0.6.7"
+APP_VERSION="1.0.10"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet
diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development
index 91276c6a..669937a4 100755
--- a/_ALL_SITES/terradellavisione.app/.env.development
+++ b/_ALL_SITES/terradellavisione.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="0.6.7"
+APP_VERSION="1.0.10"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index be9fed6e..b6958135 100755
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -1219,7 +1219,6 @@
           <q-btn flat round color="white" icon="close" v-close-popup></q-btn>
         </q-bar>
         <q-card-section class="inset-shadow">
-          newRecord: {{ newRecord }}
           <div
             :class="$q.screen.lt.sm ? `` : `row` + ` text-blue `"
             v-for="col in mycolumns"
diff --git a/src/components/CMyCardService/CMyCardService.vue b/src/components/CMyCardService/CMyCardService.vue
index c518583a..228163b5 100644
--- a/src/components/CMyCardService/CMyCardService.vue
+++ b/src/components/CMyCardService/CMyCardService.vue
@@ -9,7 +9,6 @@
         >
         </CGalleryImages>
 
-
         <q-card-actions align="right">
           <div v-if="table === shared_consts.TABLES_MYBACHECAS" class="">
             <q-btn
@@ -277,7 +276,13 @@
               }}</q-item-label>
             </q-item-section>
           </q-item>
-          <q-item v-if="myrec.idStatusSkill && myrec.idStatusSkill.length > 0 && JSON.stringify(myrec.idStatusSkill) !== '[1]'">
+          <q-item
+            v-if="
+              myrec.idStatusSkill &&
+              myrec.idStatusSkill.length > 0 &&
+              JSON.stringify(myrec.idStatusSkill) !== '[1]'
+            "
+          >
             <q-item-section avatar>
               <q-icon color="green" name="mood" />
             </q-item-section>
@@ -449,7 +454,11 @@
             >
             </CMyGroup>
           </q-card>
-          <q-card v-else-if="!myrec.organisedBy" class="my-card clBorderUser" bordered>
+          <q-card
+            v-else-if="!myrec.organisedBy"
+            class="my-card clBorderUser"
+            bordered
+          >
             <CMyUser
               :mycontact="myrec"
               :visu="costanti.FIND_PEOPLE"
@@ -542,11 +551,17 @@
               /></q-item-label>
             </q-item-section>
           </q-item>
-          <q-item clickable v-if="table === 'mybachecas' && calendarStore.getNumParticipants(
-                        myrec,
-                        true,
-                        tools.peopleWhere.participants
-                      ) > 0 ">
+          <q-item
+            clickable
+            v-if="
+              table === 'mybachecas' &&
+              calendarStore.getNumParticipants(
+                myrec,
+                true,
+                tools.peopleWhere.participants
+              ) > 0
+            "
+          >
             <q-item-section avatar>
               <q-icon color="blue" name="fas fa-user-check" />
             </q-item-section>
@@ -615,6 +630,9 @@
 
             <q-item-section>
               <q-item-label>
+                <span v-if="myrec.contribstr"
+                  ><br />{{ myrec.contribstr }}</span
+                >
                 <span
                   v-for="(reccontr, index) in myrec.idContribType"
                   :key="index"
@@ -627,9 +645,6 @@
                     {{ calendarStore.getContribtypeById(reccontr) }}
                   </q-chip>
                 </span>
-                <span v-if="myrec.contribstr"
-                  ><br />{{ myrec.contribstr }}</span
-                >
               </q-item-label>
             </q-item-section>
           </q-item>
@@ -886,8 +901,9 @@
       </q-toolbar>
 
       <div class="q-pa-xs">
-        <q-card class="text-white windowcol" style="display: block">
+        <q-card class="windowcol" style="display: block">
           <q-card-section class="q-pa-xs">
+            <div>{{ $t('cal.infoprenota') }}</div><br>
             <div style="display: inline-flex" class="q-px-xs centermydiv">
               <q-checkbox
                 style="color: black"
diff --git a/src/components/CNotifSettings/CNotifSettings.vue b/src/components/CNotifSettings/CNotifSettings.vue
index 743ec06f..43b93262 100755
--- a/src/components/CNotifSettings/CNotifSettings.vue
+++ b/src/components/CNotifSettings/CNotifSettings.vue
@@ -34,6 +34,8 @@
               <div v-if="rec.value === shared_consts.TypeNotifs.TYPEDIR_BACHECA">
                 <div
                   v-if="tools.isBitActive(getnotifbydir(shared_consts.TypeNotifs.TYPEDIR_BACHECA), shared_consts.UsersNotif.NEW_ADV_SECTOR)">
+                  {{$t('sectors.sector_select_details')}}
+                  <br>
                   <CMyFieldDb
                     :title="$t('sectors.sector_goods_select')"
                     table="users"
diff --git a/src/db/static_data.ts b/src/db/static_data.ts
index c32fa9ac..05acef5d 100755
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -153,8 +153,8 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       name: 'mypages.groups',
       component: () => import('@/views/user/mygroups/mygroups.vue'),
       meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
+      inmenu: false,
+      infooter: false,
     },
     {
       active: site.confpages && site.confpages.enableCircuits,
@@ -164,8 +164,8 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       name: 'mypages.circuits',
       component: () => import('@/views/user/mycircuits/mycircuits.vue'),
       meta: { requiresAuth: true },
-      inmenu: true,
-      infooter: true,
+      inmenu: false,
+      infooter: false,
     },
     {
       active: true,
@@ -188,6 +188,14 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       inmenu: false,
       infooter: false,
     },
+    {
+      active: true,
+      path: '/separator',
+      name: 'separator',
+      order: 140,
+      isseparator: true,
+      inmenu: true,
+    },
     {
       active: true,
       order: 130,
@@ -239,8 +247,8 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       materialIcon: 'fas fa-hand-holding-heart',
       name: 'pages.fundraising',
       component: () => import('@src/root/fundraising/fundraising.vue'),
-      inmenu: true,
-      infooter: true,
+      inmenu: false,
+      infooter: false,
     },
     {
       active: true,
@@ -250,8 +258,8 @@ function getDynamicPages(site: ISites): IListRoutes[] {
       name: 'ris.calendario_eventi_riso',
       component: () => import('@/root/calendarioeventi/calendarioeventi.vue'),
       extraclass: 'isCalendar',
-      inmenu: true,
-      infooter: true
+      inmenu: false,
+      infooter: false
     },
   ]
 
diff --git a/src/router/routesAdmin.ts b/src/router/routesAdmin.ts
index c9305850..b19b7369 100644
--- a/src/router/routesAdmin.ts
+++ b/src/router/routesAdmin.ts
@@ -545,7 +545,7 @@ function getRoutesAd(site: ISites) {
       inmenu: false,
       infooter: true
     },
-    {
+    /*{
       active: site.confpages && site.confpages.enableRegByBot,
       order: 1000,
       path: '/bot',
@@ -554,7 +554,7 @@ function getRoutesAd(site: ISites) {
       inmenu: site.confpages && site.confpages.enableRegByBot,
       infooter: site.confpages && site.confpages.enableRegByBot,
       separator: false
-    },
+    },*/
     {
       active: site.confpages && site.confpages.enableReg && (!site.confpages.enabledRegNeedTelegram || site.confpages.enableRegMultiChoice),
       order: 1000,
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 3350fc01..b367f3e9 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -821,6 +821,7 @@ const msg_it = {
       selnumpeopleDinnerShared: 'Cena Condivisa',
       selnumpeople_short: 'Num',
       msgbooking: 'Messaggio da inviare',
+      infoprenota: 'Per prenotare l\'Evento cliccare su "Prenoto per" e scegliere in quanti siete.',
       writemsg: 'Scrivi qui se vuoi lasciare un messaggio',
       showpdf: 'Vedi PDF',
       bookingtextdefault: 'Prenoto per',
@@ -953,7 +954,7 @@ const msg_it = {
       address: 'Indirizzo Località',
       min_partecip: 'Minimo partecipanti',
       max_partecip: 'Massimo partecipanti',
-      contribstr: 'Contributo',
+      contribstr: 'Contributo (esempio: 5€ + 5 RIS)',
       contact_phone: 'Telefono per info',
       contact_telegram: 'Username Telegram',
       },
@@ -1051,6 +1052,7 @@ const msg_it = {
       name: 'Settore',
       sector_general: 'Settori',
       sector_select: 'Scegli i Settori Preferiti',
+      sector_select_details: 'Ti arriveranno le notifiche dei nuovi annunci, solo per i Settori selezionati qui sotto (se lasci su "nessuno" arriveranno tutti).',
       sector_goods: 'Settori dei Beni',
       sector_goods_select: 'Scegli i Settori Preferiti dei Beni',
     },
diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue
index f639b97d..3c34e830 100755
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -201,7 +201,11 @@
           <div class="col-12 text-h7 text-blue text-shadow-2">
             {{ userStore.userprofile.username }}
           </div>
-          <q-btn rounded icon="fas fa-ellipsis-h">
+          <q-btn
+            v-if="userStore.userprofile.username === myusername()"
+            rounded
+            icon="fas fa-ellipsis-h"
+          >
             <q-menu>
               <q-list style="min-width: 150px">
                 <q-item