diff --git a/.env.development b/.env.development index d1a06f17..55ca42db 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index ba9401b2..64d19e5a 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.gruppomacro b/.env.prod.gruppomacro index 3dfb7e38..bd7281da 100644 --- a/.env.prod.gruppomacro +++ b/.env.prod.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.prod.pcb b/.env.prod.pcb index 3bc2e151..85cd3bed 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.prod.riso b/.env.prod.riso index b1903c2c..1e3c8736 100644 --- a/.env.prod.riso +++ b/.env.prod.riso @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.production b/.env.production index 3dfb7e38..bd7281da 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.abitaregliiblei.it b/.env.test.abitaregliiblei.it index fb4efc52..5509b778 100755 --- a/.env.test.abitaregliiblei.it +++ b/.env.test.abitaregliiblei.it @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro index 9a82e563..0c5a510a 100755 --- a/.env.test.gruppomacro +++ b/.env.test.gruppomacro @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test.pcb b/.env.test.pcb index 22571328..5ca569ad 100755 --- a/.env.test.pcb +++ b/.env.test.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.test.risosrv b/.env.test.risosrv index fd49801e..7f7423e5 100755 --- a/.env.test.risosrv +++ b/.env.test.risosrv @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/.env.test2 b/.env.test2 index 410dc349..d69cf1e4 100755 --- a/.env.test2 +++ b/.env.test2 @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 a9050740..4be3f3fc 100755 --- a/.env.test_riso.pcb +++ b/.env.test_riso.pcb @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 605f1705..24434793 100755 --- a/_ALL_SITES/abitaregliiblei.it/.env.development +++ b/_ALL_SITES/abitaregliiblei.it/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="19" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/abitaregliiblei.it/.env.production b/_ALL_SITES/abitaregliiblei.it/.env.production index a94af3ba..f7af0477 100644 --- a/_ALL_SITES/abitaregliiblei.it/.env.production +++ b/_ALL_SITES/abitaregliiblei.it/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 b430e383..52bd43be 100755 --- a/_ALL_SITES/abitaregliiblei.it/package.json +++ b/_ALL_SITES/abitaregliiblei.it/package.json @@ -1,6 +1,6 @@ { "name": "abitaregliiblei", - "version": "1.1.21", + "version": "1.1.22", "description": "Abitare Gli Iblei", "productName": "AbitareGliIblei", "author": "Surya", diff --git a/_ALL_SITES/comunitanuovomondo.app/.env.development b/_ALL_SITES/comunitanuovomondo.app/.env.development index 33642acc..9e8602bc 100755 --- a/_ALL_SITES/comunitanuovomondo.app/.env.development +++ b/_ALL_SITES/comunitanuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/comunitanuovomondo.app/.env.production b/_ALL_SITES/comunitanuovomondo.app/.env.production index 4660546a..ede6a6fc 100644 --- a/_ALL_SITES/comunitanuovomondo.app/.env.production +++ b/_ALL_SITES/comunitanuovomondo.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 e020bb5b..0d757096 100755 --- a/_ALL_SITES/comunitanuovomondo.app/.env.test +++ b/_ALL_SITES/comunitanuovomondo.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 ceed5e58..1b3f9ab1 100755 --- a/_ALL_SITES/comunitanuovomondo.app/package.json +++ b/_ALL_SITES/comunitanuovomondo.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.1.21", + "version": "1.1.22", "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": "Surya", diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development index 82b6ef13..9157a1ba 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.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="15" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.production b/_ALL_SITES/fioredellavita.riso.app/.env.production index 1869a7a2..fcafbce2 100644 --- a/_ALL_SITES/fioredellavita.riso.app/.env.production +++ b/_ALL_SITES/fioredellavita.riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 80ba0219..ae652508 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.21" +APP_VERSION="1.1.22" 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 0c4dd620..d623fe19 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.21", + "version": "1.1.22", "description": "Fiore Della Vita", "productName": "Fiore Della Vita", "author": "Surya", diff --git a/_ALL_SITES/gruppomacro.app/.env.development b/_ALL_SITES/gruppomacro.app/.env.development index d1a06f17..55ca42db 100755 --- a/_ALL_SITES/gruppomacro.app/.env.development +++ b/_ALL_SITES/gruppomacro.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 9a82e563..0c5a510a 100755 --- a/_ALL_SITES/gruppomacro.app/.env.test +++ b/_ALL_SITES/gruppomacro.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="18" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/gruppomacro.app/package.json b/_ALL_SITES/gruppomacro.app/package.json index feb7adb8..f22191c6 100755 --- a/_ALL_SITES/gruppomacro.app/package.json +++ b/_ALL_SITES/gruppomacro.app/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.1.21", + "version": "1.1.22", "description": "GruppoMacro", "productName": "Gruppo Macro", "author": "Surya", diff --git a/_ALL_SITES/piuchebuono.app/.env.development b/_ALL_SITES/piuchebuono.app/.env.development index ec54eae6..46e21617 100755 --- a/_ALL_SITES/piuchebuono.app/.env.development +++ b/_ALL_SITES/piuchebuono.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 22571328..5ca569ad 100755 --- a/_ALL_SITES/piuchebuono.app/.env.test +++ b/_ALL_SITES/piuchebuono.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" SERVICE_WORKER_FILE="service-worker.js" APP_ID="17" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/piuchebuono.app/package.json b/_ALL_SITES/piuchebuono.app/package.json index bf7b6bbf..7ee4ed75 100755 --- a/_ALL_SITES/piuchebuono.app/package.json +++ b/_ALL_SITES/piuchebuono.app/package.json @@ -1,6 +1,6 @@ { "name": "piuchebuono", - "version": "1.1.21", + "version": "1.1.22", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Surya", diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 33642acc..9e8602bc 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 4660546a..ede6a6fc 100644 --- a/_ALL_SITES/riso.app/.env.production +++ b/_ALL_SITES/riso.app/.env.production @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 e020bb5b..0d757096 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="1.1.21" +APP_VERSION="1.1.22" 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 ceed5e58..1b3f9ab1 100755 --- a/_ALL_SITES/riso.app/package.json +++ b/_ALL_SITES/riso.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.1.21", + "version": "1.1.22", "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": "Surya", diff --git a/package.json b/package.json index 862d9ab0..75730d4d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.1.21", + "version": "1.1.22", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index 21d9af4c..9dab6dda 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.21"; +const APP_VERSION = "1.1.22"; console.log(' [ VER-' + APP_VERSION + ' ] _---------________------ PAO: this is my custom service worker'); diff --git a/src/components/CBarSelection/CBarSelection.ts b/src/components/CBarSelection/CBarSelection.ts index 9418ce3b..0f257d8c 100755 --- a/src/components/CBarSelection/CBarSelection.ts +++ b/src/components/CBarSelection/CBarSelection.ts @@ -215,7 +215,7 @@ export default defineComponent({ item.value = valsaved else { if (arrvalues) { - item.value = costanti.FILTER_TUTTI + item.value = costanti.FILTER_TUTTI_STR } } } else if (item.table === shared_consts.TAB_CITIES) { diff --git a/src/components/CCatalogList/CCatalogList.ts b/src/components/CCatalogList/CCatalogList.ts index c40eac13..f5004722 100755 --- a/src/components/CCatalogList/CCatalogList.ts +++ b/src/components/CCatalogList/CCatalogList.ts @@ -74,8 +74,6 @@ export default defineComponent({ const table = ref('catalogs') - const searchList_Base = ref([]) - const arrfilterand: any = ref([]) const filtercustom: any = ref([]) @@ -94,6 +92,10 @@ export default defineComponent({ const myCatRef = ref(null) + const searchList_Cataloghi = ref( + tools.getsearchList_Cataloghi() + ) + /* const idSectorServizi = computed(() => { let myval: any = null @@ -124,10 +126,6 @@ export default defineComponent({ return { sortBy: 'title', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 } }) - const searchList = computed(() => { - return searchList_Base.value - }) - const showType = computed(() => { return costanti.SHOW_MYCARD }) @@ -155,8 +153,6 @@ export default defineComponent({ col_footer.value = obj.col_footer col_tabfooter.value = obj.col_tabfooter - searchList_Base.value = [] - filtercustom.value = [] col.value = fieldsTable.getArrColsByTable(table.value) @@ -194,7 +190,6 @@ export default defineComponent({ costanti, arrfilterand, filtercustom, - searchList, search, doSearch, myrecfiltertoggle, @@ -214,6 +209,7 @@ export default defineComponent({ clickButtBar, myCatRef, table, + searchList_Cataloghi, } }, }) diff --git a/src/components/CCatalogList/CCatalogList.vue b/src/components/CCatalogList/CCatalogList.vue index e205398f..c336cd5b 100755 --- a/src/components/CCatalogList/CCatalogList.vue +++ b/src/components/CCatalogList/CCatalogList.vue @@ -25,7 +25,7 @@ :noresultLabel="t('grid.nosearchfound')" :arrfilters="arrfilterand" :filtercustom="filtercustom" - :prop_searchList="searchList" + :prop_searchList="searchList_Cataloghi" :defaultnewrec="tools.getdefaultnewrec(table)" labelBtnAddRow="NONE" :prop_SortFieldsAvailable="mySortFieldsAvailable()" diff --git a/src/components/CCatalogoCard/CCatalogoCard.vue b/src/components/CCatalogoCard/CCatalogoCard.vue index f4c4bc06..3d77321a 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.vue +++ b/src/components/CCatalogoCard/CCatalogoCard.vue @@ -650,6 +650,10 @@ > +
+
Argomenti:
+ {{ products.getCatProdsStrByCatProds(myproduct.productInfo.idCatProds) }} +
diff --git a/src/components/CGridOriz/CGridOriz.ts b/src/components/CGridOriz/CGridOriz.ts index 3d013055..0d9d9b46 100755 --- a/src/components/CGridOriz/CGridOriz.ts +++ b/src/components/CGridOriz/CGridOriz.ts @@ -170,6 +170,8 @@ export default defineComponent({ return { sortBy: 'transactionDate', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 20 } else if (props.table === shared_consts.TABLES_CIRCUITS) return { sortBy: 'numMembers', descending: true, page: 1, rowsNumber: 0, rowsPerPage: 20 } + else if (props.table === shared_consts.TABLES_CATALOG) + return { sortBy: 'title', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 25 } else if (props.table === toolsext.TABUSER) return userStore.getMypaginationMembers() else if (shared_consts.TABLES_ORDER_DATE_UPDATED.includes(props.table)) @@ -198,7 +200,7 @@ export default defineComponent({ else if (props.table === shared_consts.TABLES_CATALOG) return searchList_Cataloghi.value - return searchList_Cataloghi.value + return [] }) const showType = computed(() => { @@ -642,24 +644,8 @@ export default defineComponent({ ] - searchList_Cataloghi.value = [ - { - visible: true, - label: 'Regione', - table: 'regions', - key: 'idReg', - type: costanti.FieldType.select, - value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + props.table + costanti.FILTER_SEP + 'regions', costanti.FILTER_TUTTI), - keycookie: '_hosp', - addall: true, - arrvalue: [], - filter: null, - useinput: false, - icon: 'fas fa-globe-europe' - }, - - ] - + searchList_Cataloghi.value = tools.getsearchList_Cataloghi() + searchList_Hosp.value = [ { visible: true, diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index 2eed4fd4..1d87fab1 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -1042,6 +1042,14 @@ export default defineComponent({ objitem[item.key] = item.value filter_gte.push(objitem) + + } else if (item.table === 'lista_editori') { + + if (item.value !== costanti.FILTER_TUTTI) { + objitem[item.key] = item.value + filtersearch.push(objitem) + } + } else if (item.value > 0) { objitem[item.key] = item.value filtersearch.push(objitem) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index 4884b3f2..87f15a85 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -141,7 +141,7 @@ :icon_alternative="item.icon" :optval="fieldsTable.getKeyByTable(item.table)" :optlab="fieldsTable.getLabelByTable(item.table)" - :options="valoriopt(item, false, false)" + :options="valoriopt(item, item.addall, item.addnone)" :filter="item && item.filter ? item.filter : ''" :filter_extra="item.filter_extra" :useinput=" @@ -811,7 +811,7 @@ :icon_alternative="item.icon" :optval="fieldsTable.getKeyByTable(item.table)" :optlab="fieldsTable.getLabelByTable(item.table)" - :options="valoriopt(item, false)" + :options="valoriopt(item, item.addall, item.addnone)" :filter="item.filter" :filter_extra="item.filter_extra" :useinput=" diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue index 5e289f6e..17d0c9ea 100755 --- a/src/components/CMyEditElem/CMyEditElem.vue +++ b/src/components/CMyEditElem/CMyEditElem.vue @@ -228,6 +228,27 @@ addstr="px" @update:model-value="modifElem" > + + + +
diff --git a/src/components/CMyElem/CMyElem.ts b/src/components/CMyElem/CMyElem.ts index bcabd5e4..a505149c 100755 --- a/src/components/CMyElem/CMyElem.ts +++ b/src/components/CMyElem/CMyElem.ts @@ -56,6 +56,8 @@ import { useI18n } from '@/boot/i18n' import { useRouter } from 'vue-router' import { LatLng } from 'leaflet' +import { costanti } from '@costanti' + export default defineComponent({ name: 'CMyElem', @@ -123,6 +125,8 @@ export default defineComponent({ const enableAdd = ref(true) const visushare = ref(false) + const tabcatalogo = ref('griglia') + const social = ref({}) const neworder = ref(0) @@ -294,6 +298,10 @@ export default defineComponent({ myel.value.catalogo = updatedCatalogo } + function naviga(path: string) { + $router.push(path) + } + onMounted(mounted) return { @@ -336,6 +344,9 @@ export default defineComponent({ currentCardsPerSlide, animarecard, updateCatalogoEmit, + tabcatalogo, + costanti, + naviga, } }, diff --git a/src/components/CMyElem/CMyElem.vue b/src/components/CMyElem/CMyElem.vue index 3a522acb..2e14783e 100755 --- a/src/components/CMyElem/CMyElem.vue +++ b/src/components/CMyElem/CMyElem.vue @@ -10,7 +10,13 @@ " >
- +
-
Lista Cataloghi
- +
Cataloghi
+ + + + + + + + + + + + + +
+ +
+ +
CStatusReg
diff --git a/src/components/CMyRecCatalog/CMyRecCatalog.ts b/src/components/CMyRecCatalog/CMyRecCatalog.ts index a2e1cbd9..1c229d49 100755 --- a/src/components/CMyRecCatalog/CMyRecCatalog.ts +++ b/src/components/CMyRecCatalog/CMyRecCatalog.ts @@ -63,6 +63,7 @@ export default defineComponent({ const apriInfo = ref(false) const collanestr = ref('') const argomentistr = ref('') + const numprodtot = ref(0) const editorestr = ref('') const products = useProducts() @@ -86,7 +87,7 @@ export default defineComponent({ } return linkpage - + }) watch(() => props.prop_myrec, (newval, oldval) => { @@ -109,12 +110,16 @@ export default defineComponent({ } argomentistr.value = '' if (myrec.value.argomenti) { + numprodtot.value = 0 for (const arg of myrec.value.argomenti!) { const recargomento: ICatProd = products.catprods!.find((catprod: ICatProd) => catprod._id === arg) if (recargomento) argomentistr.value += recargomento.name + ' ' + numprodtot.value += products.getTotaliProdottiByIdCatProd(arg) } } + + editorestr.value = '' if (myrec.value.editore) { for (const receditore of myrec.value.editore!) { @@ -122,7 +127,7 @@ export default defineComponent({ editorestr.value += rectrovato!.name + ' ' } } - + statecolor.value = 'negative' if (myrec.value.descr_introduttiva && myrec.value.img_bordata?.imagefile && myrec.value.img_intro?.imagefile) { @@ -149,7 +154,7 @@ export default defineComponent({ $router.push(path) } - + function setCmd($q: any, cmd: number, myusername: string, value: any, groupname: string) { emit('setCmd', $q, cmd, myusername, value, groupname) @@ -208,6 +213,7 @@ export default defineComponent({ pagina_collegata, esiste_descrintro, argomentistr, + numprodtot, } }, }) diff --git a/src/components/CMyRecCatalog/CMyRecCatalog.vue b/src/components/CMyRecCatalog/CMyRecCatalog.vue index 5858f854..31f68638 100755 --- a/src/components/CMyRecCatalog/CMyRecCatalog.vue +++ b/src/components/CMyRecCatalog/CMyRecCatalog.vue @@ -65,7 +65,7 @@
{{$t('cataloglist.argomenti')}}: - {{ argomentistr }} + {{ argomentistr + ` (${numprodtot})` }}
{{$t('cataloglist.referenti')}}: @@ -86,7 +86,7 @@ :style=" `color: ` + (myrec.img_bordata?.imagefile ? 'green' : 'red') " - >{{ esiste_descrintro ? 'Presente' : 'Mancante' }}{{ myrec.img_bordata?.imagefile ? 'Presente' : 'Mancante' }}
Copertina: {{ esiste_descrintro ? 'Presente' : 'Mancante' }}{{ myrec.img_intro?.imagefile ? 'Presente' : 'Mancante' }}
@@ -112,7 +112,7 @@ - +
- +
- + diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 7dbbbd2b..b2505a4f 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -154,6 +154,8 @@ export interface IMyElem { heightimg?: string heightcarousel?: string widthimg?: string + widthcard?: string + heightcard?: string link?: string onlyif_logged?: boolean active?: boolean diff --git a/src/model/Products.ts b/src/model/Products.ts index 70b20722..1a3dc005 100755 --- a/src/model/Products.ts +++ b/src/model/Products.ts @@ -178,6 +178,7 @@ export interface IProductsState { cart: ICart orders: IOrderCart[] catprods: ICatProd[] + catprtotali?: ICatPrTotali[] collane?: ICollana[] catprods_gas: ICatProd[] subcatprods: ISubCatProd[] @@ -222,6 +223,12 @@ export interface ICatProd { color?: string, } +export interface ICatPrTotali { + _id: string, + name: string, + quanti: number, +} + export interface ICollana { _id?: any idCollana: number, diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index 2cc60097..a24a1a75 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -1694,6 +1694,8 @@ const msg_it = { height: 'height', heightimg: 'heightimg', widthimg: 'widthimg', + widthcard: 'widthcard', + heightcard: 'heightcard', link: 'link', width: 'width', onlyif_logged: 'onlyif_logged', @@ -2010,6 +2012,7 @@ const msg_it = { totVen: 'Totale Venduti', totFat: 'Totale Fatturati', contenuto: 'Contenuto', + argomenti: 'Argomenti', }, iimg: { @@ -2017,7 +2020,7 @@ const msg_it = { }, cataloglist: { - foto_collana: 'Foto Collana', + foto_collana: 'Foto Catalogo', referenti: 'Editori', img_bordata: 'Immagine di sfondo', img_intro: 'Copertina introduttiva', @@ -2035,6 +2038,7 @@ const msg_it = { pdf_generato_stampa: 'Pdf generato (per STAMPA)', pdf_online_stampa: 'Pdf online Ufficiale (per STAMPA)', argomenti: 'Argomenti', + numprodtot: 'Numero Prodotti', }, scheda: { diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index b01d8402..4b672ed6 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -409,8 +409,11 @@ export const costanti = { TABLES_ARRAY: ['circuits'], TABLES_USERNAME_DATE: ['friends', 'friendsandme'], TABLES_IMG_USERNAME: ['friends', 'friendsandme'], + TABLES_WITH_STR_TUTTI: ['lista_editori'], FILTER_SEP: '_', + FILTER_TUTTI_STR: '[Tutti]', + FuncDialog: { CANCEL_BOOKING: 1, }, diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 36eba26b..0963c37e 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -132,18 +132,18 @@ export const colTableCatalogList = [ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit, isadvanced_field: false, }), - AddCol({ - name: 'idPageAssigned', - label_trans: 'cataloglist.idPageAssigned', - fieldtype: costanti.FieldType.select, - jointable: 'mypages_id', - }), AddCol({ name: 'referenti', label_trans: 'cataloglist.referenti', fieldtype: costanti.FieldType.multiselect, jointable: 'lista_editori', }), + AddCol({ + name: 'idPageAssigned', + label_trans: 'cataloglist.idPageAssigned', + fieldtype: costanti.FieldType.select, + jointable: 'mypages_id', + }), AddCol({ name: 'argomenti', label_trans: 'cataloglist.argomenti', @@ -297,6 +297,8 @@ export const colmyScheda = [ AddCol({ name: 'widthpag', label_trans: 'scheda.widthpag', fieldtype: costanti.FieldType.number }), AddCol({ name: 'widthimg', label_trans: 'scheda.widthimg', fieldtype: costanti.FieldType.number }), AddCol({ name: 'heightimg', label_trans: 'scheda.heightimg', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'widthcard', label_trans: 'scheda.widthcard', fieldtype: costanti.FieldType.number }), + AddCol({ name: 'heightcard', label_trans: 'scheda.heightcard', fieldtype: costanti.FieldType.number }), AddCol({ name: 'height_Printable', label_trans: 'scheda.height_Printable', fieldtype: costanti.FieldType.number }), AddCol({ name: 'numschede_perCol', label_trans: 'scheda,numschede_perCol', fieldtype: costanti.FieldType.number }), AddCol({ name: 'numschede_perRiga', label_trans: 'scheda.numschede_perRiga', fieldtype: costanti.FieldType.number }), @@ -4942,28 +4944,28 @@ export const fieldsTable = { label: 'Amici', columns: colTableUsersGeneric, colkey: 'username', - collabel: 'username', + collabel: (rec: any) => `${rec.name} ${rec.surname}`, }, { value: 'friendsandme', label: 'Amici_and_me', columns: colTableUsersGeneric, colkey: 'username', - collabel: 'username', + collabel: (rec: any) => `${rec.name} ${rec.surname}`, }, { value: 'lista_editori', label: 'Editori', columns: colTableUsersGeneric, colkey: 'username', - collabel: 'username', + collabel: 'name', }, { value: 'mygroups', label: 'Organizzazioni', columns: colmyUserGroup, colkey: 'groupname', - collabel: 'groupname', + collabel: (rec: any) => `${rec.groupname} `, }, { value: 'movements', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index 990eb0b3..46c775ed 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -9059,15 +9059,21 @@ export const tools = { setRecordByField(field: any, record: any, value: any) { let mioval = '' if (field) { - const arrfields = field.split('.') - if (arrfields && arrfields.length > 1) { - try { - record[arrfields[0]][arrfields[1]] = value - } catch (e) { - return record - } + if (typeof field === 'function') { + // Se field è una funzione, chiamala per ottenere il campo + const fieldValue = field(record) + record[fieldValue] = value } else { - record[field] = value + const arrfields = field.split('.') + if (arrfields && arrfields.length > 1) { + try { + record[arrfields[0]][arrfields[1]] = value + } catch (e) { + return record + } + } else { + record[field] = value + } } } return record @@ -9643,6 +9649,24 @@ export const tools = { return Object.keys(obj).length === 0; }, + getsearchList_Cataloghi() { + return [{ + visible: true, + label: 'Editore', + table: 'lista_editori', + key: 'referenti', + type: costanti.FieldType.select, + value: tools.getCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + shared_consts.TABLES_CATALOG + costanti.FILTER_SEP + 'referente', costanti.FILTER_TUTTI), + keycookie: '', + addall: true, + arrvalue: [], + filter: null, + useinput: false, + icon: 'fas fa-user' + }] + + }, + // FINE ! // getLocale() { diff --git a/src/store/Products.ts b/src/store/Products.ts index 34b24cb9..935b81f7 100755 --- a/src/store/Products.ts +++ b/src/store/Products.ts @@ -1,4 +1,4 @@ -import { IBaseOrder, ICart, IOrder, IOrderCart, IProduct, IProductsState, IProductInfo, ICatProd, IUserShort, IGasordine, IAuthor, ISubCatProd, IText, IOptCatalogo, ICatalog } from 'model' +import { IBaseOrder, ICart, IOrder, IOrderCart, IProduct, IProductsState, IProductInfo, ICatProd, IUserShort, IGasordine, IAuthor, ISubCatProd, IText, IOptCatalogo, ICatalog, ICatPrTotali } from 'model' import { Api } from '@api' import { serv_constants } from '@src/store/Modules/serv_constants' @@ -170,6 +170,14 @@ export const useProducts = defineStore('Products', { } return '' }, + getTotaliProdottiByIdCatProd: (state: IProductsState) => (idCatProd: string): number => { + const myfirstcat = state.catprtotali!.find((rec: ICatPrTotali) => rec._id === idCatProd) + + if (myfirstcat) { + return myfirstcat.quanti! + } + return 0 + }, getSubCatProdsByGas: (state: IProductsState) => (idGasOrdine: string, idCatProd: string): ISubCatProd[] => { let arrcat = state.subcatprods diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index 9ce79de9..24fb5e2b 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -1778,6 +1778,7 @@ export const useGlobalStore = defineStore('GlobalStore', { this.providers = (res.data.providers) ? [...res.data.providers] : [] Products.catprods = (res.data.catprods) ? [...res.data.catprods] : [] + Products.catprtotali = (res.data.catprtotali) ? [...res.data.catprtotali] : [] Products.collane = (res.data.collane) ? [...res.data.collane] : [] Products.subcatprods = (res.data.subcatprods) ? [...res.data.subcatprods] : [] Products.catprods_gas = (res.data.catprods_gas) ? [...res.data.catprods_gas] : [] @@ -2108,7 +2109,7 @@ export const useGlobalStore = defineStore('GlobalStore', { getTableJoinByName(table: string, addall?: boolean, addnone?: boolean, filter?: any, value2?: any) { let myarr: any = [] - if (table === 'permissions') myarr = [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher, shared_consts.Permissions.Facilitatore, shared_consts.Permissions.Editor, shared_consts.Permissions.Zoomeri, shared_consts.Permissions.Department] + if (table === 'permissions') myarr = [shared_consts.Permissions.Admin, shared_consts.Permissions.Manager, shared_consts.Permissions.Teacher, shared_consts.Permissions.Facilitatore, shared_consts.Permissions.Editor, shared_consts.Permissions.Zoomeri, shared_consts.Permissions.Department, shared_consts.Permissions.Grafico] else if (table === 'accepted') myarr = [shared_consts.Accepted.CHECK_READ_GUIDELINES, shared_consts.Accepted.CHECK_SEE_VIDEO_PRINCIPI] else if (table === 'fieldstype') myarr = costanti.FieldTypeArr else if (table === 'metodo_pagamento') myarr = tools.SelectMetodiPagamento @@ -2160,8 +2161,10 @@ export const useGlobalStore = defineStore('GlobalStore', { myarr = newarr } - if (addall) - myarr = [costanti.FILTER_TUTTI, ...myarr] + if (addall) { + myarr = [costanti.FILTER_TUTTI, ...myarr] + } + if (addnone) { diff --git a/src/views/ecommerce/catalogo/catalogo.vue b/src/views/ecommerce/catalogo/catalogo.vue index e5a0bb6a..1dab9231 100755 --- a/src/views/ecommerce/catalogo/catalogo.vue +++ b/src/views/ecommerce/catalogo/catalogo.vue @@ -571,6 +571,11 @@ >Struttura Campi GM + Tabella Argomenti +