Modifiche prima di Luglio...

.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.13"
+APP_VERSION="1.0.15"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

.env.example.production

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.13"
+APP_VERSION="1.0.15"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

.env.test.risosrv

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.13"
+APP_VERSION="1.0.15"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/riso.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.13"
+APP_VERSION="1.0.15"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL="newfreeplanet"

_ALL_SITES/riso.app/.env.production

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.13"
+APP_VERSION="1.0.15"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="13"
 DIRECTORY_LOCAL=newfreeplanet

_ALL_SITES/terradellavisione.app/.env.development

@@ -1,4 +1,4 @@
-APP_VERSION="1.0.13"
+APP_VERSION="1.0.15"
 SERVICE_WORKER_FILE="service-worker.js"
 APP_ID="14"
 DIRECTORY_LOCAL="newfreeplanet"

rest.http

@@ -0,0 +1,4 @@
+## Portainer:
+GET http://pi:9000
+
+

src/components/CGallery/CGallery.ts

@@ -116,7 +116,7 @@ export default defineComponent({
     function getlistimages() {
       if (gallerylist.value)
         // return gallerylist.value.slice().sort((a: any, b: any) => a.order! - b.order!)
-        return gallerylist.value
+        return gallerylist.value.filter(filename => !filename)
       else
         return null
     }

src/components/CMyCircuit/CMyCircuit.ts

@@ -116,10 +116,27 @@ export default defineComponent({
       return userStore.my.username
     }
 
+    function getRegulation(reg: string) {
+      let strreg = reg + ''
+      if (!reg) {
+        let name = ''
+        if (circuit.value!.hasOwnProperty('name')) {
+          // @ts-ignore
+          name = circuit.value!.name
+        }
+        const mystringa = t('circuit.regolamento', {nomecircuito: name})
+        return mystringa
+      } else {
+        return reg
+      }
+
+    }
+
     onMounted(mounted)
 
     return {
       circuit,
+      getRegulation,
       costanti,
       getImgCircuit,
       naviga,

src/components/CMyCircuit/CMyCircuit.vue

@@ -441,7 +441,7 @@
           <div style="font-weight: bold; font-size: 1.25rem">Regolamento:</div>
           <q-btn label="vedi Regolamento" @click="showrules = !showrules">
           </q-btn>
-          <div v-if="showrules" v-html="circuit.regulation"></div>
+          <div v-if="showrules" v-html="getRegulation(circuit.regulation)"></div>
         </q-card-section>
         <q-card-actions align="center">
           <q-btn

src/model/GlobalStore.ts

@@ -818,6 +818,7 @@ export interface IMsgGlobParam {
   typesend: number
   sendreally?: boolean
   textaddTelegram?: string
+  linkaddTelegram?: string
 }
 
 export interface IDataToSet {

src/store/Modules/tools.ts

@@ -5087,6 +5087,7 @@ export const tools = {
 
   getLinkBotTelegram(aportador_solidario: string, regexpire: string): string {
     let mylink = ''
+    const sep = '-'
     if (this.isTest() && !process.env.DEV) {
       mylink = this.getValDb('TELEG_BOT_LINK_TEST', false)
     } else {
@@ -5094,7 +5095,7 @@ export const tools = {
     }
     let add = ''
     if (aportador_solidario) {
-      add = '?start=inv#' + aportador_solidario + '#ex#' + regexpire
+      add = '?start=inv' + sep + aportador_solidario + sep + 'ex' + sep + regexpire
     }
 
     return mylink + add

src/views/admin/dbop/dbop.vue

@@ -484,6 +484,14 @@
       ></q-btn>
       <br />
     </div>
+    <div class="row">
+      <q-btn
+        label="Azzera i regolamenti dei Circuiti"
+        color="primary"
+        @click="EseguiFunz('AzzeraRegolamentiTuttiCircuiti', '', '')"
+      ></q-btn>
+      <br />
+    </div>
     <div class="row">
       <q-btn
         label="Crea Tutti i Circuiti"

src/views/user/mygroup/mygroup.vue

@@ -461,15 +461,14 @@
             </q-tab-panel>
             <q-tab-panel name="circuits">
               <q-select
+                v-if="circuitslistOpt.length > 0"
                 v-model="circuitIndex"
                 :options="circuitslistOpt"
                 emit-value
                 map-options
                 :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
               >
-                <template v-slot:prepend>
+                <template v-slot:prepend> </template>
-                  <q-icon :name="iconsel" />
-                </template>
                 <template v-slot:option="scope">
                   <q-item v-bind="scope.itemProps">
                     <q-item-section>
@@ -479,7 +478,12 @@
                 </template>
               </q-select>
 
-              <q-tabs v-model="tabcircuit" class="text-blue" no-caps>
+              <q-tabs
+                v-if="circuitslistOpt.length > 0"
+                v-model="tabcircuit"
+                class="text-blue"
+                no-caps
+              >
                 <q-tab
                   :label="t('shared.info1')"
                   name="info"
@@ -496,19 +500,19 @@
           </q-tab-panels>
 
           <div v-if="tabgrp === 'circuits' && tabcircuit === 'info'">
-          <q-tab-panels v-model="tabcircuit" animated>
+            <q-tab-panels v-model="tabcircuit" animated>
-            <q-tab-panel name="info" style="max-width: 500px">
+              <q-tab-panel name="info" style="max-width: 500px">
-              <div v-for="(circuit, ind) of circuitslist" :key="ind">
+                <div v-for="(circuit, ind) of circuitslist" :key="ind">
-                <div class="circuit_name">{{ circuit.name }}:</div>
+                  <div class="circuit_name">{{ circuit.name }}:</div>
-                <CInfoAccount
+                  <CInfoAccount
-                  :circuitname="circuit.name"
+                    :circuitname="circuit.name"
-                  :grp="mygrp"
+                    :grp="mygrp"
-                  :account="circuit.account"
+                    :account="circuit.account"
-                  :admin="tools.iAmAdminCircuit(circuit.name)"
+                    :admin="tools.iAmAdminCircuit(circuit.name)"
-                />
+                  />
-              </div>
+                </div>
-            </q-tab-panel>
+              </q-tab-panel>
-          </q-tab-panels>
+            </q-tab-panels>
           </div>
           <div v-if="tabgrp === 'circuits' && tabcircuit === 'mov'">
             <div v-if="circuitslist && circuitslist.length > 0">