diff --git a/.env.development b/.env.development index 539e8a64..c0ffffca 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 95f3df07..d19ea8b2 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.gruppomacro b/.env.prod.gruppomacro index a7b43438..4d1ce7d6 100644 --- a/.env.prod.gruppomacro +++ b/.env.prod.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index 4b2fa847..5761b851 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.prod.riso b/.env.prod.riso index e99b4b99..84b0b75b 100644 --- a/.env.prod.riso +++ b/.env.prod.riso @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.abitaregliiblei.it b/.env.test.abitaregliiblei.it index 10767021..93fc44ba 100755 --- a/.env.test.abitaregliiblei.it +++ b/.env.test.abitaregliiblei.it @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro index 6636d4fe..5748e1c4 100755 --- a/.env.test.gruppomacro +++ b/.env.test.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index c3d78cd1..a7a1fe88 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.test.risosrv b/.env.test.risosrv index c7f5dcbd..bb416cdb 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test2 b/.env.test2 index 2f8e6862..53a2050d 100755 --- a/.env.test2 +++ b/.env.test2 @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" 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 ecd2c375..454cba3e 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/abitaregliiblei.it/.env.development b/_ALL_SITES/abitaregliiblei.it/.env.development index a6157d49..80311295 100755 --- a/_ALL_SITES/abitaregliiblei.it/.env.development +++ b/_ALL_SITES/abitaregliiblei.it/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/abitaregliiblei.it/package.json b/_ALL_SITES/abitaregliiblei.it/package.json index 5bc26bee..cc3a559b 100755 --- a/_ALL_SITES/abitaregliiblei.it/package.json +++ b/_ALL_SITES/abitaregliiblei.it/package.json @@ -1,6 +1,6 @@ { "name": "abitaregliiblei", - "version": "1.1.12", + "version": "1.1.14", "description": "Abitare Gli Iblei", "productName": "AbitareGliIblei", "author": "Paolo Arena", diff --git a/_ALL_SITES/comunitanuovomondo.app/.env.development b/_ALL_SITES/comunitanuovomondo.app/.env.development index 9b058cb9..5342e936 100755 --- a/_ALL_SITES/comunitanuovomondo.app/.env.development +++ b/_ALL_SITES/comunitanuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/comunitanuovomondo.app/.env.test b/_ALL_SITES/comunitanuovomondo.app/.env.test index 18e97369..666082d1 100755 --- a/_ALL_SITES/comunitanuovomondo.app/.env.test +++ b/_ALL_SITES/comunitanuovomondo.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/comunitanuovomondo.app/package.json b/_ALL_SITES/comunitanuovomondo.app/package.json index 7553d158..546b1cb9 100755 --- a/_ALL_SITES/comunitanuovomondo.app/package.json +++ b/_ALL_SITES/comunitanuovomondo.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.1.12", + "version": "1.1.14", "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.", "productName": "Riso", "author": "Paolo Arena", diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development index e76d88c7..ef323560 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.development +++ b/_ALL_SITES/fioredellavita.riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" 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 1c26bfa2..b4a484eb 100755 --- a/_ALL_SITES/fioredellavita.riso.app/.env.test +++ b/_ALL_SITES/fioredellavita.riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/fioredellavita.riso.app/package.json b/_ALL_SITES/fioredellavita.riso.app/package.json index 83fb0794..0e51a5e0 100755 --- a/_ALL_SITES/fioredellavita.riso.app/package.json +++ b/_ALL_SITES/fioredellavita.riso.app/package.json @@ -1,6 +1,6 @@ { "name": "fioredellavita", - "version": "1.1.12", + "version": "1.1.14", "description": "Fiore Della Vita", "productName": "Fiore Della Vita", "author": "Paolo Arena", diff --git a/_ALL_SITES/gruppomacro.app/.env.development b/_ALL_SITES/gruppomacro.app/.env.development index 539e8a64..c0ffffca 100755 --- a/_ALL_SITES/gruppomacro.app/.env.development +++ b/_ALL_SITES/gruppomacro.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/gruppomacro.app/.env.test b/_ALL_SITES/gruppomacro.app/.env.test index 18e97369..5748e1c4 100755 --- a/_ALL_SITES/gruppomacro.app/.env.test +++ b/_ALL_SITES/gruppomacro.app/.env.test @@ -1,25 +1,24 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" -APP_ID="16" +APP_ID="18" DIRECTORY_LOCAL=newfreeplanet -DIRECTORY_SERVER=test.freeplanet_serverside -SERVERDIR_WEBSITE="test.piuchebuono.app" -SERVERPW_WEBSITE="pwdadmin@1AOK" -APP_URL="https://test.piuchebuono.app" +DIRECTORY_SERVER=/var/www/nodejs_test.piuchebuono_server +SERVERDIR_WEBSITE="/var/www/test.gruppomacro.app" +APP_URL="https://test.gruppomacro.app" URL_FACEBOOK="" PROVA_PAOLO="" LANG_DEFAULT="it" PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T" -MONGODB_HOST="https://test.freeplanet.app:3001" -LOGO_REG='piuchebuono-logo-full.png' +MONGODB_HOST="https://testapi.gruppomacro.app" +LOGO_REG='gruppomacro-logo-full.png' TEST_NAME="" TEST_SURNAME="" TEST_EMAIL="" TEST_USERNAME="" TEST_PASSWORD="" TEST_APORTADOR="" -PUBLICKEY_PUSH="BGXRf1TgcqocqD6J7qnRgCG7AvM2lxAoW7peb7UEzB4SxBb6DxGRdJ0UvD9ewnrB9KrSrh0-aDCODXBm7sZ1DDs" +PUBLICKEY_PUSH="BJgo8XR_upbnbMLWgCAUELo6DK7dRXffYAnFOxbaMMz5favBgcQBKT-eISqouO-jRad4Sw8l5nd2wCF6KorGiTc" IN_CONSTRUCTION="0" DEBUG="1" TELEGRAM_SUPPORT="" diff --git a/_ALL_SITES/gruppomacro.app/images/bestseller.png b/_ALL_SITES/gruppomacro.app/images/bestseller.png new file mode 100644 index 00000000..c48abeac Binary files /dev/null and b/_ALL_SITES/gruppomacro.app/images/bestseller.png differ diff --git a/_ALL_SITES/gruppomacro.app/images/novita.png b/_ALL_SITES/gruppomacro.app/images/novita.png new file mode 100644 index 00000000..0b54ec7d Binary files /dev/null and b/_ALL_SITES/gruppomacro.app/images/novita.png differ diff --git a/_ALL_SITES/gruppomacro.app/images/ombra.png b/_ALL_SITES/gruppomacro.app/images/ombra.png new file mode 100644 index 00000000..6059aeb5 Binary files /dev/null and b/_ALL_SITES/gruppomacro.app/images/ombra.png differ diff --git a/_ALL_SITES/gruppomacro.app/package.json b/_ALL_SITES/gruppomacro.app/package.json index e7366a02..b7490d33 100755 --- a/_ALL_SITES/gruppomacro.app/package.json +++ b/_ALL_SITES/gruppomacro.app/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.1.12", + "version": "1.1.14", "description": "GruppoMacro", "productName": "Gruppo Macro", "author": "Paolo Arena", @@ -57,8 +57,8 @@ "html2canvas": "^1.4.1", "html2pdf.js": "^0.10.2", "jquery": "^3.7.1", - "jsbarcode": "^3.11.6", "js-cookie": "^3.0.5", + "jsbarcode": "^3.11.6", "jspdf": "^2.5.2", "leaflet": "^1.9.4", "leaflet-routing-machine": "^3.2.12", diff --git a/_ALL_SITES/piuchebuono.app/.env.development b/_ALL_SITES/piuchebuono.app/.env.development index 0f6fa2b3..2bbb2495 100755 --- a/_ALL_SITES/piuchebuono.app/.env.development +++ b/_ALL_SITES/piuchebuono.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" 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 c3d78cd1..a7a1fe88 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/piuchebuono.app/images/sito_in_manutenzione.jpg b/_ALL_SITES/piuchebuono.app/images/sito_in_manutenzione.jpg new file mode 100644 index 00000000..d257d138 Binary files /dev/null and b/_ALL_SITES/piuchebuono.app/images/sito_in_manutenzione.jpg differ diff --git a/_ALL_SITES/piuchebuono.app/package.json b/_ALL_SITES/piuchebuono.app/package.json index bb8ff7cf..a093786a 100755 --- a/_ALL_SITES/piuchebuono.app/package.json +++ b/_ALL_SITES/piuchebuono.app/package.json @@ -1,6 +1,6 @@ { "name": "piuchebuono", - "version": "1.1.12", + "version": "1.1.14", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Paolo Arena", diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 9b058cb9..5342e936 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" 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 5e0b77bc..8bef8949 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" 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 18e97369..666082d1 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.12" +APP_VERSION="1.1.14" SERVICE_WORKER_FILE="service-worker.js" APP_ID="16" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/package.json b/_ALL_SITES/riso.app/package.json index 7553d158..546b1cb9 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.1.12", + "version": "1.1.14", "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.", "productName": "Riso", "author": "Paolo Arena", 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/package.json b/package.json index 826eccc8..b7490d33 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.1.12", + "version": "1.1.14", "description": "GruppoMacro", "productName": "Gruppo Macro", "author": "Paolo Arena", diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 4008bdf9..f25ed7c1 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -34,7 +34,7 @@ self.addEventListener('activate', (event) => { }); -const APP_VERSION = "1.1.12"; +const APP_VERSION = "1.1.14"; console.log(' [ VER-' + APP_VERSION + ' ] _---------________------ PAO: this is my custom service worker'); diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 5a42d5c1..f195318a 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -207,6 +207,7 @@ export const shared_consts = { FILTER_USER_SI_TELEGRAM_ID: 4194304, FILTER_USER_WITHOUT_USERNAME_TELEGRAM: 8388608, FILTER_USER_PROVINCE: 16777216, + FILTER_USER_SENZA_PROVINCE: 33554432, OPTIONS_SEARCH_ONLY_FULL_WORDS: 1, OPTIONS_SEARCH_USER_ONLY_FULL_WORDS: 2, diff --git a/src/components/CCatalogoCard/CCatalogoCard copy.off b/src/components/CCatalogoCard/CCatalogoCard copy.off index 9ebabbeb..19a76ed9 100755 --- a/src/components/CCatalogoCard/CCatalogoCard copy.off +++ b/src/components/CCatalogoCard/CCatalogoCard copy.off @@ -166,11 +166,11 @@ {{ myproduct.productInfo.publisher.name }}
Data Pubblicazione: - {{ tools.getstrDate(myproduct.productInfo.date_publishing) }} + {{ tools.getstrDate(myproduct.productInfo.date_pub) }}
diff --git a/src/components/CCatalogoCard/CCatalogoCard.ts b/src/components/CCatalogoCard/CCatalogoCard.ts index c5908fc9..1b804e84 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.ts +++ b/src/components/CCatalogoCard/CCatalogoCard.ts @@ -578,7 +578,7 @@ export default defineComponent({ function isProductNovita() { const monthsAgo = props.scheda.etichette?.novita?.months ?? 6; // Numero di mesi da considerare "recenti" - const publishingDate = new Date(myproduct.value!.productInfo.date_publishing!); + const publishingDate = new Date(myproduct.value!.productInfo.date_pub!); // Calcola i millisecondi corrispondenti a X mesi fa const monthsInMilliseconds = monthsAgo * 30 * 24 * 60 * 60 * 1000; // Approssimazione, non tutti i mesi hanno 30 giorni diff --git a/src/components/CCatalogoCard/CCatalogoCard.vue b/src/components/CCatalogoCard/CCatalogoCard.vue index 69deee75..8bb70daa 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.vue +++ b/src/components/CCatalogoCard/CCatalogoCard.vue @@ -623,7 +623,7 @@ table="productinfos" :id="myproduct.productInfo._id" :rec="myproduct.productInfo" - mykey="date_publishing" + mykey="date_pub" debounce="1000" :save="updateproductmodif()" :type="costanti.FieldType.date" @@ -717,7 +717,7 @@ table="productinfos" :id="myproduct.productInfo._id" :rec="myproduct.productInfo" - mykey="totaleVenduti" + mykey="totVen" debounce="1000" :save="updateproductmodif()" :type="costanti.FieldType.number" @@ -729,7 +729,7 @@ table="productinfos" :id="myproduct.productInfo._id" :rec="myproduct.productInfo" - mykey="venditeLastM" + mykey="vLastM" debounce="1000" :save="updateproductmodif()" :type="costanti.FieldType.number" @@ -741,7 +741,7 @@ table="productinfos" :id="myproduct.productInfo._id" :rec="myproduct.productInfo" - mykey="venditeLast6M" + mykey="vLast6M" debounce="1000" :save="updateproductmodif()" :type="costanti.FieldType.number" diff --git a/src/components/CExportPage/CExportPage.scss b/src/components/CExportImportPage/CExportImportPage.scss similarity index 100% rename from src/components/CExportPage/CExportPage.scss rename to src/components/CExportImportPage/CExportImportPage.scss diff --git a/src/components/CExportPage/CExportPage.ts b/src/components/CExportImportPage/CExportImportPage.ts similarity index 96% rename from src/components/CExportPage/CExportPage.ts rename to src/components/CExportImportPage/CExportImportPage.ts index ceadd0f2..25bd2600 100755 --- a/src/components/CExportPage/CExportPage.ts +++ b/src/components/CExportImportPage/CExportImportPage.ts @@ -8,12 +8,16 @@ import { PropType, defineComponent, onMounted, ref } from 'vue' import { IMyPage } from '@src/model' export default defineComponent({ - name: 'CExportPage', + name: 'CExportImportPage', props: { idPage: { type: String, required: true, }, + esporta: { + type: Boolean, + required: true, + }, nomefile: { type: String, required: true, diff --git a/src/components/CExportImportPage/CExportImportPage.vue b/src/components/CExportImportPage/CExportImportPage.vue new file mode 100755 index 00000000..85d776a0 --- /dev/null +++ b/src/components/CExportImportPage/CExportImportPage.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/src/components/CExportImportPage/index.ts b/src/components/CExportImportPage/index.ts new file mode 100755 index 00000000..a7d46276 --- /dev/null +++ b/src/components/CExportImportPage/index.ts @@ -0,0 +1 @@ +export {default as CExportImportPage} from './CExportImportPage.vue' diff --git a/src/components/CExportPage/CExportPage.vue b/src/components/CExportPage/CExportPage.vue deleted file mode 100755 index d0b157f9..00000000 --- a/src/components/CExportPage/CExportPage.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/src/components/CExportPage/index.ts b/src/components/CExportPage/index.ts deleted file mode 100755 index f611552f..00000000 --- a/src/components/CExportPage/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {default as CExportPage} from './CExportPage.vue' diff --git a/src/components/CMenuItem/CMenuItem.ts b/src/components/CMenuItem/CMenuItem.ts index 5c891e6e..ed136d24 100755 --- a/src/components/CMenuItem/CMenuItem.ts +++ b/src/components/CMenuItem/CMenuItem.ts @@ -50,11 +50,13 @@ export default defineComponent({ onMounted(mounted) + function makeClick() { + } return { tools, getmenuByPath, - + makeClick, } } }) diff --git a/src/components/CMenuItem/CMenuItem.vue b/src/components/CMenuItem/CMenuItem.vue index 73b77bca..3b06b651 100755 --- a/src/components/CMenuItem/CMenuItem.vue +++ b/src/components/CMenuItem/CMenuItem.vue @@ -1,8 +1,9 @@ diff --git a/src/components/CMyEditElem/CMyEditElem.ts b/src/components/CMyEditElem/CMyEditElem.ts index 6a939f9e..ea2351f8 100755 --- a/src/components/CMyEditElem/CMyEditElem.ts +++ b/src/components/CMyEditElem/CMyEditElem.ts @@ -49,7 +49,7 @@ export default defineComponent({ CSelectColor, CSelectFontSize, CSelectImage, CImgPoster, CSelectAnimation, CMySlider, CMySize, CBorders, CMyDimensioni, CMyText, }, - emits: ['saveElem', 'selElemClick', 'toggleSize', 'deleteElem', 'dupPage', 'expPage'], + emits: ['saveElem', 'selElemClick', 'toggleSize', 'deleteElem', 'dupPage', 'expPage', 'impPage'], props: { myelem: { type: Object as PropType, @@ -185,6 +185,9 @@ export default defineComponent({ async function exportPage() { emit('expPage', null) } + async function importPage() { + emit('impPage', null) + } async function dupElem(order?: number) { const newrec: IMyElem = tools.jsonCopy(props.myelem) @@ -1090,6 +1093,7 @@ export default defineComponent({ copyfromTemplate, modifElemAndSchede, exportPage, + importPage, } }, diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue index 91483c0a..621b7b36 100755 --- a/src/components/CMyEditElem/CMyEditElem.vue +++ b/src/components/CMyEditElem/CMyEditElem.vue @@ -57,6 +57,15 @@ @click="dupPage()" > + + @@ -177,7 +178,22 @@
- + +
+ + + + + + + + Esporta Pagina + + + + +
+
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts index d4281d5d..485520b8 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.ts +++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts @@ -468,7 +468,7 @@ export default defineComponent({ try { - console.log('mounted', 'isFieldDb()', myrow.value, 'sub', props.subfield, 'field', props.field) + // console.log('mounted', 'isFieldDb()', myrow.value, 'sub', props.subfield, 'field', props.field) if (isFieldDb() && !props.isrec) { // console.log(' . none...') } else { diff --git a/src/index.template.html b/src/index.template.html index ceaac854..20c3cb01 100755 --- a/src/index.template.html +++ b/src/index.template.html @@ -10,7 +10,7 @@ - + diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts index 4fc5d38f..4f2a15b5 100755 --- a/src/layouts/menuone/menuOne.ts +++ b/src/layouts/menuone/menuOne.ts @@ -69,10 +69,15 @@ export default defineComponent({ } */ function getroute(elem: IListRoutes) { + let link = '' if (elem.idelem) { - return tools.getUrlByTipoProj(elem.urlroute ? elem.urlroute : '') + elem.idelem + link = tools.getUrlByTipoProj(elem.urlroute ? elem.urlroute : '') + elem.idelem } - return elem.path + if (!link) + link = elem.path + + // console.log('getroute LINK=', link) + return link } function getmymenuclass(elem: IListRoutes) { diff --git a/src/model/Products.ts b/src/model/Products.ts index 902287bf..a6a506c7 100755 --- a/src/model/Products.ts +++ b/src/model/Products.ts @@ -37,18 +37,18 @@ export interface IProductInfo { collezione?: string idPublisher?: string publisher?: IPublisher - date_publishing?: Date - date_publishing_ts: number + date_pub?: Date + date_pub_ts: number pagine?: number productTypes?: number[] versioneGM?: string short_descr: string - totaleVenduti?: number, - venditeLastM?: number, - venditeLast6M?: number, - venditeLastY?: number, - venditeLast2Y?: number, + totVen?: number, + vLastM?: number, + vLast6M?: number, + vLastY?: number, + vLast2Y?: number, dataUltimoOrdine?: Date, rank3M?: number, rank6M?: number, diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts index abfdeec8..a40cf553 100755 --- a/src/rootgen/admin/importdata/importdata.ts +++ b/src/rootgen/admin/importdata/importdata.ts @@ -368,11 +368,11 @@ export default defineComponent({ return importMacroCatalogoJson(cmd, testo); } else if (cmd === shared_consts.Cmd.MACRO_DESCRELINKSITOWEB) { - console.log('TESTO PRIMA:', testo) + // console.log('TESTO PRIMA:', testo) const testoJSON = tools.convertXMLStringToJSON(testo) const testoJSONtoPrint = JSON.stringify(testoJSON, null, 2) - console.log(testoJSONtoPrint) + // console.log(testoJSONtoPrint) return importMacroCatalogoJson(cmd, testoJSONtoPrint) } diff --git a/src/rootgen/admin/usersList/usersList.ts b/src/rootgen/admin/usersList/usersList.ts index 757295c8..7a578e7c 100755 --- a/src/rootgen/admin/usersList/usersList.ts +++ b/src/rootgen/admin/usersList/usersList.ts @@ -65,7 +65,11 @@ export default defineComponent({ { label: 'Provincia', value: shared_consts.FILTER_USER_PROVINCE - } + }, + { + label: 'Senza Provincia', + value: shared_consts.FILTER_USER_SENZA_PROVINCE + }, ] } else if (tools.appid() === tools.IDAPP_FREEPLANET) { diff --git a/src/rootgen/sito_offline/sito_offline.scss b/src/rootgen/sito_offline/sito_offline.scss new file mode 100644 index 00000000..186de5dc --- /dev/null +++ b/src/rootgen/sito_offline/sito_offline.scss @@ -0,0 +1,29 @@ +.maintenance-page { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + height: 100vh; + background-color: #f8f9fa; + color: #343a40; + text-align: center; + } + + h1 { + margin-bottom: 16px; + } + + button { + margin-top: 16px; + padding: 10px 15px; + font-size: 16px; + color: white; + background-color: #007bff; + border: none; + border-radius: 5px; + cursor: pointer; + } + + button:hover { + background-color: #0056b3; + } \ No newline at end of file diff --git a/src/rootgen/sito_offline/sito_offline.ts b/src/rootgen/sito_offline/sito_offline.ts index 134accad..80070771 100755 --- a/src/rootgen/sito_offline/sito_offline.ts +++ b/src/rootgen/sito_offline/sito_offline.ts @@ -1,8 +1,25 @@ -import { defineComponent } from 'vue' +import { computed, defineComponent, onMounted, ref } from 'vue' + +import { tools } from '@store/Modules/tools' +import { useRouter } from 'vue-router'; export default defineComponent({ name: 'sito_offline', setup() { - return {} + + const $router = useRouter() + + onMounted(() => { + }); + + const checkStatus = () => { + // Logica per controllare lo stato del servizio (opzionale) + $router.replace('/') + }; + + return { + checkStatus, + tools, + }; }, }) diff --git a/src/rootgen/sito_offline/sito_offline.vue b/src/rootgen/sito_offline/sito_offline.vue index 44125b97..e4106c70 100755 --- a/src/rootgen/sito_offline/sito_offline.vue +++ b/src/rootgen/sito_offline/sito_offline.vue @@ -1,7 +1,19 @@ + + diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 19b69e82..fde7d68f 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -1929,7 +1929,7 @@ const msg_it = { descrizione_completa_macro: '{descrizione_completa_macro}', descrizione_breve_macro: '{descrizione_breve_macro}', link_macro: '{link_macro}', - totaleVenduti: 'Totale Venduti', + totVen: 'Totale Venduti', } diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 7adccb51..86e2400e 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -1368,7 +1368,7 @@ export const colAttivita = [ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView, }), AddCol({ - name: 'date_publishing', label_trans: 'products.date_publishing', + name: 'date_pub', label_trans: 'products.date_pub', fieldtype: costanti.FieldType.onlydate, foredit: false, noshowlabel: true, @@ -2338,7 +2338,7 @@ export const colTableProductInfos = [ AddCol({ name: 'valori_nutrizionali', label_trans: 'products.valori_nutrizionali', fieldtype: costanti.FieldType.html }), AddCol({ name: 'author', label_trans: 'products.author', fieldtype: costanti.FieldType.string }), AddCol({ name: 'collezione', label_trans: 'products.collezione', fieldtype: costanti.FieldType.string }), - AddCol({ name: 'date_publishing', label_trans: 'products.date_publishing', fieldtype: costanti.FieldType.onlydate }), + AddCol({ name: 'date_pub', label_trans: 'products.date_pub', fieldtype: costanti.FieldType.onlydate }), AddCol({ name: 'publisher', label_trans: 'products.publisher', fieldtype: costanti.FieldType.string }), AddCol({ name: 'pagine', label_trans: 'products.pagine', fieldtype: costanti.FieldType.number }), AddCol({ name: 'note', label_trans: 'products.note', fieldtype: costanti.FieldType.html }), diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index e74c6bd6..6b073d28 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -115,6 +115,7 @@ export const tools = { IDAPP_CNM: '10', IDAPP_FREEPLANET: '1', IDAPP_RISO: '13', + IDAPP_PCB: '17', IDAPP_MACRO: '18', TipoMsg: { @@ -8035,7 +8036,7 @@ export const tools = { } catch (e) { console.error('err getDirectoryGall', e) } - console.log('getDirectoryGall', ris, 'mypath', path, 'myrow', myrow) + // console.log('getDirectoryGall', ris, 'mypath', path, 'myrow', myrow) return ris }, diff --git a/src/store/Products.ts b/src/store/Products.ts index aff1c66a..293be39d 100755 --- a/src/store/Products.ts +++ b/src/store/Products.ts @@ -1278,10 +1278,10 @@ export const useProducts = defineStore('Products', { const maxDescriptionLength = testo.maxlength ?? 100; const description = myproduct.productInfo.short_descr || ''; const long_descr = myproduct.productInfo.description || ''; - const date_pub = tools.getstrDateShort(myproduct.productInfo.date_publishing) || ''; + const date_pub = tools.getstrDateShort(myproduct.productInfo.date_pub) || ''; const ranking_globale = myproduct.productInfo.rank1Y! || 0; const ranking = myproduct.indiceRanking! || 0; - const venduti = myproduct.productInfo.totaleVenduti! || 0; + const venduti = myproduct.productInfo.totVen! || 0; const linkvenduti = ''+venduti+'' const debugstr = " Rank=" + ranking + "
1Y=" + (myproduct.productInfo.rank1Y! || '') + '
Venduti=' + linkvenduti + '
Data Pubb=' + date_pub diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index c3218e7c..cf71552c 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -638,8 +638,8 @@ export const useGlobalStore = defineStore('GlobalStore', { materialIcon: 'home', name: 'otherpages.sito_offline', component: () => import('@src/rootgen/sito_offline/sito_offline.vue'), - inmenu: true, - infooter: true, + inmenu: false, + infooter: false, } // console.log('Sito Online? ', toolsext.sito_online(false)) @@ -647,7 +647,7 @@ export const useGlobalStore = defineStore('GlobalStore', { if (!toolsext.sito_online(false)) { static_data.routes = [sito_offline, last] } else { - static_data.routes = [...baseroutes, ...ecommRoutes, ...adminRoutes, ...arrpagesroute, ...AIRoutes, last] + static_data.routes = [sito_offline, ...baseroutes, ...ecommRoutes, ...adminRoutes, ...arrpagesroute, ...AIRoutes, last] } /*for (const menu of static_data.routes) { diff --git a/src/views/ecommerce/catalogo/catalogo.ts b/src/views/ecommerce/catalogo/catalogo.ts index c80592b0..cf8d8286 100755 --- a/src/views/ecommerce/catalogo/catalogo.ts +++ b/src/views/ecommerce/catalogo/catalogo.ts @@ -426,12 +426,12 @@ export default defineComponent({ if (sort === costanti.SORT_PUBDATE) { arrprod = arrprod.sort((a: IProduct, b: IProduct) => { - return b.productInfo.date_publishing_ts - a.productInfo.date_publishing_ts + return b.productInfo.date_pub_ts - a.productInfo.date_pub_ts }) } else if (sort === costanti.SORT_BESTSELLER) { arrprod = arrprod.sort((a: IProduct, b: IProduct) => { - return b.productInfo.rank1Y! - a.productInfo.rank1Y! + return b.productInfo.rank3M! - a.productInfo.rank3M! }) arrprod = arrprod.map((product, index) => {