From 3fb8755287815f346032fe56225e9a0a769293ef Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Thu, 25 Apr 2024 12:16:55 +0200 Subject: [PATCH] compare il msg che per uscire dal circuito occorre comprare o vendere RIS. --- .env.development | 2 +- .env.example.production | 2 +- .env.prod.pcb | 2 +- .env.test.pcb | 2 +- .env.test.risosrv | 2 +- .env.test_riso.pcb | 2 +- .../fioredellavita.riso.app/.env.development | 2 +- _ALL_SITES/fioredellavita.riso.app/.env.test | 2 +- _ALL_SITES/gruppomacro.app/.env.test | 2 +- _ALL_SITES/piuchebuono.app/.env.development | 2 +- _ALL_SITES/piuchebuono.app/.env.test | 2 +- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.production | 2 +- _ALL_SITES/riso.app/.env.test | 2 +- .../terradellavisione.app/.env.development | 2 +- deploy_on_production.sh | 2 +- send_pwa_to_production.sh | 2 +- src/components/CMyCircuit/CMyCircuit.vue | 15 +- src/statics/lang/it.js | 1 + src/views/user/mycircuit/mycircuit.vue | 368 +++++++----------- 20 files changed, 156 insertions(+), 262 deletions(-) diff --git a/.env.development b/.env.development index 4deb8a45..d48d2a97 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 11172a75..cb4ac2c1 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index b06815a0..edef847c 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index 48801a1b..9ba30d5a 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index c3ed9a4e..9a009297 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test_riso.pcb b/.env.test_riso.pcb index 89056c43..68a2b829 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development index c00dd676..7efd54a3 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.development +++ b/_ALL_SITES/fioredellavita.riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.test b/_ALL_SITES/fioredellavita.riso.app/.env.test index 7016ca7a..992481f5 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.test +++ b/_ALL_SITES/fioredellavita.riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/gruppomacro.app/.env.test b/_ALL_SITES/gruppomacro.app/.env.test index 3dab4da5..14a45e72 100755 --- a/_ALL_SITES/gruppomacro.app/.env.test +++ b/_ALL_SITES/gruppomacro.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/piuchebuono.app/.env.development b/_ALL_SITES/piuchebuono.app/.env.development index 65707c8c..4d295e2b 100755 --- a/_ALL_SITES/piuchebuono.app/.env.development +++ b/_ALL_SITES/piuchebuono.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/piuchebuono.app/.env.test b/_ALL_SITES/piuchebuono.app/.env.test index 3dab4da5..14a45e72 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" 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 4deb8a45..d48d2a97 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" 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 42b269be..4105adc8 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" 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 b0d03de0..c7a77477 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index eaffa96a..5651edb6 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.35" +APP_VERSION="1.0.36" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/deploy_on_production.sh b/deploy_on_production.sh index 4f8e9d0d..959bac93 100755 --- a/deploy_on_production.sh +++ b/deploy_on_production.sh @@ -19,7 +19,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto..." echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -a --exclude 'upload' dist/pwa/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/send_pwa_to_production.sh b/send_pwa_to_production.sh index b640b48a..4007b6ee 100755 --- a/send_pwa_to_production.sh +++ b/send_pwa_to_production.sh @@ -9,6 +9,6 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..." - sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -avv --exclude 'upload' dist/pwa/ ftpadmin@servereng:/var/www/$SERVERDIR_WEBSITE/ + sshpass -p $SERVERPW_WEBSITE rsync -e 'ssh -p 8855' -avv --exclude 'upload' dist/pwa/ suryapaolo@servereng:/var/www/$SERVERDIR_WEBSITE/ echo "Finito $SERVERDIR_WEBSITE " fi diff --git a/src/components/CMyCircuit/CMyCircuit.vue b/src/components/CMyCircuit/CMyCircuit.vue index 368d5ba9..6fc4c543 100755 --- a/src/components/CMyCircuit/CMyCircuit.vue +++ b/src/components/CMyCircuit/CMyCircuit.vue @@ -1,5 +1,5 @@ - {{ - $t('db.insertgoodorservices_to_enter_circuit') - }}
+ + {{ + $t('db.insertgoodorservices_to_enter_circuit') + }} + +
- {{ - $t('db.insertgoodorservices_to_enter_circuit') - }}
+ + {{ + $t('db.insertgoodorservices_to_enter_circuit') + }} + +
@@ -448,8 +394,8 @@ color="primary" :label="$t('circuit.ask')" @click=" - requestToEnterCircuit = true; - groupnameSel = null; + requestToEnterCircuit = true; +groupnameSel = null; " /> @@ -469,17 +415,9 @@
-
+
- + - Chiedi di Entrare nei Circuiti: - + Chiedi di Entrare nei Circuiti: + - + > @@ -636,7 +569,7 @@ v-if="!loading" ref="tabGroups" prop_mytable="mygroups" - prop_mytitle="" + prop_mytitle :prop_mycolumns=" showsaldi ? colmyUserPeopleSaldi : colmyUserPeople " @@ -660,24 +593,23 @@ :showType="costanti.SHOW_GROUPINFO" :showCol="false" :circuitname="circuit.name" - extraparams="" + extraparams :visufind=" tools.iAmAdminCircuit(circuit.name) ? costanti.REQ_ADD_USER_TO_CIRCUIT : costanti.FIND_GROUP " - > - + > {{ $t('circuit.richieste_title') }} - + > - + > @@ -752,10 +682,7 @@
- +
@@ -777,11 +704,7 @@ }) }}:
- + - + >
@@ -808,12 +730,7 @@ }}
- - +
@@ -825,8 +742,7 @@ `background-color: ` + tools.getColorByCircuit(circuit) " - >{{ tools.getSymbolByCircuit(circuit) }} + >{{ tools.getSymbolByCircuit(circuit) }}
@@ -839,8 +755,7 @@ icon="fas fa-battery-quarter" :label="t('circuit.fido_scoperto_default')" :tips="t('circuit.fido_scoperto_default_tips')" - > - + >
- + >
+ -->
- {{ t('circuit.stats') }}:
+ {{ t('circuit.stats') }}: +
@@ -894,8 +809,7 @@ icon="fas fa-battery-quarter" :label="t('circuit.totTransato')" :tips="t('circuit.totTransato_tips')" - > - + >
- + >
{{ t('circuit.transactionsEnabled') }}: - {{ + + {{ circuit.transactionsEnabled ? t('dialog.yes') : t('dialog.no') }} {{ - }} + }} +
+ --> @@ -952,11 +866,7 @@
- - +
- {{ - $t('shared.lastmodify', { - date: tools.getstrDateYY(circuit.date_updated), - }) - }} + + {{ + $t('shared.lastmodify', { + date: tools.getstrDateYY(circuit.date_updated), + }) + }} +

@@ -1002,10 +914,7 @@ - + - + > - + > @@ -1097,9 +1004,7 @@
{{ t('circuit.contocomunitario') }}:
-
- {{ $t('circuit.info_contocom') }} -
+
{{ $t('circuit.info_contocom') }}
 @@ -1120,14 +1025,13 @@ :qtarem=" circuit.account ? circuitStore.getRemainingCoinsToSend( - circuit.account - ) + circuit.account + ) : 0 " - > - + > -
+
- + >
@@ -1147,7 +1050,7 @@ - + > -
- +
+
-
- {{ path }} -
+
{{ path }}
@@ -1222,6 +1114,6 @@