diff --git a/.env.development b/.env.development index df9e15a7..2d7d8a8d 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 1b5df05e..1b188c6c 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index c95646a7..6d7304ab 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index 3014cc42..7d5cf680 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.risosrv b/.env.test.risosrv index 0cd34da4..87cd52ca 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" 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 52f795e6..faf1397e 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" 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 bf09128d..8792803e 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.27" +APP_VERSION="1.0.28" 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 047f7d80..f42f4865 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.27" +APP_VERSION="1.0.28" 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 cc3a8b6f..b8815ee6 100755 --- a/_ALL_SITES/gruppomacro.app/.env.test +++ b/_ALL_SITES/gruppomacro.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/piuchebuono.app/.env.test b/_ALL_SITES/piuchebuono.app/.env.test index cc3a8b6f..b8815ee6 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" 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 df9e15a7..2d7d8a8d 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" 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 73198179..b1a497d2 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" 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 ac28808c..6b480719 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" 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 51687476..f581818d 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.0.27" +APP_VERSION="1.0.28" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/now.txt b/now.txt index e5f5d4ff..9bc58f3e 100644 --- a/now.txt +++ b/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU riso.app: (Sovrascrivo !) +TERMINA DI LAVORARE SU piuchebuono.app: (Sovrascrivo !) diff --git a/public/images/noi4.jpg b/public/images/noi4.jpg deleted file mode 100644 index 850651ed..00000000 Binary files a/public/images/noi4.jpg and /dev/null differ diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 4333d346..ade0698f 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -38,6 +38,11 @@ export const shared_consts = { OUT: 2, }, + AdType: { + OFFRO: 1, + CERCO: 2, + }, + TypeCashStr: [ { label: '[Nessuno]', @@ -934,6 +939,7 @@ export const shared_consts = { CmdToSend: { SHARE_MSGREG: 1, SHARE_TEXT: 2, + SHARE_ANNUNCIO: 3, }, TypeMsg: { @@ -1209,6 +1215,7 @@ export const shared_consts = { MsgTeleg: { SHARE_MSGREG: 1, SHARE_TEXT: 2, + SHARE_ANNUNCIO: 3, }, TypeMsgTemplate: { @@ -2042,4 +2049,10 @@ export const shared_consts = { return '' }, + STATUSSKILL_DI_PERSONA: 1, + STATUSSKILL_ONLINE: 2, + + TYPEHOSP_SCAMBIOCASA: 1, + TYPEHOSP_OSPITALITA: 2, + } diff --git a/src/components/CFinder/CFinder.ts b/src/components/CFinder/CFinder.ts index 4cb63e44..76a2c552 100755 --- a/src/components/CFinder/CFinder.ts +++ b/src/components/CFinder/CFinder.ts @@ -447,7 +447,7 @@ export default defineComponent({ */ { - label: 'Scambio', + label: 'Disponibile', table: 'statusSkills', key: 'idStatusSkill', value: 0, diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index f860b4e7..35413853 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -1117,6 +1117,7 @@ v-model="visupagedialog" @hide="hidewindow" :maximized="$q.screen.lt.sm" + class="dialog_annunci" >
-
- +
+ +
+ Immagine Logo +
- -
- - - -
-
- - - -
-
- - - -
-
- - - -
-
- -
-
- +
+
+ - + + + + {{ $t('reaction.condividi') }} + + + + + {{ $t('dialog.contact') }} - + >{{ $t('dialog.telegram') }} - {{ tools.getNomeUtenteByRecUser(myrec) }} @@ -129,7 +61,9 @@ v-if="!nopopup && myrec.myreact" clickable v-close-popup - @click="naviga(tools.getPathByTableAndRec(table, myrec))" + @click.stop=" + naviga(tools.getPathByTableAndRec(table, myrec)) + " > @@ -143,7 +77,7 @@ v-if="myrec" clickable v-close-popup - @click=" + @click.stop=" clicca( costanti.TIPOFAVBOOK.SEEN, false, @@ -168,7 +102,7 @@ v-if="myrec" clickable v-close-popup - @click=" + @click.stop=" clicca( costanti.TIPOFAVBOOK.FAVORITE, false, @@ -193,7 +127,7 @@ v-if="table === shared_consts.TABLES_MYBACHECAS" clickable v-close-popup - @click=" + @click.stop=" clicca( costanti.TIPOFAVBOOK.ATTEND, false, @@ -226,7 +160,7 @@ v-if="myrec" clickable v-close-popup - @click=" + @click.stop=" clicca( costanti.TIPOFAVBOOK.BOOKMARK, false, @@ -250,12 +184,115 @@ + + + + + + + + + + + +
+ + + +
- +
+ - - + +
@@ -694,62 +734,109 @@
 
+
- - - - - - +
+
+
+ + + + + + + + + +
+
+
+ +
+
0 " > - {{ + {{ tools.getNumPartecipantes(myrec) }} - - {{ + {{ myrec.numseen ? myrec.numseen : 0 }} - -   +   {{ myrec.numfav ? myrec.numfav : 0 }} - import('@/views/admin/install_site/install_site.vue'), + meta: { requiresAuth: true }, + inmenu: false, + infooter: false, + }, { active: true, order: 120, diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 08bc5fb6..c8efe7b9 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -846,6 +846,9 @@ export interface IMsgGlobParam { textaddTelegram?: string textcontent_Telegram?: string linkaddTelegram?: string + tablerec?: string + idrec?: string + idapp?: string } export interface IDataToSet { diff --git a/src/rootgen/admin/products/products.vue b/src/rootgen/admin/products/products.vue index fd7df910..90a9d5a2 100755 --- a/src/rootgen/admin/products/products.vue +++ b/src/rootgen/admin/products/products.vue @@ -1,13 +1,5 @@