diff --git a/.env b/.env index c6a90088..a6b0d6ab 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -VITE_APP_VERSION="1.2.58" +VITE_APP_VERSION="1.2.59" VITE_LANG_DEFAULT="it" VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -VITE_SERVICE_WORKER_FILE="sw-1.2.58.js" +VITE_SERVICE_WORKER_FILE="sw-1.2.59.js" VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" VITE_VUE_ROUTER_MODE="history" \ No newline at end of file diff --git a/index.html b/index.html index 3e6d07e1..956b596a 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + diff --git a/package.json b/package.json index a5314957..079ccb00 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.58", + "version": "1.2.59", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.58' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.59' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.58' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.59' quasar build -m spa", "lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.58' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.58' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.59' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.59' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json index 37ab32fd..169701ba 100755 --- a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json +++ b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json @@ -1,6 +1,6 @@ { "name": "cnm", - "version": "1.2.58", + "version": "1.2.59", "description": "Comunita Nuovo Mondo", "productName": "ComunitaNuovoMondo", "author": "Surya", @@ -9,7 +9,7 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.58' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.59' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", "buildpwa": "NODE_ENV=production quasar build -m pwa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.58' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.58' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.59' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.59' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/freeplanet.app/package.json b/scripts/_ALL_SITES/freeplanet.app/package.json index cb3ef08a..a7bac9f2 100755 --- a/scripts/_ALL_SITES/freeplanet.app/package.json +++ b/scripts/_ALL_SITES/freeplanet.app/package.json @@ -1,6 +1,6 @@ { "name": "freeplanet", - "version": "1.2.58", + "version": "1.2.59", "description": "freeplanet", "productName": "freeplanet", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8087 APP_VERSION='1.2.58' quasar dev", + "dev": "PORT=8087 APP_VERSION='1.2.59' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.58' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.58' quasar dev", + "pwa": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.59' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.59' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/gruppomacro.app/package.json b/scripts/_ALL_SITES/gruppomacro.app/package.json index 731e154e..dd410787 100755 --- a/scripts/_ALL_SITES/gruppomacro.app/package.json +++ b/scripts/_ALL_SITES/gruppomacro.app/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.58", + "version": "1.2.59", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.58' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.59' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.58' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.59' quasar build -m spa", "lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.58' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.58' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.59' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.59' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/kolibrilab.it/package.json b/scripts/_ALL_SITES/kolibrilab.it/package.json index 3d363274..b3380896 100755 --- a/scripts/_ALL_SITES/kolibrilab.it/package.json +++ b/scripts/_ALL_SITES/kolibrilab.it/package.json @@ -1,6 +1,6 @@ { "name": "kolibrilab", - "version": "1.2.58", + "version": "1.2.59", "description": "kolibrilab", "productName": "kolibrilab", "author": "Surya Paolo", @@ -8,11 +8,11 @@ "keywords": [], "license": "MIT", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.58' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.59' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -20,8 +20,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint --ext .ts,.vue --ignore-path .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.58' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.58' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.59' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.59' quasar dev", "spanorefresh": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m spa", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js" diff --git a/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json b/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json index 15c042e1..86fd6479 100755 --- a/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json +++ b/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json @@ -1,6 +1,6 @@ { "name": "nutriben", - "version": "1.2.58", + "version": "1.2.59", "description": "Nutriben", "productName": "Nutriben", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8093 APP_VERSION='1.2.58' quasar dev", + "dev": "PORT=8093 APP_VERSION='1.2.59' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.58' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.59' quasar build -m spa", "lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.58' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.58' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.59' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.59' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/piuchebuono.app/package.json b/scripts/_ALL_SITES/piuchebuono.app/package.json index 76be369b..932e81cc 100755 --- a/scripts/_ALL_SITES/piuchebuono.app/package.json +++ b/scripts/_ALL_SITES/piuchebuono.app/package.json @@ -1,6 +1,6 @@ { "name": "piuchebuono", - "version": "1.2.58", + "version": "1.2.59", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8085 APP_VERSION='1.2.58' quasar dev", + "dev": "PORT=8085 APP_VERSION='1.2.59' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.58' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.58' quasar dev", + "pwa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.59' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.59' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/riso.app/package.json b/scripts/_ALL_SITES/riso.app/package.json index f6e8ff80..b6b0587e 100755 --- a/scripts/_ALL_SITES/riso.app/package.json +++ b/scripts/_ALL_SITES/riso.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.2.58", + "version": "1.2.59", "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", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "APP_VERSION='1.2.58' PORT=8084 quasar dev", + "dev": "APP_VERSION='1.2.59' PORT=8084 quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.58' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.59' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.58' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.58' quasar dev", + "pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.59' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.59' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index bafc1ab5..6af8d437 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -3,7 +3,7 @@ /* global workbox */ /* global cfgenv */ -const VITE_APP_VERSION = '1.2.58'; +const VITE_APP_VERSION = '1.2.59'; // Costanti di configurazione const DYNAMIC_CACHE = 'dynamic-cache-v2'; diff --git a/src/components/CCatalogoCard/CCatalogoCard.vue b/src/components/CCatalogoCard/CCatalogoCard.vue index caae948e..95670e61 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.vue +++ b/src/components/CCatalogoCard/CCatalogoCard.vue @@ -177,7 +177,7 @@
Cataloghi
- + @@ -381,7 +381,7 @@
Raccolte Cataloghi
- + diff --git a/src/components/CMyRecCatalog/CMyRecCatalog.vue b/src/components/CMyRecCatalog/CMyRecCatalog.vue index 1ab20c20..4c9b6e7f 100755 --- a/src/components/CMyRecCatalog/CMyRecCatalog.vue +++ b/src/components/CMyRecCatalog/CMyRecCatalog.vue @@ -146,7 +146,7 @@ > aggiornato al ({{ tools.getstrDate(myrec.data_online_stampa) }})
-
@@ -159,6 +159,20 @@ da {{ myrec.username_lista_generata }} +
--> +
+ Lista aggiornata il: + {{ tools.getstrDate(myrec.data_lista_updated) || '' }} + da + {{ myrec.username_lista_updated }} +
diff --git a/src/components/CProductTable/CProductTable.ts b/src/components/CProductTable/CProductTable.ts index 3d339931..f3bda00c 100755 --- a/src/components/CProductTable/CProductTable.ts +++ b/src/components/CProductTable/CProductTable.ts @@ -234,6 +234,12 @@ export default defineComponent({ field: 'pdf_online_size', align: 'center', }, + { + name: 'data_online', + label: 'Data Online', + field: 'data_online', + align: 'center', + }, { name: 'pdf_online_stampa', label: 'PDF OnLine Stampa', @@ -246,12 +252,6 @@ export default defineComponent({ field: 'pdf_online_stampa_size', align: 'center', }, - { - name: 'data_online', - label: 'Data Online', - field: 'data_online', - align: 'center', - }, { name: 'data_online_stampa', label: 'Data Online Stampa', diff --git a/src/components/CSearchProduct/CSearchProduct.vue b/src/components/CSearchProduct/CSearchProduct.vue index f2b207e1..9a7e083c 100755 --- a/src/components/CSearchProduct/CSearchProduct.vue +++ b/src/components/CSearchProduct/CSearchProduct.vue @@ -83,7 +83,7 @@ v-model="optcatalogo" :idPage="idPage" :options="{ - show_edit_book: tools.isEditor(), + show_edit_book: tools.isCollaboratore(), }" @selauthor="selauthor" :scheda="optcatalogo.arrSchede[0].scheda" diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue index 03c46602..c7e57abc 100755 --- a/src/components/MyHeader/MyHeader.vue +++ b/src/components/MyHeader/MyHeader.vue @@ -50,7 +50,7 @@
diff --git a/src/model/CatalogStore.ts b/src/model/CatalogStore.ts index 39316184..c1935406 100755 --- a/src/model/CatalogStore.ts +++ b/src/model/CatalogStore.ts @@ -38,6 +38,8 @@ export interface ICatalog { pdf_generato_size?: string data_generato?: Date data_lista_generata?: Date + data_lista_updated?: Date + username_lista_updated?: string username_lista_generata?: string pdf_online?: string pdf_online_size?: string diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts index 90d50adb..5efa0c23 100755 --- a/src/model/UserStore.ts +++ b/src/model/UserStore.ts @@ -299,4 +299,5 @@ export interface IUserState { updateTables?: boolean lista_editori?: IUserShort[] | null + lista_referenti?: IUserShort[] | null } diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js index af2327cf..6d516247 100755 --- a/src/statics/lang/it.js +++ b/src/statics/lang/it.js @@ -2057,7 +2057,7 @@ const msg_it = { casaeditrice: 'Casa Editrice', numprodotti: 'Libri presenti', foto_collana: 'Foto Catalogo', - referenti: 'Editori', + referenti: 'Referenti', img_bordata: 'Immagine di sfondo', img_intro: 'Copertina introduttiva', img_bordata_stampa: 'Immagine di sfondo (per STAMPA)', diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts index 580ecd11..266272b0 100755 --- a/src/store/Modules/costanti.ts +++ b/src/store/Modules/costanti.ts @@ -414,7 +414,7 @@ export const costanti = { TABLES_ARRAY: ['circuits'], TABLES_USERNAME_DATE: ['friends', 'friendsandme'], TABLES_IMG_USERNAME: ['friends', 'friendsandme'], - TABLES_WITH_STR_TUTTI: ['lista_editori'], + TABLES_WITH_STR_TUTTI: ['lista_editori', 'lista_referenti'], FILTER_SEP: '_', FILTER_TUTTI_STR: '[Tutti]', diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 3a3a0873..bd4cb866 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -188,7 +188,7 @@ export const colTableCatalogList = [ name: 'referenti', label_trans: 'cataloglist.referenti', fieldtype: costanti.FieldType.multiselect, - jointable: 'lista_editori', + jointable: 'lista_referenti', }), AddCol({ name: 'idPageAssigned', @@ -5210,6 +5210,13 @@ export const fieldsTable = { colkey: 'username', collabel: 'name', }, + { + value: 'lista_referenti', + label: 'Referenti', + columns: colTableUsersGeneric, + colkey: 'username', + collabel: 'name', + }, { value: 'mygroups', label: 'Organizzazioni', diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts index fd546906..96ea875d 100644 --- a/src/store/Modules/tools.ts +++ b/src/store/Modules/tools.ts @@ -10824,7 +10824,7 @@ export const tools = { { visible: !this.isUtente(), label: 'Editore', - table: 'lista_editori', + table: 'lista_referenti', key: 'referenti', type: costanti.FieldType.select, value: this.isUtente() @@ -11123,14 +11123,18 @@ export const tools = { }, getColorWithTransparency(color: string): string { - const hex = color.slice(1); // Rimuove il simbolo "#" dal colore - const r = parseInt(hex.substring(0, 2), 16); - const g = parseInt(hex.substring(2, 4), 16); - const b = parseInt(hex.substring(4, 6), 16); - const a = parseInt(hex.substring(6, 8), 16) / 255; // Trasformiamo la trasparenza in formato decimale + if (color) { + const hex = color.slice(1); // Rimuove il simbolo "#" dal colore + const r = parseInt(hex.substring(0, 2), 16); + const g = parseInt(hex.substring(2, 4), 16); + const b = parseInt(hex.substring(4, 6), 16); + const a = parseInt(hex.substring(6, 8), 16) / 255; // Trasformiamo la trasparenza in formato decimale - // Restituisce il colore con trasparenza in formato rgba - return `rgba(${r}, ${g}, ${b}, ${a})`; + // Restituisce il colore con trasparenza in formato rgba + return `rgba(${r}, ${g}, ${b}, ${a})`; + } else { + return '' + } }, // FINE ! diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts index 3a0b2150..8836a0b4 100755 --- a/src/store/UserStore.ts +++ b/src/store/UserStore.ts @@ -217,6 +217,8 @@ export const useUserStore = defineStore('UserStore', { isZoomeri: false, isTratuttrici: false, isEditor: false, + isCommerciale: false, + isCollaboratore: false, isGrafico: false, isTeacher: false, usersList: [], @@ -224,6 +226,7 @@ export const useUserStore = defineStore('UserStore', { lastparamquery: {}, updateTables: false, lista_editori: null, + lista_referenti: null, }), getters: { @@ -234,6 +237,9 @@ export const useUserStore = defineStore('UserStore', { listaEditori: (state: IUserState): any => { return state.lista_editori; }, + listaReferenti: (state: IUserState): any => { + return state.lista_referenti; + }, getServerCode: (state: IUserState): number => state.servercode ? state.servercode : 0, @@ -2519,5 +2525,12 @@ export const useUserStore = defineStore('UserStore', { } return this.lista_editori; }, + async loadListaReferenti() { + const globalStore = useGlobalStore(); + if (!this.lista_referenti) { + this.lista_referenti = await globalStore.getObjOnServer('lista_referenti'); + } + return this.lista_referenti; + }, }, }); diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index b6702152..474b9353 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -564,6 +564,8 @@ export const useGlobalStore = defineStore('GlobalStore', { else if (table === 'friends') return userStore.my.profile.friends; else if (table === 'lista_editori') { ris = userStore.listaEditori; + } else if (table === 'lista_referenti') { + ris = userStore.listaReferenti; } else if (table === 'friendsandme') return [{ username: userStore.my.username }, ...userStore.my.profile.friends]; // else if (table === 'mygroups') @@ -1251,6 +1253,7 @@ export const useGlobalStore = defineStore('GlobalStore', { this.clearDataAfterLoginOnlyIfActiveConnection(); await userStore.loadListaEditori(); + await userStore.loadListaReferenti(); await globalroutines('readall', 'config', null); @@ -2510,6 +2513,7 @@ export const useGlobalStore = defineStore('GlobalStore', { shared_consts.Permissions.Teacher, shared_consts.Permissions.Facilitatore, shared_consts.Permissions.Editor, + shared_consts.Permissions.Commerciale, shared_consts.Permissions.Zoomeri, shared_consts.Permissions.Department, shared_consts.Permissions.Grafico, diff --git a/src/views/ecommerce/catalogo/catalogo.scss b/src/views/ecommerce/catalogo/catalogo.scss index d7170c17..b316e7b8 100755 --- a/src/views/ecommerce/catalogo/catalogo.scss +++ b/src/views/ecommerce/catalogo/catalogo.scss @@ -117,7 +117,7 @@ body { height: calc(380 * var(--scalecatalogy) * 1px); line-height: 130%; - font-weight: bold; + font-weight: normal; padding: 8px; border-radius: 20px; diff --git a/src/views/ecommerce/catalogo/catalogo.ts b/src/views/ecommerce/catalogo/catalogo.ts index 10bedeb0..f6318352 100755 --- a/src/views/ecommerce/catalogo/catalogo.ts +++ b/src/views/ecommerce/catalogo/catalogo.ts @@ -1123,6 +1123,12 @@ export default defineComponent({ } } + async function lista_Aggiornata() { + myCatalog.value.data_lista_updated = tools.getDateNow(); + myCatalog.value.username_lista_updated = userStore.my.username; + await saveCatalog(); + } + async function saveCatalog() { const catalog = myCatalog.value; const mydata = { @@ -1519,6 +1525,8 @@ export default defineComponent({ const productIds = myarr.map((product) => product._id); let mydata = { + data_lista_updated: tools.getDateNow(), + username_lista_updated: userStore.my.username, lista_prodotti: productIds, }; @@ -1535,6 +1543,8 @@ export default defineComponent({ if (ricarica) { generatearrProdToViewSorted(true, false); } + + // lista_Aggiornata(); } /*function getProducts() { @@ -2509,7 +2519,6 @@ export default defineComponent({ catalog.data_generato = tools.getDateNow(); } - } else { strout.value = JSON.stringify(ris, null, 2); } diff --git a/src/views/ecommerce/catalogo/catalogo.vue b/src/views/ecommerce/catalogo/catalogo.vue index 2a5cafa4..916b5cc3 100755 --- a/src/views/ecommerce/catalogo/catalogo.vue +++ b/src/views/ecommerce/catalogo/catalogo.vue @@ -11,7 +11,7 @@ v-if=" ispageCatalogata && !optcatalogo.showOnlyCatalogoPDF && - (tools.isEditor() || tools.isCommerciale()) && + (tools.isCollaboratore()) && myCatalog?.referenti?.length > 0 " class="text-h7 text-center text-red q-ma-sm" @@ -183,7 +183,7 @@