diff --git a/.env.development b/.env.development
index 4f0e9c9e..5448937a 100755
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"
diff --git a/.env.example.production b/.env.example.production
index c5aa9285..f88ad438 100755
--- a/.env.example.production
+++ b/.env.example.production
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.prod.gruppomacro b/.env.prod.gruppomacro
index b25275cc..751d634c 100644
--- a/.env.prod.gruppomacro
+++ b/.env.prod.gruppomacro
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.prod.pcb b/.env.prod.pcb
index 515f6361..e6bd605d 100644
--- a/.env.prod.pcb
+++ b/.env.prod.pcb
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="17"
DIRECTORY_LOCAL="newfreeplanet"
diff --git a/.env.prod.riso b/.env.prod.riso
index 1a7351dc..314ca544 100644
--- a/.env.prod.riso
+++ b/.env.prod.riso
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
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 d539b640..60d36cba 100755
--- a/.env.test.abitaregliiblei.it
+++ b/.env.test.abitaregliiblei.it
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="19"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.test.gruppomacro b/.env.test.gruppomacro
index 34269670..e829846c 100755
--- a/.env.test.gruppomacro
+++ b/.env.test.gruppomacro
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.test.pcb b/.env.test.pcb
index 0968bd31..1e9d72c9 100755
--- a/.env.test.pcb
+++ b/.env.test.pcb
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="17"
DIRECTORY_LOCAL="newfreeplanet"
diff --git a/.env.test.risosrv b/.env.test.risosrv
index 5bba9268..ca644178 100755
--- a/.env.test.risosrv
+++ b/.env.test.risosrv
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/.env.test2 b/.env.test2
index 95962ad8..ac6cb999 100755
--- a/.env.test2
+++ b/.env.test2
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
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 45a5ee09..d5db3c32 100755
--- a/.env.test_riso.pcb
+++ b/.env.test_riso.pcb
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
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 7acc3f64..236b32d2 100755
--- a/_ALL_SITES/abitaregliiblei.it/.env.development
+++ b/_ALL_SITES/abitaregliiblei.it/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="19"
DIRECTORY_LOCAL="newfreeplanet"
@@ -13,8 +13,8 @@ PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
MONGODB_HOST="https://localhost:3000"
LOGO_REG='abitaregliiblei-logo-full.png'
-TEST_NAME="Paolo"
-TEST_SURNAME="Arena"
+TEST_NAME="Surya"
+TEST_SURNAME=""
TEST_EMAIL=""
TEST_USERNAME=""
TEST_PASSWORD=""
diff --git a/_ALL_SITES/abitaregliiblei.it/package.json b/_ALL_SITES/abitaregliiblei.it/package.json
index 9816d79f..9f31ae9c 100755
--- a/_ALL_SITES/abitaregliiblei.it/package.json
+++ b/_ALL_SITES/abitaregliiblei.it/package.json
@@ -1,9 +1,9 @@
{
"name": "abitaregliiblei",
- "version": "1.1.18",
+ "version": "1.1.20",
"description": "Abitare Gli Iblei",
"productName": "AbitareGliIblei",
- "author": "Paolo Arena",
+ "author": "Surya",
"private": true,
"keywords": [],
"license": "MIT",
diff --git a/_ALL_SITES/comunitanuovomondo.app/.env.development b/_ALL_SITES/comunitanuovomondo.app/.env.development
index 4f0e9c9e..5448937a 100755
--- a/_ALL_SITES/comunitanuovomondo.app/.env.development
+++ b/_ALL_SITES/comunitanuovomondo.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
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 fb578180..ba5d5d4a 100755
--- a/_ALL_SITES/comunitanuovomondo.app/.env.test
+++ b/_ALL_SITES/comunitanuovomondo.app/.env.test
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
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 530c183d..0916e8c8 100755
--- a/_ALL_SITES/comunitanuovomondo.app/package.json
+++ b/_ALL_SITES/comunitanuovomondo.app/package.json
@@ -1,9 +1,9 @@
{
"name": "riso",
- "version": "1.1.18",
+ "version": "1.1.20",
"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",
+ "author": "Surya",
"private": true,
"keywords": [],
"license": "MIT",
diff --git a/_ALL_SITES/fioredellavita.riso.app/.env.development b/_ALL_SITES/fioredellavita.riso.app/.env.development
index 36849b79..8ef26ba0 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.18"
+APP_VERSION="1.1.20"
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 b6000dc3..3c94dba9 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.18"
+APP_VERSION="1.1.20"
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 2abfc5b7..752b9a1d 100755
--- a/_ALL_SITES/fioredellavita.riso.app/package.json
+++ b/_ALL_SITES/fioredellavita.riso.app/package.json
@@ -1,9 +1,9 @@
{
"name": "fioredellavita",
- "version": "1.1.18",
+ "version": "1.1.20",
"description": "Fiore Della Vita",
"productName": "Fiore Della Vita",
- "author": "Paolo Arena",
+ "author": "Surya",
"private": true,
"keywords": [],
"license": "MIT",
diff --git a/_ALL_SITES/freeplanet.app/package.json b/_ALL_SITES/freeplanet.app/package.json
index 15811c41..23623197 100755
--- a/_ALL_SITES/freeplanet.app/package.json
+++ b/_ALL_SITES/freeplanet.app/package.json
@@ -3,7 +3,7 @@
"version": "0.0.8",
"description": "FreePlanet",
"productName": "FreePlanet",
- "author": "Paolo Arena",
+ "author": "Surya",
"private": true,
"keywords": [
],
diff --git a/_ALL_SITES/gruppomacro.app/.env.development b/_ALL_SITES/gruppomacro.app/.env.development
index 7d35fcb3..1121d220 100755
--- a/_ALL_SITES/gruppomacro.app/.env.development
+++ b/_ALL_SITES/gruppomacro.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL="newfreeplanet"
@@ -13,8 +13,8 @@ PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
MONGODB_HOST="https://localhost:3000"
LOGO_REG='gruppomacro-logo-full.png'
-TEST_NAME="Paolo"
-TEST_SURNAME="Arena"
+TEST_NAME="Surya"
+TEST_SURNAME=""
TEST_EMAIL=""
TEST_USERNAME=""
TEST_PASSWORD=""
diff --git a/_ALL_SITES/gruppomacro.app/.env.test b/_ALL_SITES/gruppomacro.app/.env.test
index 34269670..e829846c 100755
--- a/_ALL_SITES/gruppomacro.app/.env.test
+++ b/_ALL_SITES/gruppomacro.app/.env.test
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
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 9c57891a..184fe0dd 100755
--- a/_ALL_SITES/gruppomacro.app/package.json
+++ b/_ALL_SITES/gruppomacro.app/package.json
@@ -1,9 +1,9 @@
{
"name": "gruppomacro",
- "version": "1.1.18",
+ "version": "1.1.20",
"description": "GruppoMacro",
"productName": "Gruppo Macro",
- "author": "Paolo Arena",
+ "author": "Surya",
"private": true,
"keywords": [],
"license": "MIT",
diff --git a/_ALL_SITES/piuchebuono.app/.env.development b/_ALL_SITES/piuchebuono.app/.env.development
index 1094f3a8..52dd0421 100755
--- a/_ALL_SITES/piuchebuono.app/.env.development
+++ b/_ALL_SITES/piuchebuono.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
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 0968bd31..1e9d72c9 100755
--- a/_ALL_SITES/piuchebuono.app/.env.test
+++ b/_ALL_SITES/piuchebuono.app/.env.test
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
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 4099126f..d78cec97 100755
--- a/_ALL_SITES/piuchebuono.app/package.json
+++ b/_ALL_SITES/piuchebuono.app/package.json
@@ -1,9 +1,9 @@
{
"name": "piuchebuono",
- "version": "1.1.18",
+ "version": "1.1.20",
"description": "PiuCheBuono",
"productName": "PiuCheBuono",
- "author": "Paolo Arena",
+ "author": "Surya",
"private": true,
"keywords": [],
"license": "MIT",
diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development
index 4f0e9c9e..5448937a 100755
--- a/_ALL_SITES/riso.app/.env.development
+++ b/_ALL_SITES/riso.app/.env.development
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
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 2969bb46..b44a2d3d 100644
--- a/_ALL_SITES/riso.app/.env.production
+++ b/_ALL_SITES/riso.app/.env.production
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
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 fb578180..ba5d5d4a 100755
--- a/_ALL_SITES/riso.app/.env.test
+++ b/_ALL_SITES/riso.app/.env.test
@@ -1,4 +1,4 @@
-APP_VERSION="1.1.18"
+APP_VERSION="1.1.20"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="16"
DIRECTORY_LOCAL=newfreeplanet
diff --git a/_ALL_SITES/riso.app/images/riso-logo-full.png b/_ALL_SITES/riso.app/images/riso-logo-full.png
index 38a9695f..51a29654 100644
Binary files a/_ALL_SITES/riso.app/images/riso-logo-full.png and b/_ALL_SITES/riso.app/images/riso-logo-full.png differ
diff --git a/_ALL_SITES/riso.app/package.json b/_ALL_SITES/riso.app/package.json
index 530c183d..0916e8c8 100755
--- a/_ALL_SITES/riso.app/package.json
+++ b/_ALL_SITES/riso.app/package.json
@@ -1,9 +1,9 @@
{
"name": "riso",
- "version": "1.1.18",
+ "version": "1.1.20",
"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",
+ "author": "Surya",
"private": true,
"keywords": [],
"license": "MIT",
diff --git a/package.json b/package.json
index 530c183d..0916e8c8 100755
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
{
"name": "riso",
- "version": "1.1.18",
+ "version": "1.1.20",
"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",
+ "author": "Surya",
"private": true,
"keywords": [],
"license": "MIT",
diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js
index b2da4259..7342b37e 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.18";
+const APP_VERSION = "1.1.20";
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 cc09346b..d0718473 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -169,6 +169,7 @@ export const shared_consts = {
EDITADDRESSBYCOORD: 390,
GRID_ORIZ: 400,
QRCODE: 410,
+ CATALOGLIST: 420,
},
QUERYTYPE_MYGROUP: 1,
@@ -295,6 +296,7 @@ export const shared_consts = {
TABLES_CIRCUITS: 'circuits',
TABLES_MYGROUPS: 'mygroups',
TABLES_ATTIVITAS: 'attivitas',
+ TABLES_CATALOG: 'catalogs',
TABFILTRI_UTENTE: 'filtriutente',
@@ -394,7 +396,7 @@ export const shared_consts = {
TABLES_UPDATE_LASTIFIED: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'bots'],
TABLES_FINDER: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups'],
- TABLES_VISU_CMYSRECCARD: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups'],
+ TABLES_VISU_CMYSRECCARD: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'mygroups', 'catalogs'],
TABLES_SHOW_ADTYPE: ['myskills', 'mygoods', 'myhosps'],
TABLES_VISU_LISTA_USER: ['myskills', 'mybachecas', 'myhosps', 'mygoods', 'users'],
@@ -406,9 +408,11 @@ export const shared_consts = {
TABLES_VISU_IMG: ['myskills', 'myhosps', 'mygoods', 'mygroups'],
TABLES_DIRECTORY_A_PARTE: ['mygroups'],
TABLES_WITH_ADMINS: ['mygroups', 'circuits'],
- TABLES_DIRECTORY_SINGLE_IMG: ['circuits'],
+ TABLES_DIRECTORY_SINGLE_IMG: ['circuits', 'catalogs'],
TABLES_IMAGEFILE_SINGOLO: ['productInfos'],
+ TABLES_PER_EDITORI: ['catalogs'],
+
TABLES_VISU_MAP: 'attivitas',
VISIB_ALL: 0,
@@ -1174,7 +1178,7 @@ export const shared_consts = {
},
{
id: 4,
- label: 'a Paolo (test)',
+ label: 'a Surya (test)',
value: 20,
},
{
@@ -1763,6 +1767,10 @@ export const shared_consts = {
value: 410,
label: 'Qr Code',
},
+ {
+ value: 420,
+ label: 'Lista Cataloghi',
+ },
],
TypesElemAdminTools: [
diff --git a/src/components/CBarSelection/CBarSelection.ts b/src/components/CBarSelection/CBarSelection.ts
index 2be7069e..9418ce3b 100755
--- a/src/components/CBarSelection/CBarSelection.ts
+++ b/src/components/CBarSelection/CBarSelection.ts
@@ -123,6 +123,17 @@ export default defineComponent({
}
return ''
})
+ const colorsel = computed(() => {
+ const myarr: any = tools.getoptionsMainCards(false)
+ if (myarr) {
+ const rec = myarr.find((rec: any) => rec.value === tablesel.value)
+
+ if (rec) {
+ return rec.color
+ }
+ }
+ return ''
+ })
const myfilter = ref('')
const myfilterand: any = ref([])
let rowsel: any = {}
@@ -362,6 +373,7 @@ export default defineComponent({
iconsel,
filtri,
clickButtBar,
+ colorsel,
}
}
})
diff --git a/src/components/CBarSelection/CBarSelection.vue b/src/components/CBarSelection/CBarSelection.vue
index 08b0605e..0f193b41 100755
--- a/src/components/CBarSelection/CBarSelection.vue
+++ b/src/components/CBarSelection/CBarSelection.vue
@@ -25,20 +25,22 @@
/>
-
+
-
+
diff --git a/src/components/CCatalogList/CCatalogList.scss b/src/components/CCatalogList/CCatalogList.scss
new file mode 100755
index 00000000..e69de29b
diff --git a/src/components/CCatalogList/CCatalogList.ts b/src/components/CCatalogList/CCatalogList.ts
new file mode 100755
index 00000000..87c1ff65
--- /dev/null
+++ b/src/components/CCatalogList/CCatalogList.ts
@@ -0,0 +1,199 @@
+import {
+ computed,
+ provide, defineComponent, onBeforeMount, onBeforeUnmount, onMounted, ref, toRef, toRefs, watch,
+} from 'vue'
+
+import { tools } from '@store/Modules/tools'
+import { CMyFieldDb } from '@/components/CMyFieldDb'
+import { costanti } from '@costanti'
+import { useGlobalStore } from '@store/globalStore'
+import { useUserStore } from '@store/UserStore'
+
+import { CTitlePage } from '@/components/CTitlePage'
+import { CGridTableRec } from '@/components/CGridTableRec'
+import { IColGridTable, IMyBacheca, IMySkill, ISearchList, ISkill } from 'model'
+import { shared_consts } from '@/common/shared_vuejs'
+import { useI18n } from '@/boot/i18n'
+import { toolsext } from '@store/Modules/toolsext'
+import { fieldsTable } from '@store/Modules/fieldsTable'
+import { useQuasar } from 'quasar'
+
+export default defineComponent({
+ name: 'CCatalogList',
+ emits: ['clickButtBar'],
+ props: {
+ ind: {
+ type: Number,
+ required: false,
+ default: -1,
+ },
+ prop_search: {
+ type: Boolean,
+ required: false,
+ default: true,
+ },
+ finder: {
+ type: Boolean,
+ required: false,
+ default: true,
+ },
+ heightcarousel: {
+ type: Number,
+ required: false,
+ default: 0,
+ },
+ },
+ components: {
+ CMyFieldDb, CGridTableRec, CTitlePage,
+ },
+ setup(props, { attrs, slots, emit }) {
+ const { t } = useI18n()
+ const $q = useQuasar()
+ const globalStore = useGlobalStore()
+ const userStore = useUserStore()
+
+ const table = ref('catalogs')
+
+ const searchList_Base = ref([])
+
+ const arrfilterand: any = ref([])
+ const filtercustom: any = ref([])
+
+ const search = ref('')
+ const myrecfiltertoggle = ref(tools.FILTER_ALL)
+
+ const prop_colkey = ref('')
+ const col_title = ref('')
+ const col_footer = ref('')
+ const col_tabfooter = ref('')
+
+ const strextra = ref('')
+ const myoptions = ref([])
+
+ const col = ref([])
+
+ const myCatRef = ref(null)
+
+ /*
+ const idSectorServizi = computed(() => {
+ let myval: any = null
+ myval = searchList_Servizi.value.find((rec) => (rec.table === toolsext.TABSECTORS))
+ if (myval) {
+ const ris = myval.value || 0
+ // console.log('idSectorServizi=', ris)
+ return ris
+ } else {
+ return 0
+ }
+ })
+
+ */
+
+
+ function updatefilter(value: any) {
+ //
+ }
+
+
+ watch(() => myrecfiltertoggle.value, (value: any, oldval: any) => {
+ updatefilter(value)
+ },
+ )
+
+ const mypagination = computed(() => {
+ 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
+ })
+
+ const hint = computed(() => {
+ return 'digita una parola da cercare'
+ })
+
+ const visuType = computed(() => {
+ return false // $q.screen.gt.xs
+ })
+
+ const noMsgRecord = computed(() => {
+ return 'Nessun dato trovato con i filtri selezionati'
+ })
+
+
+ function mounted() {
+
+ let obj = tools.getParamsByTable(table.value)
+
+
+ prop_colkey.value = obj.prop_colkey
+ col_title.value = obj.col_title
+ col_footer.value = obj.col_footer
+ col_tabfooter.value = obj.col_tabfooter
+
+ searchList_Base.value = []
+
+ filtercustom.value = []
+
+ col.value = fieldsTable.getArrColsByTable(table.value)
+ }
+
+
+
+ function mySortFieldsAvailable() {
+ if (table.value === toolsext.TABUSER) {
+ return userStore.getSortFieldsAvailable()
+ }
+
+ return []
+ }
+
+
+
+ function doSearch() {
+ //
+ }
+
+ function clickButtBar(item: any) {
+ if (myCatRef.value) {
+ myCatRef.value.clickButtBar(item)
+ }
+
+ // emit('clickButtBar', item)
+ }
+
+ onMounted(mounted)
+
+ return {
+ t,
+ tools,
+ costanti,
+ arrfilterand,
+ filtercustom,
+ searchList,
+ search,
+ doSearch,
+ myrecfiltertoggle,
+ prop_colkey,
+ col_title,
+ col_footer,
+ col_tabfooter,
+ col,
+ toolsext,
+ mypagination,
+ noMsgRecord,
+ showType,
+ visuType,
+ hint,
+ myoptions,
+ mySortFieldsAvailable,
+ clickButtBar,
+ myCatRef,
+ table,
+ }
+ },
+})
diff --git a/src/components/CCatalogList/CCatalogList.vue b/src/components/CCatalogList/CCatalogList.vue
new file mode 100755
index 00000000..99ec55a4
--- /dev/null
+++ b/src/components/CCatalogList/CCatalogList.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CCatalogList/index.ts b/src/components/CCatalogList/index.ts
new file mode 100755
index 00000000..36ab186a
--- /dev/null
+++ b/src/components/CCatalogList/index.ts
@@ -0,0 +1 @@
+export { default as CCatalogList } from './CCatalogList.vue'
diff --git a/src/components/CCatalogo/CCatalogo.ts b/src/components/CCatalogo/CCatalogo.ts
index 18e7ed38..8514046e 100755
--- a/src/components/CCatalogo/CCatalogo.ts
+++ b/src/components/CCatalogo/CCatalogo.ts
@@ -1,23 +1,23 @@
import { PropType, defineComponent, ref, watch } from 'vue'
import { Catalogo } from '@src/views/ecommerce/catalogo'
-import { ICatalogo } from '@src/model'
+import { IOptCatalogo } from '@src/model'
export default defineComponent({
name: 'CCatalogo',
components: { Catalogo },
emits: ['update:modelValue', 'updateCatalogo'],
props: {
- // add options ICatalogo
+ // add options IOptCatalogo
modelValue: {
- type: Object as PropType,
+ type: Object as PropType,
required: true,
},
},
setup(props, { emit }) {
// Crea una copia locale reattiva di modelValue
- const localCatalogo = ref({ ...props.modelValue });
+ const localCatalogo = ref({ ...props.modelValue });
// Watcher per sincronizzare le modifiche di modelValue
watch(() => props.modelValue, (newVal) => {
@@ -31,12 +31,12 @@ export default defineComponent({
}
// Metodo per aggiornare il valore del catalogo
- const updateCatalogo = (updatedCatalogo: ICatalogo) => {
+ const updateCatalogo = (updatedCatalogo: IOptCatalogo) => {
localCatalogo.value = updatedCatalogo; // Aggiorna la copia locale
updateCatalogoPadre()
};
- function updateCatalogoEmit(updatedCatalogo: ICatalogo) {
+ function updateCatalogoEmit(updatedCatalogo: IOptCatalogo) {
console.log('updateCatalogoEmit')
localCatalogo.value = updatedCatalogo; // Aggiorna la copia locale
updateCatalogoPadre()
diff --git a/src/components/CCatalogoCard/CCatalogoCard.ts b/src/components/CCatalogoCard/CCatalogoCard.ts
index 1b804e84..aee6a622 100755
--- a/src/components/CCatalogoCard/CCatalogoCard.ts
+++ b/src/components/CCatalogoCard/CCatalogoCard.ts
@@ -17,7 +17,7 @@ import { CBarCode } from '../CBarCode'
import { func_tools, toolsext } from '@store/Modules/toolsext'
import {
- IBaseOrder, ICatalogo, IGasordine, IMyScheda, IOrder, IOrderCart,
+ IBaseOrder, IOptCatalogo, IGasordine, IMyScheda, IOrder, IOrderCart,
IProduct, IVariazione
} from '@src/model'
import { tools } from '@store/Modules/tools'
@@ -63,7 +63,7 @@ export default defineComponent({
default: () => { }
},
modelValue: {
- type: Object as PropType,
+ type: Object as PropType,
required: true,
},
scheda: {
@@ -100,7 +100,7 @@ export default defineComponent({
const apriSchedaPDF = ref(false)
// Crea una copia locale reattiva di modelValue
- const optcatalogo = ref({ ...props.modelValue });
+ const optcatalogo = ref({ ...props.modelValue });
// Watcher per sincronizzare le modifiche di modelValue
watch(() => props.modelValue, (newVal) => {
@@ -113,7 +113,7 @@ export default defineComponent({
}
// Metodo per aggiornare il valore del catalogo
- const updateCatalogo = (updatedCatalogo: ICatalogo) => {
+ const updateCatalogo = (updatedCatalogo: IOptCatalogo) => {
optcatalogo.value = updatedCatalogo; // Aggiorna la copia locale
updateCatalogoPadre()
};
diff --git a/src/components/CContactUser/CContactUser.ts b/src/components/CContactUser/CContactUser.ts
index b34351f5..0f501344 100755
--- a/src/components/CContactUser/CContactUser.ts
+++ b/src/components/CContactUser/CContactUser.ts
@@ -52,17 +52,6 @@ export default defineComponent({
return userStore.my.username
}
- function getLinkUserTelegram() {
-
- if (props.myuser) {
- if (!!props.myuser.profile.username_telegram) {
- return 'https://t.me/' + props.myuser.profile.username_telegram
- }
- } else {
- return ''
- }
- }
-
function getLinkWebSite() {
if (props.myuser) {
let mysite = props.myuser.profile.website!
@@ -98,7 +87,6 @@ export default defineComponent({
userStore,
shared_consts,
showsendCoinTo,
- getLinkUserTelegram,
getLinkWebSite,
myusername,
showingtooltip,
diff --git a/src/components/CContactUser/CContactUser.vue b/src/components/CContactUser/CContactUser.vue
index 70913aec..b5fde6bd 100755
--- a/src/components/CContactUser/CContactUser.vue
+++ b/src/components/CContactUser/CContactUser.vue
@@ -1,7 +1,7 @@
diff --git a/src/components/CContainerCatalogoCard/CContainerCatalogoCard.ts b/src/components/CContainerCatalogoCard/CContainerCatalogoCard.ts
index 84d96406..98e187e7 100755
--- a/src/components/CContainerCatalogoCard/CContainerCatalogoCard.ts
+++ b/src/components/CContainerCatalogoCard/CContainerCatalogoCard.ts
@@ -15,7 +15,7 @@ import { shared_consts } from '@src/common/shared_vuejs'
import { useRouter } from 'vue-router'
import { costanti } from '@costanti'
-import { ICatalogo, IMyScheda, IProduct } from '@src/model'
+import { IOptCatalogo, IMyScheda, IProduct } from '@src/model'
export default defineComponent({
@@ -48,7 +48,7 @@ export default defineComponent({
default: () => { }
},
modelValue: {
- type: Object as PropType
,
+ type: Object as PropType,
required: true,
},
scheda: {
@@ -69,7 +69,7 @@ export default defineComponent({
const opendetailbool = ref(false)
// Crea una copia locale reattiva di modelValue
- const optcatalogo = ref({ ...props.modelValue });
+ const optcatalogo = ref({ ...props.modelValue });
// Watcher per sincronizzare le modifiche di modelValue
watch(() => props.modelValue, (newVal) => {
@@ -82,7 +82,7 @@ export default defineComponent({
}
// Metodo per aggiornare il valore del catalogo
- const updateCatalogo = (updatedCatalogo: ICatalogo) => {
+ const updateCatalogo = (updatedCatalogo: IOptCatalogo) => {
optcatalogo.value = updatedCatalogo; // Aggiorna la copia locale
updateCatalogoPadre()
};
diff --git a/src/components/CDateTime/CDateTime.ts b/src/components/CDateTime/CDateTime.ts
index fcad4f36..5d7459a6 100755
--- a/src/components/CDateTime/CDateTime.ts
+++ b/src/components/CDateTime/CDateTime.ts
@@ -59,6 +59,11 @@ export default defineComponent({
required: false,
default: 'date-time',
},
+ addstrrequired: {
+ type: String,
+ required: false,
+ default: '',
+ },
},
components: {},
setup(props, { emit }) {
diff --git a/src/components/CGridOriz/CGridOriz.ts b/src/components/CGridOriz/CGridOriz.ts
index a932029c..584acb67 100755
--- a/src/components/CGridOriz/CGridOriz.ts
+++ b/src/components/CGridOriz/CGridOriz.ts
@@ -259,7 +259,7 @@ export default defineComponent({
if (props.table === shared_consts.TABLES_MYGROUPS) {
myoptions.value = [
{ label: '🌎 Tutti', value: tools.FILTER_ALL },
- { label: '👤 Gruppi che Gestisci', value: tools.FILTER_MYREC },
+ { label: '👤 ' + t('groups.che_gestisci'), value: tools.FILTER_MYREC },
// {label: 'Seguo', value: tools.FILTER_MYFOLLOW},
]
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index df07cd67..951d9829 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -16,7 +16,8 @@ import {
IParamDialog,
IMySkill,
ICoordLatLng,
- ICoordGPS
+ ICoordGPS,
+ IOptGrid
} from 'model'
import { lists } from '@store/Modules/lists'
import { IParamsQuery } from 'model'
@@ -27,6 +28,7 @@ import { CMyUser } from '../CMyUser'
import { CMyGroups } from '../CMyGroups'
import { CMyFieldDb } from '../CMyFieldDb'
import { CMyRecCard } from '../CMyRecCard'
+import { CMyRecCatalog } from '../CMyRecCatalog'
import { CMapByTable } from '../CMapByTable'
import { CMyRecGrpCard } from '../CMyRecGrpCard'
import { CMyRecCircuitCard } from '../CMyRecCircuitCard'
@@ -207,6 +209,11 @@ export default defineComponent({
required: false,
default: null,
},
+ opt: {
+ type: Object as PropType,
+ required: false,
+ default: {},
+ },
filterdef: {
type: Array,
required: false,
@@ -343,7 +350,7 @@ export default defineComponent({
},
components: {
CMyPopupEdit, CTitleBanner, CMyFieldDb, CMySelect, CMyFriends, CMyGroups,
- CMyUser, CMyRecCard, CMyCardPopup, CMyRecGrpCard, CMyCardGrpPopup, CMyCardCircuitPopup,
+ CMyUser, CMyRecCard, CMyRecCatalog, CMyCardPopup, CMyRecGrpCard, CMyCardGrpPopup, CMyCardCircuitPopup,
CMyRecCircuitCard, CMyCardService, CNotifSettings, CMapByTable, CSingleMovement,
},
setup(props, { emit }) {
diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue
index 4c7a0af4..466da03b 100755
--- a/src/components/CGridTableRec/CGridTableRec.vue
+++ b/src/components/CGridTableRec/CGridTableRec.vue
@@ -25,10 +25,10 @@
-
+
{{ mytitle }}
@@ -103,11 +103,12 @@
>
@@ -266,9 +267,8 @@
@@ -285,7 +285,6 @@
+
+
@@ -927,13 +940,12 @@
@@ -1090,11 +1102,11 @@
props.row['adType']
)
}}
-
+ />-->
@@ -1409,11 +1421,14 @@
v-if="col.fieldtype === costanti.FieldType.separator"
>
@@ -1443,6 +1458,7 @@
minuteinterval="1"
:visulabel="true"
:insertMode="true"
+ :dense="false"
@save="SaveValue"
@show="selItem(newRecord, col)"
@showandsave="showandsave"
@@ -1491,7 +1507,7 @@
size="md"
dense
:icon="!showfilteradv ? 'fas fa-arrow-down' : 'fas fa-arrow-up'"
- :label="$t('grid.show_campi_avanzati')"
+ :label="!showfilteradv ? $t('grid.advanced_filters') : $t('grid.hide_advanced_filters')"
@click="showfilteradv = !showfilteradv"
>
@@ -1515,6 +1531,7 @@
v-model:row="recModif"
:field="col.field"
:subfield="col.subfield"
+ :dense="false"
:value_extra="getValueExtra(col, recModif)"
minuteinterval="1"
@save="SaveValue"
diff --git a/src/components/CMyActivities/CMyActivities.ts b/src/components/CMyActivities/CMyActivities.ts
index 44e8080c..cf7eb706 100755
--- a/src/components/CMyActivities/CMyActivities.ts
+++ b/src/components/CMyActivities/CMyActivities.ts
@@ -185,17 +185,6 @@ export default defineComponent({
return true
}
- function getLinkUserTelegram() {
-
- if (myuser.value) {
- if (!!myuser.value.profile.username_telegram) {
- return 'https://t.me/' + myuser.value.profile.username_telegram
- }
- } else {
- return ''
- }
- }
-
function getLinkWebSite() {
if (myuser.value) {
let site = myuser.value.profile.website!
@@ -251,7 +240,6 @@ export default defineComponent({
shared_consts,
getImgUser,
checkifShow,
- getLinkUserTelegram,
getLinkWebSite,
filtroutente,
filtro_eventi,
diff --git a/src/components/CMyActivities/CMyActivities.vue b/src/components/CMyActivities/CMyActivities.vue
index c0666b21..bf427272 100755
--- a/src/components/CMyActivities/CMyActivities.vue
+++ b/src/components/CMyActivities/CMyActivities.vue
@@ -111,7 +111,7 @@
-
Gruppi:
+
{{t('circuit.conticollettivi')}}:
+
+
+
+
+
+ {{ $t('msgs.write_email') }} -
+ {{ tools.getNomeUtenteByRecUser(myrec) }}
+
+
-
+
@@ -998,6 +1018,24 @@
)
"
/>
+
{
- let pagename = ''
- if (recscheda.scheda) {
- if (recscheda.idPageOrig) {
- const page = globalStore.getPageById(recscheda.idPageOrig)
- pagename = page ? page.title! : ''
- }
- if (pagename)
- pagename = '[Pag: ' + pagename + '] '
-
- const mylabel = pagename + (recscheda.scheda ? recscheda.scheda!.name : '')
- arr.push({ label: mylabel, value: recscheda.scheda!._id })
- }
- });
- }
-
-
- return arr
- }
-
function updateSizeWidth(value: any) {
// Gestisce l'input dell'utente per un nuovo valore
myel.value.widthimg = value; // Aggiorna widthimg con il nuovo valore
@@ -931,7 +903,7 @@ export default defineComponent({
}
- const generatePDF = async (optcatalogo: ICatalogo) => {
+ const generatePDF = async (optcatalogo: IOptCatalogo) => {
await nextTick()
@@ -1101,7 +1073,6 @@ export default defineComponent({
addNewScheda,
dupNewScheda,
delRecScheda,
- SchedeOpt,
addProdSpeciale,
idSchedaDaCopiare,
copyfromTemplate,
diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue
index 7f75f658..7473f821 100755
--- a/src/components/CMyEditElem/CMyEditElem.vue
+++ b/src/components/CMyEditElem/CMyEditElem.vue
@@ -217,7 +217,8 @@
+
+
+
-
+
+
CStatusReg
@@ -658,7 +665,10 @@
MAPPA:
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts
index 14b26795..df41b105 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -243,6 +243,8 @@ export default defineComponent({
const loaded = ref(false)
+ const addstrrequired = ref('')
+
const col = ref(
{
name: 'test',
fieldtype: 0,
@@ -318,6 +320,8 @@ export default defineComponent({
}
}
+ addstrrequired.value = col.value.required ? '* ' : ''
+
// console.log('popupedit myvalue.value: ', myvalue.value)
if (props.tablesel) {
@@ -944,6 +948,7 @@ export default defineComponent({
gotoPage,
mypath,
changeValRecCoordAddr,
+ addstrrequired,
}
}
})
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index 5dfdf170..1fc6c7f9 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -102,7 +102,7 @@
:minlength="col.minlength ? col.minlength : undefined"
v-model="myvalue"
@update:model-value="changevalRec"
- :label="col.visulabel ? $t(col.label_trans) : ''"
+ :label="col.visulabel ? addstrrequired + $t(col.label_trans) : ''"
:autogrow="col.fieldtype !== costanti.FieldType.crypted"
@keyup.enter.stop
autofocus
@@ -230,7 +230,8 @@
@keyup.enter.stop
@update:model-value="changevalRec"
autofocus
- :label="col.visulabel ? $t(col.label_trans) : col.label"
+ :rules="[val => (!!val || !col.required) || 'Campo richiesto']"
+ :label="col.visulabel ? addstrrequired + $t(col.label_trans) : col.label"
>
@@ -321,7 +322,7 @@
:label="
col.visulabel
? $t(col.label_trans)
- : visulabel
+ : addstrrequired + visulabel
? $t(col.label_trans)
: ''
"
@@ -356,6 +357,7 @@
:col="col"
:row="row"
:options="tools.SelectHours"
+ :addstrrequired="addstrrequired"
>
@@ -622,6 +624,7 @@
)
"
:useinput="false"
+ :addstrrequired="addstrrequired"
>
@@ -654,6 +657,7 @@
)
"
:useinput="false"
+ :addstrrequired="addstrrequired"
>
@@ -666,9 +670,9 @@
@@ -904,6 +910,8 @@
)
"
:useinput="col.allowNewValue"
+ :addstrrequired="addstrrequired"
+ :dense="dense"
>
@@ -975,6 +983,8 @@
"
:sola_lettura="!isInModif"
:useinput="isInModif"
+ :addstrrequired="addstrrequired"
+ :dense="dense"
>
@@ -1006,6 +1016,8 @@
)
"
:useinput="false"
+ :addstrrequired="addstrrequired"
+ :dense="dense"
>
@@ -1185,10 +1197,11 @@
:maxlength="col.maxlength ? col.maxlength : undefined"
:minlength="col.minlength ? col.minlength : undefined"
v-model="scope.value"
- :label="col.visulabel ? $t(col.label_trans) : ''"
+ :label="col.visulabel ? addstrrequired + $t(col.label_trans) : ''"
:autogrow="col.fieldtype !== costanti.FieldType.crypted"
@keyup.enter.stop
autofocus
+ :rules="[val => (!!val || !col.required) || 'Campo richiesto']"
>
@
@@ -1206,8 +1219,8 @@
:label="
col.visulabel
? $t(col.label_trans)
- : visulabel
- ? col.label
+ : addstrrequired + visulabel
+ ? addstrrequired + col.label
: ''
"
>
@@ -1261,6 +1274,7 @@
@changeval="changevalRecHours"
style="max-width: 100px"
:options="tools.SelectHours"
+ :addstrrequired="addstrrequired"
>
@@ -1308,6 +1322,8 @@
)
"
:useinput="col.allowNewValue"
+ :addstrrequired="addstrrequired"
+ :dense="dense"
>
@@ -1345,6 +1361,8 @@
)
"
:useinput="true"
+ :addstrrequired="addstrrequired"
+ :dense="dense"
>
@@ -1379,6 +1397,8 @@
:sola_lettura="!isInModif"
:useinput="col.allowNewValue"
:newvaluefunc="addNewValue"
+ :addstrrequired="addstrrequired"
+ :dense="dense"
>
@@ -1445,6 +1465,8 @@
:optlab="fieldsTable.getLabelByTable(tablesel)"
:options="[]"
:useinput="false"
+ :addstrrequired="addstrrequired"
+ :dense="dense"
>
@@ -1464,6 +1486,7 @@
:optlab="fieldsTable.getLabelByTable(tablesel)"
:options="[]"
:useinput="false"
+ :addstrrequired="addstrrequired"
>
@@ -1472,9 +1495,9 @@
diff --git a/src/components/CMyRecCard/CMyRecCard.vue b/src/components/CMyRecCard/CMyRecCard.vue
index f2cde8fe..4b5d0fcf 100755
--- a/src/components/CMyRecCard/CMyRecCard.vue
+++ b/src/components/CMyRecCard/CMyRecCard.vue
@@ -118,11 +118,11 @@
:color="fieldsTable.getColByAdType(myrec.adType)"
>
{{ fieldsTable.getValByTabAndId(table, 'adType', myrec.adType) }}
-
+ />-->
@@ -167,11 +167,6 @@
:color="fieldsTable.getColByAdType(myrec.adType)"
>
{{ fieldsTable.getValByTabAndId(table, 'adType', myrec.adType) }}
-
-
+
diff --git a/src/components/CMyRecCatalog/CMyRecCatalog.scss b/src/components/CMyRecCatalog/CMyRecCatalog.scss
new file mode 100755
index 00000000..2dda3ffb
--- /dev/null
+++ b/src/components/CMyRecCatalog/CMyRecCatalog.scss
@@ -0,0 +1,81 @@
+.cardrec {
+ /* Aggiungi un bordo sottile */
+ border: 1px solid #ddd;
+ /* Applica un'ombreggiatura per dare l'effetto di elevazione */
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+ /* Arrotonda leggermente gli angoli */
+ border-radius: 8px;
+ /* Aggiungi un po' di spazio interno intorno ai contenuti */
+ padding: 8px;
+ /* Colore di sfondo bianco per separare dal resto del contenuto */
+ background-color: #eff;
+
+ margin: 4px;
+
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ align-items: center;
+
+ @media (min-width: 500px) {
+ margin: 1px;
+ padding: 4px;
+ }
+}
+
+.catalog-image {
+ max-width: 100%;
+ height: auto;
+ margin-bottom: 20px;
+}
+
+.imgcatalog {
+ border: 4px solid #ffffff;
+ /* Bordo bianco */
+ border-radius: 12px;
+ /* Angoli arrotondati */
+ box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+ /* Ombra per un effetto 3D */
+ transition: transform 0.3s ease, box-shadow 0.3s ease;
+ /* Transizione fluida */
+ object-fit: cover;
+ /* Mantiene l'aspetto dell'immagine senza distorsioni */
+}
+
+.imgcatalog:hover {
+ transform: scale(1.05);
+ /* Effetto di ingrandimento al passaggio del mouse */
+ box-shadow: 0 8px 16px rgba(0, 0, 0, 0.3);
+ /* Ombra più pronunciata al passaggio del mouse */
+}
+
+.back_img {
+ background-repeat: no-repeat !important;
+ background-size: cover;
+ background-position: center;
+}
+
+.flex-grow {
+ flex-grow: 1;
+ /* Usa flex-grow per occupare spazio disponibile */
+}
+
+.title-container {
+ background-color: rgba(0, 0, 0, 0.3);
+ /* Sfondo bianco con trasparenza */
+ padding: 4px;
+ /* Aggiunta di padding per creare spazio attorno al testo */
+ border-radius: 8px;
+ /* Arrotonda gli angoli dello sfondo */
+}
+
+.text-h6 {
+ font-family: 'Arial', sans-serif;
+ /* Scegli un font accattivante e comune */
+ font-size: 1.15rem;
+ /* Dimensione del font modificabile */
+ color: #FFF;
+ /* Colore del testo */
+ margin-top: auto;
+ /* Assicura che il titolo sia posizionato alla base della scheda */
+}
\ No newline at end of file
diff --git a/src/components/CMyRecCatalog/CMyRecCatalog.ts b/src/components/CMyRecCatalog/CMyRecCatalog.ts
new file mode 100755
index 00000000..11cb83db
--- /dev/null
+++ b/src/components/CMyRecCatalog/CMyRecCatalog.ts
@@ -0,0 +1,143 @@
+import { defineComponent, onMounted, PropType, ref, watch, computed } from 'vue'
+import { useUserStore } from '@store/UserStore'
+import { IImgGallery, IOptGrid, IUserFields, IUserProfile } from 'model'
+import { costanti } from '@costanti'
+import { shared_consts } from '@/common/shared_vuejs'
+import { fieldsTable } from '@store/Modules/fieldsTable'
+import { tools } from '@store/Modules/tools'
+import { toolsext } from '@store/Modules/toolsext'
+import { useQuasar } from 'quasar'
+import { useI18n } from '@/boot/i18n'
+import { CMyCardPopup } from '@/components/CMyCardPopup'
+import { useRouter } from 'vue-router'
+import { useCalendarStore } from '@src/store/CalendarStore'
+import { useGlobalStore } from '@src/store/globalStore'
+
+export default defineComponent({
+ name: 'CMyRecCatalog',
+ components: { CMyCardPopup },
+ emits: ['setCmd', 'cmdext'],
+ props: {
+ table: {
+ type: String,
+ required: true,
+ },
+ prop_myrec: {
+ type: Object as PropType,
+ required: false,
+ default: null,
+ },
+ editOn: {
+ type: Boolean,
+ required: false,
+ default: false,
+ },
+ margin_right: {
+ type: Number,
+ required: false,
+ default: 0,
+ },
+ opt: {
+ type: Object as PropType,
+ required: false,
+ default: {},
+ },
+ },
+
+ setup(props, { emit }) {
+
+ const userStore = useUserStore()
+ const calendarStore = useCalendarStore()
+ const globalStore = useGlobalStore()
+ const $q = useQuasar()
+ const { t } = useI18n()
+ const $router = useRouter()
+
+ const myrec = ref(null)
+
+ const visupage = ref(false)
+ const disabilita = computed(() => {
+ return props.table === shared_consts.TABLES_MYBACHECAS
+ })
+
+ watch(() => props.prop_myrec, (newval, oldval) => {
+
+ mounted()
+ })
+
+
+ function mounted() {
+ if (props.prop_myrec) {
+ myrec.value = props.prop_myrec
+ }
+ }
+
+ function showBadge() {
+ if (shared_consts.TABLES_SHOW_ADTYPE.includes(props.table)) {
+ return true
+ }
+
+ return false
+ }
+
+ function getImgUser(profile: IUserFields) {
+ return userStore.getImgByProfile(profile)
+ }
+
+ function naviga(path: string) {
+ $router.push(path)
+ }
+
+ function setCmd($q: any, cmd: number, myusername: string, value: any, groupname: string) {
+ emit('setCmd', $q, cmd, myusername, value, groupname)
+ }
+
+ function cmdExt(cmd: any, val1: any, val2: any) {
+ emit('cmdext', cmd, val1, val2)
+ }
+
+ function navigaExt(obj: any) {
+ cmdExt(costanti.CMD_SHOW_PAGE, null, obj)
+ //let link = shared_consts.getDirectoryByTable(props.table) + '/' + obj._id
+ //console.log('link', link)
+ //$router.push(link)
+ }
+
+ function getNameToShow(user: IUserFields, col = null) {
+ if (myrec.value.groupname)
+ return myrec.value.groupname
+ else
+ return userStore.getNameToShow(user, col)
+ }
+
+ function computedWidth() {
+ const width = tools.getwidth($q) - 20;
+ return `${Math.min(width, 600)}px`; // Limita la larghezza massima a 600px
+ }
+
+ onMounted(mounted)
+
+ return {
+ t,
+ myrec,
+ costanti,
+ getImgUser,
+ naviga,
+ navigaExt,
+ setCmd,
+ shared_consts,
+ userStore,
+ tools,
+ toolsext,
+ fieldsTable,
+ cmdExt,
+ visupage,
+ showBadge,
+ getNameToShow,
+ calendarStore,
+ disabilita,
+ globalStore,
+ computedWidth,
+ }
+ },
+})
diff --git a/src/components/CMyRecCatalog/CMyRecCatalog.vue b/src/components/CMyRecCatalog/CMyRecCatalog.vue
new file mode 100755
index 00000000..cb80d4fb
--- /dev/null
+++ b/src/components/CMyRecCatalog/CMyRecCatalog.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+ {{ myrec.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('reg.edit') }}
+
+
+
+
+
+
+
+ {{ $t('event.duplicate') }}
+
+
+
+
+
+
+
+ {{ $t('reg.elimina') }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/CMyRecCatalog/index.ts b/src/components/CMyRecCatalog/index.ts
new file mode 100755
index 00000000..9ecc37a0
--- /dev/null
+++ b/src/components/CMyRecCatalog/index.ts
@@ -0,0 +1 @@
+export { default as CMyRecCatalog } from './CMyRecCatalog.vue'
diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts
index 5e754952..50ab2d50 100755
--- a/src/components/CMySelect/CMySelect.ts
+++ b/src/components/CMySelect/CMySelect.ts
@@ -30,6 +30,11 @@ export default defineComponent({
required: false,
default: undefined,
},
+ addstrrequired: {
+ type: String,
+ required: false,
+ default: '',
+ },
myclass: {
type: String,
required: false,
diff --git a/src/components/CMySelect/CMySelect.vue b/src/components/CMySelect/CMySelect.vue
index 21031c1a..947e85a0 100755
--- a/src/components/CMySelect/CMySelect.vue
+++ b/src/components/CMySelect/CMySelect.vue
@@ -6,7 +6,7 @@
@update:model-value="changeval"
v-bind="$attrs"
label-color="primary"
- :label="label"
+ :label="addstrrequired + label"
@filter="filterFn"
@filter-abort="abortFilterFn"
input-debounce="600"
@@ -89,7 +89,7 @@
:dense="dense"
options-dense
use-input
- :label="label"
+ :label="addstrrequired + label"
input-debounce="300"
:input-class="myclass"
:options="valori"
@@ -137,7 +137,7 @@
:multiple="true"
:model-value="myarrvalue"
label-color="primary"
- :label="label"
+ :label="addstrrequired + label"
@update:model-value="changeval"
rounded
:behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
@@ -218,7 +218,7 @@
@update:model-value="changeval"
@filter="filterFn"
:behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
- :label="label"
+ :label="addstrrequired + label"
:use-input="useinput"
@new-value="newvaluefuncfirst"
emit-value
diff --git a/src/components/CText/CText.ts b/src/components/CText/CText.ts
index e52a0c77..2a662e6f 100755
--- a/src/components/CText/CText.ts
+++ b/src/components/CText/CText.ts
@@ -5,7 +5,7 @@ import {
} from 'vue'
import { tools } from '@store/Modules/tools'
-import { ICatalogo, IMyScheda, IProduct, ISchedaSingola, IText } from '@src/model'
+import { IOptCatalogo, IMyScheda, IProduct, ISchedaSingola, IText } from '@src/model'
import { useProducts } from '@store/Products'
import { useGlobalStore } from '@src/store/globalStore'
@@ -24,7 +24,7 @@ export default defineComponent({
required: true,
},
optcatalogo: {
- type: Object as PropType,
+ type: Object as PropType,
required: true,
},
scheda: {
diff --git a/src/components/CUserNonVerif/CUserNonVerif.vue b/src/components/CUserNonVerif/CUserNonVerif.vue
index 0a0b61e9..66bfcb5b 100755
--- a/src/components/CUserNonVerif/CUserNonVerif.vue
+++ b/src/components/CUserNonVerif/CUserNonVerif.vue
@@ -1,11 +1,6 @@
-
diff --git a/src/css/app.scss b/src/css/app.scss
index c8fe7712..75fa7513 100755
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -1342,7 +1342,7 @@ h3 {
font-family: WalterTurncoat, handwriting, Arial, sans-serif;
font-size: 1.15rem;
text-shadow: .05rem .05rem .05rem $grayshadow;
- letter-spacing: 0.25px;
+ letter-spacing: 0px !important;
}
.title_view_small_shadow {
diff --git a/src/index.template.html b/src/index.template.html
index b80b1482..2051ae21 100755
--- a/src/index.template.html
+++ b/src/index.template.html
@@ -10,7 +10,7 @@
-
+
diff --git a/src/model/CatalogStore.ts b/src/model/CatalogStore.ts
new file mode 100755
index 00000000..4c80dc3e
--- /dev/null
+++ b/src/model/CatalogStore.ts
@@ -0,0 +1,36 @@
+
+export interface FotoCatalogo {
+ imagefile: string
+ alt: string
+ description: string
+}
+
+export interface FilesCataloghi {
+ per_web: string
+ per_stampa: string
+}
+
+export interface ICatalog {
+ idapp: string
+ active?: boolean
+ title: string
+ foto_collana?: FotoCatalogo,
+ idCollana?: string
+ descr_introduttiva?: string
+ idTemplateScheda?: string
+ referenti?: string[]
+ img_bordata_web?: FotoCatalogo,
+ img_bordata_stampa?: FotoCatalogo,
+ img_intro_web?: FotoCatalogo,
+ img_intro_stampa?: FotoCatalogo,
+
+ generati?: FilesCataloghi,
+ online?: FilesCataloghi,
+
+ date_created?: Date,
+ date_updated?: Date,
+}
+
+export interface ICatalogState {
+ catalog?: ICatalog
+}
\ No newline at end of file
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 6fe4837e..8ed85465 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -167,7 +167,7 @@ export interface IMyElem {
styleadd?: string
list?: IImgGallery[]
listcards?: IMyCard[]
- catalogo?: ICatalogo
+ catalogo?: IOptCatalogo
elemsText?: IElemText[]
titleBanner: string
classBanner: string
@@ -818,7 +818,7 @@ export interface ISchedaSingola {
arrProdToShow?: IProduct[][][]
}
-export interface ICatalogo {
+export interface IOptCatalogo {
//++AddCATALOGO_FIELDS
productTypes?: number[]
excludeproductTypes?: number[]
@@ -1029,6 +1029,12 @@ export interface ISearchList {
visible: boolean
}
+export interface IOptGrid {
+ rowclass?: boolean
+ widthcard?: string
+ heightcard?: string
+}
+
export interface IFilter {
label: string
value: string
diff --git a/src/model/Products.ts b/src/model/Products.ts
index 601e83e1..2968edad 100755
--- a/src/model/Products.ts
+++ b/src/model/Products.ts
@@ -35,7 +35,7 @@ export interface IProductInfo {
idAuthors?: string[]
authors?: string[]
idCollana?: string
- collana?: string
+ collana?: ICollana
collezione?: string
idPublisher?: string
publisher?: IPublisher
diff --git a/src/model/index.ts b/src/model/index.ts
index 687eeff3..67aba5e9 100755
--- a/src/model/index.ts
+++ b/src/model/index.ts
@@ -12,3 +12,4 @@ export * from './Projects'
export * from './Calendar'
export * from './Estimate'
export * from './Products'
+export * from './CatalogStore'
diff --git a/src/router/routesECommerce.ts b/src/router/routesECommerce.ts
index 9c2b45fa..d102d574 100644
--- a/src/router/routesECommerce.ts
+++ b/src/router/routesECommerce.ts
@@ -238,6 +238,20 @@ function getRoutesEcomm(site: ISites) {
onlyManager: true,
onlyEditor: true
},
+ {
+ active: true,
+ order: 35,
+ path: '/admin/ecommerce/collane',
+ materialIcon: 'fas fa-file-alt',
+ name: 'mypages.collane',
+ component: () => import('@/rootgen/admin/collane/collane.vue'),
+ inmenu: true,
+ submenu: true,
+ level_parent: 0,
+ level_child: 0.5,
+ onlyManager: true,
+ onlyEditor: true
+ },
]
diff --git a/src/statics/lang/enUs.js b/src/statics/lang/enUs.js
index d0c2447d..0bcaa0f1 100755
--- a/src/statics/lang/enUs.js
+++ b/src/statics/lang/enUs.js
@@ -839,7 +839,7 @@ const msg_enUs = {
name: 'Livello',
},
statusSkill: {
- name: 'Di Persona / On Line',
+ name: '👤 Di Persona / 💻 On Line',
},
store: {
description: 'Descrizione',
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 413f8419..c2bedef4 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -14,8 +14,10 @@ const msg_it = {
csv: 'Esporta Movimenti',
},
grid: {
- show_campi_avanzati: 'Mostra Campi Avanzati',
- advanced_filters: 'Filtri Avanzati',
+ show_campi_avanzati: 'Visualizza campi aggiuntivi',
+ hide_campi_avanzati: 'Nascondi campi aggiuntivi',
+ advanced_filters: 'Vedi Altri Filtri ...',
+ hide_advanced_filters: 'Nascondo Filtri ...',
found: 'trovato',
newrecord: 'Aggiungi',
table: 'Tabella',
@@ -1160,6 +1162,7 @@ const msg_it = {
skill: {
name: 'Categoria',
city: 'Comune',
+ cityorprovince: 'Comuni o Province',
pub_to_share: 'Visibilità',
photos: 'Foto',
note: 'Note',
@@ -1250,6 +1253,7 @@ const msg_it = {
listinoprodotti: 'Listino Prodotti',
productslist: 'Lista Prodotti',
collabora: 'Collabora',
+ collane: 'Collane',
categories: 'Categorie',
storehouses: 'Magazzino',
providers: 'Fornitori',
@@ -2002,6 +2006,13 @@ const msg_it = {
totVen: 'Totale Venduti',
totFat: 'Totale Fatturati',
+ },
+
+ cataloglist: {
+ foto_collana: 'Foto Collana',
+ referenti: 'Referenti',
+ img_bordata_web: 'Foto Bordo per Web',
+ collane: 'Collane',
}
},
diff --git a/src/store/CatalogStore.ts b/src/store/CatalogStore.ts
new file mode 100755
index 00000000..68f03bf7
--- /dev/null
+++ b/src/store/CatalogStore.ts
@@ -0,0 +1,34 @@
+import { defineStore } from 'pinia'
+
+import {
+ IAccount,
+ ICircuit, ICatalog, IGlobalState, IGroupShort, IMyCircuit, IMyGroup, IUserFields,
+ ICatalogState
+} from '@src/model'
+import { tools } from '@store/Modules/tools'
+import translate from '@src/globalroutines/util'
+
+import * as Types from '@src/store/Api/ApiTypes'
+import { useGlobalStore } from '@store/globalStore'
+import { serv_constants } from '@store/Modules/serv_constants'
+import { Api } from '@api'
+import { toolsext } from '@store/Modules/toolsext'
+import { static_data } from '@src/db/static_data'
+
+
+import { shared_consts } from '@/common/shared_vuejs'
+import { costanti } from '@costanti'
+
+import globalroutines from '../globalroutines/index'
+
+export const useCatalogStore = defineStore('CatalogStore', {
+ state: (): ICatalogState => ({
+ catalog: { idapp: '', title: '' }
+ }),
+
+ getters: {},
+
+ actions: {
+
+ },
+})
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 5ef4096d..942bbc85 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -117,6 +117,55 @@ export const colmailinglist = [
AddCol(DeleteRec),
]
+export const colTableCatalogList = [
+ AddCol({ name: 'active', label_trans: 'myelems.active', fieldtype: costanti.FieldType.boolean }),
+ AddCol({ name: 'title', label_trans: 'gallery.title' }),
+ AddCol({
+ name: 'foto_collana',
+ label_trans: 'cataloglist.foto_collana',
+ fieldtype: costanti.FieldType.image,
+ jointable: '',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
+ isadvanced_field: false,
+ }),
+ AddCol({
+ name: 'idCollana',
+ label_trans: 'cataloglist.collane',
+ fieldtype: costanti.FieldType.select,
+ jointable: 'collanas',
+ }),
+
+ AddCol({
+ name: 'idTemplateScheda',
+ label_trans: 'scheda.linkIdTemplate',
+ fieldtype: costanti.FieldType.select,
+ jointable: 'collanas',
+ }),
+
+ AddCol({
+ name: 'referenti',
+ label_trans: 'cataloglist.referenti',
+ fieldtype: costanti.FieldType.multiselect,
+ jointable: 'friendsandme',
+ field_outtype: costanti.FieldType.object,
+ showWhen: costanti.showWhen.InView_OnlyifExist,
+ }),
+ AddCol({
+ name: 'img_bordata_web',
+ label_trans: 'cataloglist.img_bordata_web',
+ fieldtype: costanti.FieldType.image,
+ jointable: '',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
+ isadvanced_field: false,
+ }),
+ AddCol({ name: 'idTemplateScheda', label_trans: 'scheda.linkIdTemplate', fieldtype: costanti.FieldType.string }),
+
+ AddCol(ModifRec),
+ AddCol(DuplicateRec),
+ AddCol(DeleteRec),
+
+]
+
export const colgallery = [
AddCol({ name: 'author_username', label_trans: 'gallery.author_username' }),
AddCol({ name: 'title', label_trans: 'gallery.title' }),
@@ -1031,7 +1080,7 @@ export const colmyUserGroup = [
}),
AddCol({
name: 'idCity',
- label_trans: 'skill.city',
+ label_trans: 'skill.cityorprovince',
fieldtype: costanti.FieldType.multiselect_by_server,
jointable: 'cities',
tablesel: 'cities',
@@ -1113,13 +1162,15 @@ export const colmyUserGroup = [
isadvanced_field: true,
}),
AddCol({
- name: 'link_telegram', label_trans: 'reg.link_telegram', isadvanced_field: true, fieldtype: costanti.FieldType.link,
+ name: 'link_telegram', label_trans: 'reg.link_telegram', fieldtype: costanti.FieldType.link,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
- icon: 'fab fa-telegram'
+ icon: 'fab fa-telegram',
+ isadvanced_field: true,
}),
AddCol({
- name: 'website', label_trans: 'reg.website', isadvanced_field: true, fieldtype: costanti.FieldType.link,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist
+ name: 'website', label_trans: 'reg.website', fieldtype: costanti.FieldType.link,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ isadvanced_field: true,
}),
AddCol(ModifRec),
@@ -1140,7 +1191,7 @@ export const colmyGoods = [
}),
AddCol({
name: 'idCity',
- label_trans: 'skill.city',
+ label_trans: 'skill.cityorprovince',
fieldtype: costanti.FieldType.multiselect_by_server,
jointable: 'cities',
tablesel: 'cities',
@@ -1152,14 +1203,6 @@ export const colmyGoods = [
remote_field: 'comune',
required: true,
}),
- AddCol({
- name: 'pub_to_share',
- label_trans: 'skill.pub_to_share',
- fieldtype: costanti.FieldType.select,
- jointable: 'pub_to_share',
- icon: 'fas fa-users',
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
- }),
AddCol({
name: 'groupname',
label_trans: 'proj.gruppo',
@@ -1172,29 +1215,29 @@ export const colmyGoods = [
AddCol({
name: 'adType',
label_trans: 'adTypes.name',
- fieldtype: costanti.FieldType.select,
+ fieldtype: costanti.FieldType.multioption,
required: true,
jointable: 'adtypes',
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
icon: 'fas fa-bullhorn',
noshowlabel: true,
+ numpag_carousel: 1,
+ inline: true,
+ typeobj: 'radio',
}),
AddCol({
- name: 'descr',
- label_trans: 'proj.shortdescr',
- fieldtype: costanti.FieldType.string,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
- noshowlabel: true,
- maxlength: 120,
- required: true,
- sortable: false,
+ name: 'photos',
+ label_trans: 'skill.photos',
+ fieldtype: costanti.FieldType.listimages,
+ jointable: '',
+ showpicprofile_ifnotset: true,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
}),
AddCol({
name: 'note', label_trans: 'proj.descrapprof', fieldtype: costanti.FieldType.html,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '',
// minlength: 50,
- isadvanced_field: true,
required: false,
}),
AddCol({
@@ -1230,7 +1273,13 @@ export const colmyGoods = [
noshowlabel: true,
icon: 'fas fa-hand-holding',
// icon: 'fas fa-hands-helping',
- // isadvanced_field: true,
+ }),
+ AddCol({
+ name: '',
+ fieldtype: costanti.FieldType.separator,
+ required: false,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
+ visible: false,
}),
AddCol({
name: 'idShipping',
@@ -1241,7 +1290,7 @@ export const colmyGoods = [
noshowlabel: true,
icon: 'fas fa-shipping-fast',
// icon: 'fas fa-hands-helping',
- // isadvanced_field: true,
+ isadvanced_field: true,
}),
AddCol({
name: 'otherfilters',
@@ -1252,7 +1301,16 @@ export const colmyGoods = [
noshowlabel: true,
icon: 'fas fa-filter',
// icon: 'fas fa-hands-helping',
- // isadvanced_field: true,
+ isadvanced_field: true,
+ }),
+ AddCol({
+ name: 'pub_to_share',
+ label_trans: 'skill.pub_to_share',
+ fieldtype: costanti.FieldType.select,
+ jointable: 'pub_to_share',
+ icon: 'fas fa-users',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ isadvanced_field: true,
}),
AddCol({
name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
@@ -1261,22 +1319,6 @@ export const colmyGoods = [
sortable: true,
showWhen: 0
}),
- AddCol({
- name: 'photos',
- label_trans: 'skill.photos',
- fieldtype: costanti.FieldType.listimages,
- jointable: '',
- showpicprofile_ifnotset: true,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
- isadvanced_field: false,
- }),
- AddCol({
- name: '',
- fieldtype: costanti.FieldType.separator,
- required: false,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
- visible: false,
- }),
/*AddCol({
name: 'idSubSkill',
label_trans: 'skill.subskill',
@@ -1368,7 +1410,7 @@ export const colAttivita = [
}),
AddCol({
name: 'idCity',
- label_trans: 'skill.city',
+ label_trans: 'skill.cityorprovince',
fieldtype: costanti.FieldType.multiselect_by_server,
jointable: 'cities',
tablesel: 'cities',
@@ -1455,6 +1497,22 @@ export const colAttivita = [
export const colmySkills = [
+ AddCol({
+ name: 'idCity',
+ label_trans: 'skill.cityorprovince',
+ fieldtype: costanti.FieldType.multiselect_by_server,
+ jointable: 'cities',
+ tablesel: 'cities',
+ noshowlabel: true,
+ icon: 'fas fa-map-marker-alt',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ remote_table: 'mycities',
+ remote_key: '_id',
+ remote_field: 'comune',
+ required: true,
+ showonlyif_dipersona: true,
+ numpag_carousel: 1,
+ }),
AddCol({
name: 'adType',
label_trans: 'adTypes.name',
@@ -1492,22 +1550,6 @@ export const colmySkills = [
noshowlabel: true,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
}),
- AddCol({
- name: 'idCity',
- label_trans: 'skill.city',
- fieldtype: costanti.FieldType.multiselect_by_server,
- jointable: 'cities',
- tablesel: 'cities',
- noshowlabel: true,
- icon: 'fas fa-map-marker-alt',
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
- remote_table: 'mycities',
- remote_key: '_id',
- remote_field: 'comune',
- required: true,
- showonlyif_dipersona: true,
- numpag_carousel: 2,
- }),
AddCol({
name: 'descr',
label_trans: 'proj.shortdescr',
@@ -1534,7 +1576,6 @@ export const colmySkills = [
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '',
required: false,
- isadvanced_field: true,
numpag_carousel: 3,
}),
AddCol({
@@ -1575,13 +1616,6 @@ export const colmySkills = [
// isadvanced_field: true,
numpag_carousel: 5,
}),
- AddCol({
- name: '',
- fieldtype: costanti.FieldType.separator,
- required: false,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
- visible: false,
- }),
AddCol({
name: 'groupname',
label_trans: 'proj.gruppo',
@@ -1591,6 +1625,14 @@ export const colmySkills = [
link: '/mygrp/groupname',
noshowlabel: true,
}),
+ AddCol({
+ name: '',
+ fieldtype: costanti.FieldType.separator,
+ required: false,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
+ visible: false,
+ sortable: false,
+ }),
AddCol({
name: 'pub_to_share',
label_trans: 'skill.pub_to_share',
@@ -1602,9 +1644,10 @@ export const colmySkills = [
isadvanced_field: true,
}),
AddCol({
- name: 'website', label_trans: 'reg.website', isadvanced_field: true, fieldtype: costanti.FieldType.link,
+ name: 'website', label_trans: 'reg.website', fieldtype: costanti.FieldType.link,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
numpag_carousel: 6,
+ isadvanced_field: true,
}),
/*AddCol({
name: 'numLevel',
@@ -1643,6 +1686,21 @@ export const colmyHosp = [
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
sortable: false,
}),
+ AddCol({
+ name: 'idCity',
+ label_trans: 'skill.cityorprovince',
+ fieldtype: costanti.FieldType.multiselect_by_server,
+ jointable: 'cities',
+ tablesel: 'cities',
+ noshowlabel: true,
+ icon: 'fas fa-map-marker-alt',
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ remote_table: 'mycities',
+ remote_key: '_id',
+ remote_field: 'comune',
+ sortable: false,
+ required: true,
+ }),
AddCol({
name: 'visibile', label_trans: 'hosps.visibile', fieldtype: costanti.FieldType.boolean,
@@ -1652,12 +1710,15 @@ export const colmyHosp = [
AddCol({
name: 'adType',
label_trans: 'adTypes.name',
- fieldtype: costanti.FieldType.select,
+ fieldtype: costanti.FieldType.multioption,
required: true,
jointable: 'adtypes',
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit,
icon: 'fas fa-bullhorn',
noshowlabel: true,
+ numpag_carousel: 1,
+ inline: true,
+ typeobj: 'radio',
}),
AddCol({
name: 'typeHosp',
@@ -1704,21 +1765,6 @@ export const colmyHosp = [
sortable: false,
}),
- AddCol({
- name: 'idCity',
- label_trans: 'skill.city',
- fieldtype: costanti.FieldType.multiselect_by_server,
- jointable: 'cities',
- tablesel: 'cities',
- noshowlabel: true,
- icon: 'fas fa-map-marker-alt',
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
- remote_table: 'mycities',
- remote_key: '_id',
- remote_field: 'comune',
- sortable: false,
- required: true,
- }),
AddCol({
name: 'pub_to_share',
label_trans: 'skill.pub_to_share',
@@ -1745,7 +1791,6 @@ export const colmyHosp = [
noshowlabel: true,
icon: 'fas fa-hand-holding',
// icon: 'fas fa-hands-helping',
- isadvanced_field: false,
sortable: false,
}),
AddCol({
@@ -1762,7 +1807,6 @@ export const colmyHosp = [
name: 'note', label_trans: 'proj.descrapprof', fieldtype: costanti.FieldType.html,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '',
- isadvanced_field: true,
required: false,
sortable: false,
}),
@@ -1773,18 +1817,27 @@ export const colmyHosp = [
jointable: '',
showpicprofile_ifnotset: true,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
+ sortable: false,
+ }),
+ AddCol({
+ name: '',
+ fieldtype: costanti.FieldType.separator,
+ required: false,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
+ visible: false,
+ sortable: false,
+ }),
+ AddCol({
+ name: 'link_maplocation', label_trans: 'reg.link_maplocation', fieldtype: costanti.FieldType.link,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ sortable: false,
isadvanced_field: true,
- sortable: false,
}),
AddCol({
- name: 'link_maplocation', label_trans: 'reg.link_maplocation', isadvanced_field: true, fieldtype: costanti.FieldType.link,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
- sortable: false,
- }),
- AddCol({
- name: 'website', label_trans: 'reg.website', isadvanced_field: true, fieldtype: costanti.FieldType.link,
+ name: 'website', label_trans: 'reg.website', fieldtype: costanti.FieldType.link,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
sortable: false,
+ isadvanced_field: true,
}),
AddCol({
name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
@@ -1828,7 +1881,6 @@ export const colmyBachecas = [
jointable: '',
showpicprofile_ifnotset: true,
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InPage + costanti.showWhen.InEdit + costanti.showWhen.InView,
- isadvanced_field: true,
sortable: false,
}),
@@ -1862,6 +1914,7 @@ export const colmyBachecas = [
// fieldtype_real: costanti.FieldType.onlydate,
// fieldtype: costanti.FieldType.onlydate,
icon: 'fas fa-calendar-day',
+ required: true,
}),
AddCol(
{
@@ -1873,10 +1926,11 @@ export const colmyBachecas = [
// fieldtype_real: costanti.FieldType.onlydate,
icon: 'fas fa-calendar-day',
sortable: false,
+ required: true,
}),
AddCol({
name: 'idCity',
- label_trans: 'skill.city',
+ label_trans: 'skill.cityorprovince',
fieldtype: costanti.FieldType.multiselect_by_server,
jointable: 'cities',
tablesel: 'cities',
@@ -1920,7 +1974,6 @@ export const colmyBachecas = [
showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
titlepopupedit: 'Dettagli', field_extra1: 'username', subfield_extra1: '',
required: false,
- isadvanced_field: true,
sortable: false,
}),
AddCol({
@@ -1928,18 +1981,6 @@ export const colmyBachecas = [
label_trans: 'event.address',
fieldtype: costanti.FieldType.string,
}),
- AddCol({
- name: 'link_maplocation', label_trans: 'reg.link_maplocation', isadvanced_field: true, fieldtype: costanti.FieldType.link,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
- sortable: false,
- }),
- AddCol({
- name: 'pub_to_share',
- label_trans: 'skill.pub_to_share',
- fieldtype: costanti.FieldType.select,
- icon: 'fas fa-users',
- jointable: 'pub_to_share',
- }),
AddCol({
name: 'organisedBy',
label_trans: 'event.organisedBy_insert',
@@ -1947,28 +1988,52 @@ export const colmyBachecas = [
required: false,
sortable: false,
}),
+ AddCol({
+ name: '',
+ fieldtype: costanti.FieldType.separator,
+ required: false,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
+ visible: false,
+ sortable: false,
+ }),
+ AddCol({
+ name: 'link_maplocation', label_trans: 'reg.link_maplocation', fieldtype: costanti.FieldType.link,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ sortable: false,
+ isadvanced_field: true,
+ }),
+ AddCol({
+ name: 'website', label_trans: 'reg.website', fieldtype: costanti.FieldType.link,
+ showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
+ sortable: false,
+ isadvanced_field: true,
+ }),
AddCol({
name: 'contact_phone',
label_trans: 'event.contact_phone',
fieldtype: costanti.FieldType.string,
+ isadvanced_field: true,
}),
AddCol({
name: 'contact_email',
label_trans: 'event.contact_email',
fieldtype: costanti.FieldType.string,
+ isadvanced_field: true,
}),
AddCol({
name: 'contact_telegram',
label_trans: 'event.contact_telegram',
fieldtype: costanti.FieldType.string,
+ isadvanced_field: true,
}),
AddCol({
- name: 'website', label_trans: 'reg.website', isadvanced_field: true, fieldtype: costanti.FieldType.link,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView_OnlyifExist,
- sortable: false,
+ name: 'min_partecip', label_trans: 'event.min_partecip', fieldtype: costanti.FieldType.number,
+ isadvanced_field: true,
+ }),
+ AddCol({
+ name: 'max_partecip', label_trans: 'event.max_partecip', fieldtype: costanti.FieldType.number,
+ isadvanced_field: true,
}),
- AddCol({ name: 'min_partecip', label_trans: 'event.min_partecip', fieldtype: costanti.FieldType.number }),
- AddCol({ name: 'max_partecip', label_trans: 'event.max_partecip', fieldtype: costanti.FieldType.number }),
AddCol({
name: 'idContribType',
label_trans: 'contribtype.name',
@@ -1978,18 +2043,21 @@ export const colmyBachecas = [
noshowlabel: true,
icon: 'fas fa-hand-holding',
// icon: 'fas fa-hands-helping',
- isadvanced_field: false,
+ isadvanced_field: true,
sortable: false,
}),
- AddCol({ name: 'contribstr', label_trans: 'event.contribstr', fieldtype: costanti.FieldType.string }),
- /*AddCol({
- name: '',
- fieldtype: costanti.FieldType.separator,
- required: false,
- showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit,
- visible: false,
- sortable: false,
- }),*/
+ AddCol({
+ name: 'contribstr', label_trans: 'event.contribstr', fieldtype: costanti.FieldType.string,
+ isadvanced_field: true,
+ }),
+ AddCol({
+ name: 'pub_to_share',
+ label_trans: 'skill.pub_to_share',
+ fieldtype: costanti.FieldType.select,
+ icon: 'fas fa-users',
+ jointable: 'pub_to_share',
+ isadvanced_field: true,
+ }),
AddCol({
name: 'date_created', label_trans: 'event.dateCreated', fieldtype: costanti.FieldType.onlydate,
required: false,
@@ -2342,18 +2410,18 @@ export const colTableGestoreOrdini = [
]
export const colTableVariazioni = [
- AddCol({ name: '_id', label_trans: 'catalogo.id', fieldtype: costanti.FieldType.string }),
- AddCol({ name: 'price', label_trans: 'catalogo.prezzo', fieldtype: costanti.FieldType.number }),
- AddCol({ name: 'sale_price', label_trans: 'catalogo.prezzo_scontato', fieldtype: costanti.FieldType.number }),
- AddCol({ name: 'quantita', label_trans: 'catalogo.quantita', fieldtype: costanti.FieldType.number }),
- AddCol({ name: 'availability', label_trans: 'catalogo.availability', fieldtype: costanti.FieldType.number }),
- AddCol({ name: 'formato', label_trans: 'catalogo.formato', fieldtype: costanti.FieldType.string }),
- AddCol({ name: 'misure', label_trans: 'catalogo.misure', fieldtype: costanti.FieldType.string }),
- AddCol({ name: 'tipologia', label_trans: 'catalogo.tipologia', fieldtype: costanti.FieldType.string }),
- AddCol({ name: 'edizione', label_trans: 'catalogo.edizione', fieldtype: costanti.FieldType.string }),
- AddCol({ name: 'preOrderDate', label_trans: 'catalogo.preOrderDate', fieldtype: costanti.FieldType.date }),
- AddCol({ name: 'addtocart_link', label_trans: 'catalogo.addtocart_link', fieldtype: costanti.FieldType.string }),
- AddCol({ name: 'eta', label_trans: 'catalogo.eta', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: '_id', label_trans: 'catalogo.id', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'price', label_trans: 'catalogo.prezzo', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'sale_price', label_trans: 'catalogo.prezzo_scontato', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'quantita', label_trans: 'catalogo.quantita', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'availability', label_trans: 'catalogo.availability', fieldtype: costanti.FieldType.number }),
+ AddCol({ name: 'formato', label_trans: 'catalogo.formato', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'misure', label_trans: 'catalogo.misure', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'tipologia', label_trans: 'catalogo.tipologia', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'edizione', label_trans: 'catalogo.edizione', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'preOrderDate', label_trans: 'catalogo.preOrderDate', fieldtype: costanti.FieldType.date }),
+ AddCol({ name: 'addtocart_link', label_trans: 'catalogo.addtocart_link', fieldtype: costanti.FieldType.string }),
+ AddCol({ name: 'eta', label_trans: 'catalogo.eta', fieldtype: costanti.FieldType.string }),
]
export const colTableProductInfos = [
@@ -3614,7 +3682,7 @@ export const colTableCircuitComplete = [
AddCol({ name: 'longdescr', label_trans: 'circuit.descr', fieldtype: costanti.FieldType.html }),
AddCol({
name: 'idCity',
- label_trans: 'skill.city',
+ label_trans: 'skill.cityorprovince',
fieldtype: costanti.FieldType.multiselect_by_server,
jointable: 'cities',
tablesel: 'cities',
@@ -3742,7 +3810,7 @@ export const colTableCircuit = [
AddCol({ name: 'longdescr', label_trans: 'circuit.descr', fieldtype: costanti.FieldType.html }),
AddCol({
name: 'idCity',
- label_trans: 'skill.city',
+ label_trans: 'skill.cityorprovince',
fieldtype: costanti.FieldType.multiselect_by_server,
jointable: 'cities',
tablesel: 'cities',
@@ -3992,12 +4060,12 @@ export const fieldsTable = {
} else
return null
},
- getArrColsByTable(mytable: string) {
+ getArrColsByTable(mytable: string): any[] {
const tablerec: any = this.tablesList.find((rec) => rec.value === mytable)
if (tablerec && tablerec.columns) {
return tablerec.columns
} else
- return null
+ return []
},
getKeyByTable(mytable: string): string {
const myrec = this.getrecTableList(mytable)
@@ -4873,6 +4941,13 @@ export const fieldsTable = {
colicon: 'icon',
noshow: true,
},
+ {
+ value: 'catalogs',
+ label: 'Lista Cataloghi',
+ columns: colTableCatalogList,
+ colkey: '_id',
+ collabel: 'title',
+ },
],
}
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index d2674291..db5c0981 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -21,8 +21,9 @@ import {
IImg,
IText,
IAreaDiStampa,
- ICatalogo,
+ IOptCatalogo,
IPagina,
+ IUserProfile,
} from '@model'
import MixinBase from '@/mixins/mixin-base'
@@ -5405,6 +5406,24 @@ export const tools = {
return userStore.my.verified_email!
},
+ isEmailVerifiedByUser(userprofile: IUserFields): boolean {
+ return userprofile.verified_email!
+ },
+
+ isUsernameTelegOkByUser(userprofile: IUserFields): boolean {
+ return !!userprofile.profile.username_telegram
+ },
+
+ getLinkUserTelegramByUser(userprofile: IUserFields) {
+
+ if (userprofile) {
+ if (!!userprofile.profile.username_telegram) {
+ return 'https://t.me/' + userprofile.profile.username_telegram
+ }
+ } else {
+ return ''
+ }
+ },
TelegCode() {
const userStore = useUserStore()
@@ -7395,6 +7414,14 @@ export const tools = {
link_telegram: '',
}
},
+ getdefaultnewrec_Catalog(): any {
+ return {
+ title: '',
+ active: true,
+ idCollana: '',
+ }
+ },
+
getdefaultnewrec_Circuit(): any {
return {
name: '',
@@ -7508,6 +7535,12 @@ export const tools = {
// if ((userStore.isAdmin || userStore.isManager))
// return true
+ if (shared_consts.TABLES_PER_EDITORI.includes(tablesel)) {
+ if (userStore.isEditor || userStore.isAdmin) {
+ return true
+ }
+ }
+
if (shared_consts.TABLES_WITH_ADMINS.includes(tablesel)) {
if (userStore.isAdmin)
return true
@@ -7520,7 +7553,7 @@ export const tools = {
}
}
-
+
}
if (rec.hasOwnProperty('userId')) {
@@ -8037,6 +8070,7 @@ export const tools = {
try {
let username = myrow.hasOwnProperty('username') ? myrow['username'] : ''
const userId = myrow.hasOwnProperty('userId') ? myrow['userId'] : ''
+ const id = myrow.hasOwnProperty('_id') ? myrow['_id'] : ''
if (username === '') {
if (userId === userStore.my._id)
@@ -8055,6 +8089,8 @@ export const tools = {
} else if (table === 'circuits') {
if (myrow.hasOwnProperty('path'))
ris = 'circuits/' + myrow['path']
+ } else if (table === 'catalogs') {
+ ris = 'catalogs/' + id
} else if (!!myrow && !!myrow.directory) {
ris = myrow.directory
} else if (table === 'myelems') {
@@ -8205,13 +8241,14 @@ export const tools = {
getoptionsMainCards(only: boolean) {
let myarr = []
- let obj = { label: '', value: '', icon: '' }
+ let obj = { label: '', value: '', icon: '', color: '' }
for (let i = 0; i < costanti.MAINCARDS.length; i++) {
let rec: any = costanti.MAINCARDS[i]
if (rec.table && rec.showinoptions) {
obj.label = rec.title
obj.value = rec.table
obj.icon = rec.icon
+ obj.color = rec.color
myarr.push({ ...obj })
}
}
@@ -8398,6 +8435,8 @@ export const tools = {
return tools.getdefaultnewrec_MyGroup()
} else if (table === toolsext.TABCIRCUITS) {
return tools.getdefaultnewrec_Circuit()
+ } else if (table === toolsext.TABCATALOGS) {
+ return tools.getdefaultnewrec_Catalog()
}
return null
},
@@ -8606,6 +8645,10 @@ export const tools = {
},
}
+ } else if (table === toolsext.TABCATALOGS) {
+ return {
+
+ }
} else {
return {
// Servizi
@@ -9460,7 +9503,7 @@ export const tools = {
return myrec
},
- adjustSize(optcatalogo: ICatalogo, mysize: any, add: number = 0) {
+ adjustSize(optcatalogo: IOptCatalogo, mysize: any, add: number = 0) {
if (!mysize) {
return '';
}
@@ -9551,7 +9594,7 @@ export const tools = {
return jsonResult;
},
- getScale(optcatalogo: ICatalogo) {
+ getScale(optcatalogo: IOptCatalogo) {
if (optcatalogo.printable && optcatalogo.generazionePDFInCorso)
return optcatalogo.areadistampa!.scale_printable
else
diff --git a/src/store/Modules/toolsext.ts b/src/store/Modules/toolsext.ts
index 80e38cb9..90046d1e 100755
--- a/src/store/Modules/toolsext.ts
+++ b/src/store/Modules/toolsext.ts
@@ -83,6 +83,7 @@ export const toolsext = {
TABEXTRALIST: 'extralist',
TABNEWSLETTER: 'newstosent',
TABGALLERY: 'gallery',
+ TABCATALOGS: 'catalogs',
TABMAILINGLIST: 'mailinglist',
TABGROUPS: 'groups',
TABMYPAGE: 'mypages',
diff --git a/src/store/Products.ts b/src/store/Products.ts
index b4687e13..08411c98 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, ICatalogo } from 'model'
+import { IBaseOrder, ICart, IOrder, IOrderCart, IProduct, IProductsState, IProductInfo, ICatProd, IUserShort, IGasordine, IAuthor, ISubCatProd, IText, IOptCatalogo } from 'model'
import { Api } from '@api'
import { serv_constants } from '@src/store/Modules/serv_constants'
@@ -1264,7 +1264,7 @@ export const useProducts = defineStore('Products', {
return globalStore.gasordines.filter((rec) => rec.active)
},
- getAutoriByArrayAuthors(authors: IAuthor[] | null) {
+ getAutoriByArrayAuthors(authors?: IAuthor[]) {
// Gestione degli autori
let authorString = '';
if (authors && Array.isArray(authors)) {
@@ -1295,12 +1295,13 @@ export const useProducts = defineStore('Products', {
}
},
- replaceKeyWordsByProduct(optcatalogo: ICatalogo, myproduct: IProduct, testo: IText) {
+ replaceKeyWordsByProduct(optcatalogo: IOptCatalogo, myproduct: IProduct, testo: IText) {
if (!myproduct || !testo.contenuto) {
return testo.contenuto;
}
const autori = this.getAutoriByArrayAuthors(myproduct.productInfo.authors)
+ const collana = myproduct.productInfo.collana
const maxDescriptionLength = testo.maxlength ?? 100;
@@ -1388,6 +1389,8 @@ export const useProducts = defineStore('Products', {
'{ranking}': ranking || '',
'{venduti}': venduti || '',
'{formato}': formato || '',
+ '{collana_title}': collana ? collana.descrizione || '' : '',
+ '{collana_descr}': collana ? collana.descrizione_estesa || '' : '',
'{prezzo}': prezzo || '',
'{scale}': scale || '',
'{prezzo_scontato}': prezzo_scontato || '',
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index c38c31f5..06abad91 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -41,6 +41,7 @@ import { routesECommerce } from '@src/router/routesECommerce'
import { routesAI } from '@src/router/routesAI'
import LandingFooter from '@src/components/LandingFooter/LandingFooter'
import { useProducts } from '@store/Products'
+import { useCatalogStore } from './CatalogStore'
const stateConnDefault = 'online'
@@ -359,6 +360,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
const Products = useProducts()
const circuitStore = useCircuitStore()
const userStore = useUserStore()
+ const catalogStore = useCatalogStore()
const messageStore = useMessageStore()
const notifStore = useNotifStore()
@@ -383,6 +385,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
else if (table === toolsext.TABMAILINGLIST) ris = state.mailinglist
else if (table === toolsext.TABMYPAGE) ris = state.mypage
else if (table === toolsext.TABMYELEMS) ris = state.myelems
+ else if (table === toolsext.TABCATALOGS) ris = catalogStore.catalog!
else if (table === toolsext.TABCALZOOM) ris = state.calzoom
else if (table === 'producers') ris = state.producers
else if (table === 'storehouses') ris = state.storehouses
@@ -446,6 +449,8 @@ export const useGlobalStore = defineStore('GlobalStore', {
return state.sectorgoods
else if (table === 'catgrps')
return state.catgrps
+ else if (table === 'collanas')
+ return Products.collane
else if (table === 'provinces')
return state.provinces.filter((rec: IProvince) => (!rec.card) && (rec.prov !== 'ITA') && (rec.prov !== 'EST'))
else if (table === 'cards') {
@@ -1694,6 +1699,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
const calendarStore = useCalendarStore()
const circuitStore = useCircuitStore()
const Products = useProducts()
+ const catalogStore = useCatalogStore()
// console.log('calendarStore: loadAfterLogin')
// Load local data
@@ -1719,6 +1725,8 @@ export const useGlobalStore = defineStore('GlobalStore', {
circuitStore.listcircuits = (res.data.listcircuits) ? res.data.listcircuits : []
circuitStore.listaccounts = (res.data.listaccounts) ? res.data.listaccounts : []
+ catalogStore.catalog = res.data.catalogs
+
this.settings = (res.data.settings) ? [...res.data.settings] : []
this.disciplines = (res.data.disciplines) ? [...res.data.disciplines] : []
this.paymenttypes = (res.data.paymenttypes) ? [...res.data.paymenttypes] : []
@@ -2447,7 +2455,32 @@ export const useGlobalStore = defineStore('GlobalStore', {
},
+ SchedeOpt() {
+ const arrschede: ISchedaSingola[] = this.getMySchede()
+ let arr: any = []
+
+ arr.push({ label: '[Nessuna]', value: '' })
+
+ if (arrschede) {
+ arrschede.forEach((recscheda: ISchedaSingola) => {
+ let pagename = ''
+ if (recscheda.scheda) {
+ if (recscheda.idPageOrig) {
+ const page = this.getPageById(recscheda.idPageOrig)
+ pagename = page ? page.title! : ''
+ }
+ if (pagename)
+ pagename = '[Pag: ' + pagename + '] '
+
+ const mylabel = pagename + (recscheda.scheda ? recscheda.scheda!.name : '')
+ arr.push({ label: mylabel, value: recscheda.scheda!._id })
+ }
+ });
+ }
+
+ return arr
+ },
}
diff --git a/src/views/ecommerce/catalogo/catalogo.ts b/src/views/ecommerce/catalogo/catalogo.ts
index 1d805b9c..d36a117b 100755
--- a/src/views/ecommerce/catalogo/catalogo.ts
+++ b/src/views/ecommerce/catalogo/catalogo.ts
@@ -14,7 +14,7 @@ import { CProductCard } from '@src/components/CProductCard'
import { CMySelect } from '@src/components/CMySelect'
import { CContainerCatalogoCard } from '@src/components/CContainerCatalogoCard'
import { CSelectUserActive } from '@src/components/CSelectUserActive'
-import { ICatalogo, IDimensioni, IFilterCatalogo, IMyScheda, IProdView, IProduct, ISchedaSingola, ISearchList } from 'model'
+import { IOptCatalogo, IDimensioni, IFilterCatalogo, IMyScheda, IProdView, IProduct, ISchedaSingola, ISearchList } from 'model'
import { fieldsTable } from '@store/Modules/fieldsTable'
@@ -25,7 +25,7 @@ export default defineComponent({
emits: ['update:modelValue', 'updateCatalogo'],
props: {
modelValue: {
- type: Object as PropType,
+ type: Object as PropType,
required: true,
},
},
@@ -42,7 +42,7 @@ export default defineComponent({
const pdfContent = ref(null);
- const optcatalogo = ref({ ...props.modelValue });
+ const optcatalogo = ref({ ...props.modelValue });
function updateCatalogoPadre() {
console.log('catalogo.ts PADRE')
@@ -51,7 +51,7 @@ export default defineComponent({
}
// Metodo per aggiornare optcatalogo
- const updateOptCatalogo = (key: K, value: ICatalogo[K]) => {
+ const updateOptCatalogo = (key: K, value: IOptCatalogo[K]) => {
optcatalogo.value[key] = value;
updateCatalogoPadre()
}
@@ -780,14 +780,14 @@ export default defineComponent({
function groupedPages(recscheda: ISchedaSingola) {
return recscheda.arrProdToShow
}
- function generateStyleCatalogo(optcatalogo: ICatalogo) {
+ function generateStyleCatalogo(optcatalogo: IOptCatalogo) {
return {
}
}
- function generateStylePageScheda(optcatalogo: ICatalogo, scheda: IMyScheda) {
+ function generateStylePageScheda(optcatalogo: IOptCatalogo, scheda: IMyScheda) {
const marginTop = scheda.dimensioni?.pagina?.dimensioni?.margini?.top ? tools.adjustSize(optcatalogo, scheda.dimensioni?.pagina?.dimensioni?.margini?.top) : (tools.adjustSize(optcatalogo, optcatalogo.dimensioni_def?.pagina?.margini?.top) || '')
const marginBottom = scheda.dimensioni?.pagina?.dimensioni?.margini?.bottom ? tools.adjustSize(optcatalogo, scheda.dimensioni?.pagina?.dimensioni?.margini?.bottom) : (tools.adjustSize(optcatalogo, optcatalogo.dimensioni_def?.pagina?.margini?.bottom) || '')
const marginLeft = scheda.dimensioni?.pagina?.dimensioni?.margini?.left ? tools.adjustSize(optcatalogo, scheda.dimensioni?.pagina?.dimensioni?.margini?.left) : (tools.adjustSize(optcatalogo, optcatalogo.dimensioni_def?.pagina?.margini?.left) || '')
@@ -835,7 +835,7 @@ export default defineComponent({
};
}
- function generateStyleByPageDim(optcatalogo: ICatalogo, mypage: IDimensioni) {
+ function generateStyleByPageDim(optcatalogo: IOptCatalogo, mypage: IDimensioni) {
const marginTop = mypage!.margini?.top ? tools.adjustSize(optcatalogo, mypage!.margini?.top) : (tools.adjustSize(optcatalogo, optcatalogo.dimensioni_def?.pagina?.margini?.top) || '')
const marginBottom = mypage!.margini?.bottom ? tools.adjustSize(optcatalogo, mypage!.margini?.bottom) : (tools.adjustSize(optcatalogo, optcatalogo.dimensioni_def?.pagina?.margini?.bottom) || '')
const marginLeft = mypage!.margini?.left ? tools.adjustSize(optcatalogo, mypage!.margini?.left) : (tools.adjustSize(optcatalogo, optcatalogo.dimensioni_def?.pagina?.margini?.left) || '')
@@ -883,10 +883,10 @@ export default defineComponent({
};
}
- function getWidthPagina(optcatalogo: ICatalogo, scheda: IMyScheda) {
+ function getWidthPagina(optcatalogo: IOptCatalogo, scheda: IMyScheda) {
return scheda.dimensioni?.pagina?.dimensioni?.size?.width ? tools.adjustSize(optcatalogo, scheda.dimensioni?.pagina?.dimensioni?.size?.width) : (tools.adjustSize(optcatalogo, optcatalogo.dimensioni_def?.pagina?.size?.width) ?? '')
}
- function getHeightPagina(optcatalogo: ICatalogo, scheda: IMyScheda) {
+ function getHeightPagina(optcatalogo: IOptCatalogo, scheda: IMyScheda) {
return scheda.dimensioni?.pagina?.dimensioni?.size?.height ? tools.adjustSize(optcatalogo, scheda.dimensioni?.pagina?.dimensioni?.size?.height) : (tools.adjustSize(optcatalogo, optcatalogo.dimensioni_def?.pagina?.size?.height) ?? '')
}
diff --git a/src/views/user/myprofile/myprofile.vue b/src/views/user/myprofile/myprofile.vue
index fae96437..97d53ab2 100755
--- a/src/views/user/myprofile/myprofile.vue
+++ b/src/views/user/myprofile/myprofile.vue
@@ -2,6 +2,8 @@
Logged: {{ tools.isLogged() }} -
UserOk: {{ tools.isUserOk() }} -
+ tools.isEmailVerified(): {{ tools.isEmailVerified() }} -
+ tools.getLinkUserTelegramByUser(): {{ tools.getLinkUserTelegramByUser(userStore.userprofile) }} -
caricato: {{ caricato }} -
userStore.userprofile: {{ userStore.userprofile.username }}