diff --git a/.env b/.env index 8958e85e..72feed33 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -VITE_APP_VERSION="1.2.35" +VITE_APP_VERSION="1.2.37" VITE_LANG_DEFAULT="it" VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -VITE_SERVICE_WORKER_FILE="sw-1.2.35.js" +VITE_SERVICE_WORKER_FILE="sw-1.2.37.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 edf9fea3..07f6c781 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + diff --git a/package.json b/package.json index 9dbf590e..d7f3ef21 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.35", + "version": "1.2.37", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.35' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.37' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.37' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.37' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.35' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.37' 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.35' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.35' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.37' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.37' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", @@ -41,6 +41,7 @@ "@vuelidate/validators": "^2.0.4", "acorn": "^8.14.1", "animate.css": "^4.1.1", + "apexcharts": "^4.7.0", "autoprefixer": "^10.4.21", "axios": "^1.8.4", "bcryptjs": "^3.0.2", @@ -87,6 +88,7 @@ "vue-svgicon": "^4.0.0-alpha.3", "vue-timeago3": "^2.3.2", "vue2-dragula": "^2.5.5", + "vue3-apexcharts": "^1.8.0", "vue3-pdf-app": "^1.0.3", "vue3-qr-reader": "^1.0.0", "vuedraggable": "^4.1.0", diff --git a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json index 1982b5f5..c3929110 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.35", + "version": "1.2.37", "description": "Comunita Nuovo Mondo", "productName": "ComunitaNuovoMondo", "author": "Surya", @@ -9,7 +9,7 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.35' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.37' 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.35' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.35' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.37' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.37' 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/db/static_data.ts b/scripts/_ALL_SITES/freeplanet.app/db/static_data.ts index be232fb1..43768619 100755 --- a/scripts/_ALL_SITES/freeplanet.app/db/static_data.ts +++ b/scripts/_ALL_SITES/freeplanet.app/db/static_data.ts @@ -110,65 +110,6 @@ const routes_admin: IListRoutes[] = [ } ] -const routes_newsletter: IListRoutes[] = [ - { - active: true, - order: 10, - name: 'newsletter.template', path: '/admin/newsletter/templemail', materialIcon: 'fas fa-users', - component: () => import('@src/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true - }, - { - active: true, - order: 20, - name: 'newsletter.sendemail', path: '/admin/newsletter/newnewsletter', materialIcon: 'fas fa-users', - component: () => import('@src/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true - }, - { - active: true, - order: 30, - name: 'newsletter.check', path: '/admin/newsletter/check', materialIcon: 'fas fa-users', - component: () => import('@src/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true - }, - { - active: true, - order: 40, - name: 'newsletter.sent', path: '/admin/newsletter/newslist', materialIcon: 'fas fa-users', - component: () => import('@src/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true - }, - { - active: true, - order: 50, - name: 'newsletter.mailinglist', path: '/admin/newsletter/mailinglist', materialIcon: 'fas fa-users', - component: () => import('@src/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true - }, - { - active: true, - order: 60, - name: 'newsletter.settings', path: '/admin/newsletter/settings', materialIcon: 'fas fa-users', - component: () => import('@src/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true - }, - { - active: true, - order: 70, - name: 'newsletter.serversettings', path: '/admin/newsletter/main_settings', materialIcon: 'fas fa-users', - component: () => import('@src/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true - }, - { - active: true, - order: 80, - name: 'newsletter.others', path: '/admin/newsletter/events', materialIcon: 'fas fa-users', - component: () => import('@src/rootgen/admin/newsletter/newsletter.vue'), - inmenu: true, submenu: true, level_parent: 0.5, level_child: 0.5, onlyManager: true - } -] - const routes_manager: IListRoutes[] = [ { active: functionality.BOOKING_EVENTS, @@ -280,7 +221,7 @@ const routes_manager: IListRoutes[] = [ faIcon: 'fa fa-list-alt', materialIcon: 'fas fa-users', name: 'otherpages.admin.newsletter', - routes2: routes_newsletter, + routes2: [], inmenu: false, submenu: true, level_parent: 0.5, diff --git a/scripts/_ALL_SITES/freeplanet.app/package.json b/scripts/_ALL_SITES/freeplanet.app/package.json index 52b82461..55673c6a 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.35", + "version": "1.2.37", "description": "freeplanet", "productName": "freeplanet", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8087 APP_VERSION='1.2.35' quasar dev", + "dev": "PORT=8087 APP_VERSION='1.2.37' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.37' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.37' 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.35' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.35' quasar dev", + "pwa": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.37' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.37' 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 8f36f001..d7f3ef21 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.35", + "version": "1.2.37", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.35' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.37' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.37' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.37' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.35' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.37' 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.35' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.35' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.37' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.37' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", @@ -32,6 +32,7 @@ "@cubejs-client/core": "^1.2.26", "@quasar/extras": "^1.16.17", "@quasar/quasar-ui-qcalendar": "^4.1.2", + "@syncfusion/ej2-vue-pdfviewer": "^29.1.40", "@types/jsbarcode": "^3.11.4", "@types/leaflet": "^1.9.17", "@vue/compat": "^3.5.13", @@ -40,6 +41,7 @@ "@vuelidate/validators": "^2.0.4", "acorn": "^8.14.1", "animate.css": "^4.1.1", + "apexcharts": "^4.7.0", "autoprefixer": "^10.4.21", "axios": "^1.8.4", "bcryptjs": "^3.0.2", @@ -86,6 +88,7 @@ "vue-svgicon": "^4.0.0-alpha.3", "vue-timeago3": "^2.3.2", "vue2-dragula": "^2.5.5", + "vue3-apexcharts": "^1.8.0", "vue3-pdf-app": "^1.0.3", "vue3-qr-reader": "^1.0.0", "vuedraggable": "^4.1.0", diff --git a/scripts/_ALL_SITES/gruppomacro.app/src/db/lang/ws_it.js b/scripts/_ALL_SITES/gruppomacro.app/src/db/lang/ws_it.js index 8e3eba27..309d6265 100755 --- a/scripts/_ALL_SITES/gruppomacro.app/src/db/lang/ws_it.js +++ b/scripts/_ALL_SITES/gruppomacro.app/src/db/lang/ws_it.js @@ -75,6 +75,7 @@ const msg_website_it = { eventodef: 'Evento:', prova: 'prova', dbop: 'Operazioni', + dbopmacro: 'Operazioni Macro', projall: 'Comunitari', groups: 'Lista Gruppi', projectsShared: 'Condivisi da me', diff --git a/scripts/_ALL_SITES/kolibrilab.it/package.json b/scripts/_ALL_SITES/kolibrilab.it/package.json index 0e03d24d..e8b2becf 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.35", + "version": "1.2.37", "description": "kolibrilab", "productName": "kolibrilab", "author": "Surya Paolo", @@ -8,11 +8,11 @@ "keywords": [], "license": "MIT", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.35' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.37' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.37' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.37' 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.35' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.35' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.37' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.37' 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/piuchebuono.app/package.json b/scripts/_ALL_SITES/piuchebuono.app/package.json index 7d455e47..bf10d0cf 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.35", + "version": "1.2.37", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8085 APP_VERSION='1.2.35' quasar dev", + "dev": "PORT=8085 APP_VERSION='1.2.37' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.37' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.37' 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.35' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.35' quasar dev", + "pwa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.37' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.37' 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 7af90eae..6f3461e4 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.35", + "version": "1.2.37", "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.35' PORT=8084 quasar dev", + "dev": "APP_VERSION='1.2.37' PORT=8084 quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.35' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.37' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.37' 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.35' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.35' quasar dev", + "pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.37' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.37' 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/public/images/logo.png b/scripts/_ALL_SITES/riso.app/public/images/logo.png new file mode 100644 index 00000000..51a29654 Binary files /dev/null and b/scripts/_ALL_SITES/riso.app/public/images/logo.png differ diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index e87d21cf..4851f5cc 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.35"; +const VITE_APP_VERSION = "1.2.37"; // Costanti di configurazione const DYNAMIC_CACHE = 'dynamic-cache-v2'; diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 2be1cdef..376eadc1 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -326,6 +326,7 @@ export const shared_consts = { TABLES_MYGROUPS: 'mygroups', TABLES_ATTIVITAS: 'attivitas', TABLES_CATALOG: 'catalogs', + TABLES_LISTA_EDITORI: 'lista_editori', TABFILTRI_UTENTE: 'filtriutente', @@ -1110,6 +1111,12 @@ export const shared_consts = { icon: 'fas fa-paint-brush', color: 'green', }, + Commerciale: { + value: 256, + label: 'dashboard.Commerciale', + icon: 'fas fa-briefcase', + color: 'brown', + }, }, MessageOptions: { @@ -2487,6 +2494,21 @@ export const shared_consts = { VISU_SEARCHPROD_MODE: { VISU: 0, INSERT: 1, - } + }, + + DESTNEWSLETTER: { + LISTA_NEWSLETTER: 0, + UTENTI: 1, + DIARIO: 2, + TEST: 10, + }, + + DESTNEWSLETTER_ARRAY: [ + {value: 0, label: 'LISTA_NEWSLETTER'}, + {value: 1, label: 'UTENTI'}, + {value: 2, label: 'DIARIO'}, + {value: 10, label: 'TEST'}, + ], + } diff --git a/src/components/CCatalogoCard/CCatalogoCard.vue b/src/components/CCatalogoCard/CCatalogoCard.vue index 564dfc3f..778e935e 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.vue +++ b/src/components/CCatalogoCard/CCatalogoCard.vue @@ -155,7 +155,7 @@ /> - Modifica Trafiletto + Modifica Sinossi @@ -180,7 +180,7 @@ --> rec.table === table) + if (rec) { + tools.setCookie(tools.COOK_SEARCH + costanti.FILTER_SEP + table + costanti.FILTER_SEP + 'referente', rec.value) + } // setCategBySector('sectorgoods', table, newval) } else if (table === shared_consts.TAB_CITIES) { const rec = searchList.value.find((myrec) => myrec.table === shared_consts.TAB_CITIES) // check if exist diff --git a/src/components/CModifTrafiletto/CModifTrafiletto.vue b/src/components/CModifTrafiletto/CModifTrafiletto.vue index cfe5f22a..5781c383 100755 --- a/src/components/CModifTrafiletto/CModifTrafiletto.vue +++ b/src/components/CModifTrafiletto/CModifTrafiletto.vue @@ -40,6 +40,7 @@ > Cataloghi + - @@ -358,10 +358,6 @@ - - - - + +
+ +
+
diff --git a/src/components/CMyFieldDb/CMyFieldDb.ts b/src/components/CMyFieldDb/CMyFieldDb.ts index 19f4c979..1555c618 100755 --- a/src/components/CMyFieldDb/CMyFieldDb.ts +++ b/src/components/CMyFieldDb/CMyFieldDb.ts @@ -143,7 +143,7 @@ export default defineComponent({ const globalStore = useGlobalStore() const col = ref({ - name: 'test', fieldtype: 0, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView, visible: true, maxlength: props.maxlength, minlength: props.minlength + name: 'test', fieldtype: 0, showWhen: costanti.showWhen.NewRec + costanti.showWhen.InEdit + costanti.showWhen.InView, visible: true, maxlength: props.maxlength, minlength: props.minlength, label_trans: '' }) const row = ref({}) diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue index 5f55b614..2961a1a2 100755 --- a/src/components/CMyPopupEdit/CMyPopupEdit.vue +++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue @@ -883,9 +883,9 @@ @update:value="changevalRec" @update:model-value="Savedb" :newvaluefunc="addNewValue" - :filter_table="col.filter_table" - :addnone="col.addnone" - :filter_field="col.filter_field" + :filter_table="col?.filter_table" + :addnone="col?.addnone" + :filter_field="col?.filter_field" :value_extra="value_extra" :optval="fieldsTable.getKeyByTable(col.jointable)" :optlab="fieldsTable.getLabelByTable(col.jointable)" @@ -1105,7 +1105,7 @@ @update:model-value="changevalRec" :maxlength="col.maxlength ? col.maxlength : undefined" type="password" - @keyup.enter="scope.set" + @keyup.enter="changevalRec" autofocus > @@ -1320,10 +1320,10 @@ :type_out="col.field_outtype" :col="col" :row="row" - :label="col.label ? col.label : t(col.label_trans)" + :label="col.label ? col.label : col.label_trans ? t(col.label_trans) : undefined" v-model:value="scope.value" :pickup="col.fieldtype === costanti.FieldType.select_by_server" - :addnone="col.addnone" + :addnone="col?.addnone" :tablesel="col.fieldtype === costanti.FieldType.select_by_server ? tablesel : undefined" :filter_table="col.filter_table" :filter_field="col.filter_field" diff --git a/src/components/CMySelect/CMySelect.vue b/src/components/CMySelect/CMySelect.vue index 863d694f..41737225 100755 --- a/src/components/CMySelect/CMySelect.vue +++ b/src/components/CMySelect/CMySelect.vue @@ -248,7 +248,7 @@ @update:model-value="changeval" @filter="filterFn" :behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'" - :label="addstrrequired + label" + :label="label ? addstrrequired + label : undefined" :use-input="useinput" @new-value="newvaluefuncfirst" emit-value diff --git a/src/components/CProductTable/CProductTable.ts b/src/components/CProductTable/CProductTable.ts index 52c7edd1..9d54ff96 100755 --- a/src/components/CProductTable/CProductTable.ts +++ b/src/components/CProductTable/CProductTable.ts @@ -126,7 +126,7 @@ export default defineComponent({ { name: "name", label: "Titolo del Libro", field: "name", align: "left" }, { name: "authors", label: "Autore", field: "authors", align: "left" }, { name: "isbn", label: "ISBN", field: "isbn", align: "left" }, - { name: "trafiletto", label: "Trafiletto", field: "trafiletto", align: "left" }, + { name: "trafiletto", label: "Sinossi", field: "trafiletto", align: "left" }, { name: "catprods", label: "Argomento", field: "catprods", align: "left" }, { name: "edizione", label: "Edizione", field: "edizione", align: "left" }, { name: "casaeditrice", label: "Casa Editrice", field: "casaeditrice", align: "left" }, diff --git a/src/components/CSchedaProdotto/CSchedaProdotto.ts b/src/components/CSchedaProdotto/CSchedaProdotto.ts index 9753cd46..35123e03 100755 --- a/src/components/CSchedaProdotto/CSchedaProdotto.ts +++ b/src/components/CSchedaProdotto/CSchedaProdotto.ts @@ -216,7 +216,7 @@ export default defineComponent({ const arrlist: IRecFields[] = [ { editOn: true, - label: "Descrizione Trafiletto per Catalogo", + label: "Descrizione Sinossi per Catalogo", title: myproduct.value?.productInfo?.name, table: "productinfos", id: myproduct.value.productInfo._id, // ID dinamico, da sostituire con il valore reale diff --git a/src/components/CStatMacro/CStatMacro.scss b/src/components/CStatMacro/CStatMacro.scss new file mode 100755 index 00000000..e69de29b diff --git a/src/components/CStatMacro/CStatMacro.ts b/src/components/CStatMacro/CStatMacro.ts new file mode 100755 index 00000000..b1c77558 --- /dev/null +++ b/src/components/CStatMacro/CStatMacro.ts @@ -0,0 +1,35 @@ +import Vue, { computed, defineComponent, onMounted, ref } from 'vue' + +import { tools } from '../../store/Modules/tools' +import { useUserStore } from '@store/UserStore' +import { useRouter } from 'vue-router' +import { useGlobalStore } from '@store/globalStore' +import { useI18n } from 'vue-i18n' +import { useQuasar } from 'quasar' + +import type { ChartItem, ChartConfiguration } from 'chart.js'; +import { Chart, BarController, BarElement, LineController, LinearScale, CategoryScale, PointElement, LineElement, Title } from 'chart.js'; + + +export default defineComponent({ + name: 'CStatMacro', + components: {}, + setup(props, { emit }) { + + const userStore = useUserStore() + const globalStore = useGlobalStore() + const { t } = useI18n() + const q = useQuasar() + + function mounted() { + + } + + onMounted(mounted) + + return { + tools, + q, + } + }, +}) diff --git a/src/components/CStatMacro/CStatMacro.vue b/src/components/CStatMacro/CStatMacro.vue new file mode 100755 index 00000000..0d5374d4 --- /dev/null +++ b/src/components/CStatMacro/CStatMacro.vue @@ -0,0 +1,12 @@ + + + + + diff --git a/src/components/CStatMacro/index.ts b/src/components/CStatMacro/index.ts new file mode 100755 index 00000000..fb82ea6b --- /dev/null +++ b/src/components/CStatMacro/index.ts @@ -0,0 +1 @@ +export {default as CStatMacro} from './CStatMacro.vue' diff --git a/src/components/FormNewsletter/FormNewsletter.ts b/src/components/FormNewsletter/FormNewsletter.ts index 4087235f..06655625 100755 --- a/src/components/FormNewsletter/FormNewsletter.ts +++ b/src/components/FormNewsletter/FormNewsletter.ts @@ -26,6 +26,11 @@ export default defineComponent({ type: String, default: '', }, + tipodest: { + required: false, + type: Number, + default: 0, + }, accept: { required: false, type: Boolean, @@ -51,6 +56,7 @@ export default defineComponent({ const email = toRef(props, 'email') const idwebsite = toRef(props, 'idwebsite') const locale = toRef(props, 'locale') + const tipodest = toRef(props, 'tipodest') const onSubmit = async function a2() { if (!accept.value) { @@ -67,6 +73,7 @@ export default defineComponent({ firstName: name.value, lastName: surname.value, idwebsite: idwebsite.value, + tipodest: tipodest.value, locale: locale.value, settomailchimp: toolsext.getValDb('MAILCHIMP_ON', true, false), } @@ -114,9 +121,19 @@ export default defineComponent({ accept.value = false } + function optionsDest() { + return [ + { label: 'Lista Newsletter', value: 0 }, + { label: 'Utenti', value: 1 }, + { label: 'Diario', value: 2 }, + { label: 'Test', value: 10 }, + ]; + } + return { onSubmit, onReset, + optionsDest, } }, diff --git a/src/components/FormNewsletter/FormNewsletter.vue b/src/components/FormNewsletter/FormNewsletter.vue index 1681d8df..a134c22a 100755 --- a/src/components/FormNewsletter/FormNewsletter.vue +++ b/src/components/FormNewsletter/FormNewsletter.vue @@ -1,66 +1,110 @@ - + diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue index f74b2674..7e46d7ac 100755 --- a/src/components/MyHeader/MyHeader.vue +++ b/src/components/MyHeader/MyHeader.vue @@ -188,12 +188,15 @@
Consiglio
-
+
Segreteria
-
+
Editore
+
+ Commerciale +
Facilitatore
diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts index b6f45f34..39fadeb0 100755 --- a/src/layouts/menuone/menuOne.ts +++ b/src/layouts/menuone/menuOne.ts @@ -93,6 +93,7 @@ export default defineComponent({ if (elem.onlyDepartment) menu += ' isDepartment' if (elem.onlyFacilitatore) menu += ' isFacilitatore' if (elem.onlyEditor) menu += ' isEditor' + if (elem.onlyCommerciale) menu += ' isCommerciale' if (elem.onlyGrafico) menu += ' isGrafico' } diff --git a/src/model/CatalogStore.ts b/src/model/CatalogStore.ts index 28243f8c..955eb477 100755 --- a/src/model/CatalogStore.ts +++ b/src/model/CatalogStore.ts @@ -40,6 +40,7 @@ export interface ICatalog { date_updated?: Date, lista_prodotti?: IProduct[] + isCatalogoGenerale?: boolean } export interface ICatalogState { diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 5700c1e6..1b81cede 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -85,6 +85,12 @@ export interface ITemplEmail { options?: ISettings[] } +export interface IDestNewsletter { + _id?: string + descr?: string + tipodest_id?: number +} + export interface ISettings { _id?: string idapp?: string @@ -372,6 +378,7 @@ export interface INewsToSent { label?: string activate?: boolean templemail_str?: string + destnewsletter_str?: string numemail_tot?: number numemail_sent?: number datetoSent?: Date @@ -495,6 +502,7 @@ export interface IGlobalState { myelems: IMyElem[], myschedas: ISchedaSingola[], templemail: ITemplEmail[], + destnewsletter?: IDestNewsletter[], opzemail: ISettings[], mailinglist: IMailinglist[], calzoom: ICalZoom[], @@ -589,6 +597,7 @@ export interface IListRoutes { onlyFacilitatore?: boolean color?: string onlyEditor?: boolean + onlyCommerciale?: boolean onlyGrafico?: boolean extraclass?: string meta?: any diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts index f93562f3..90d50adb 100755 --- a/src/model/UserStore.ts +++ b/src/model/UserStore.ts @@ -291,6 +291,7 @@ export interface IUserState { isTratuttrici?: boolean isEditor?: boolean isGrafico?: boolean + isCommerciale?: boolean isTeacher?: boolean usersList?: IUserFields[] countusers?: number diff --git a/src/rootgen/admin/newsletter/newsletter.ts b/src/rootgen/admin/newsletter/newsletter.ts index a0c6af7f..511147ff 100755 --- a/src/rootgen/admin/newsletter/newsletter.ts +++ b/src/rootgen/admin/newsletter/newsletter.ts @@ -7,7 +7,8 @@ import { coltemplemail, colopzemail, colmailinglist, - colmsg_templates, fieldsTable + colmsg_templates, fieldsTable, + coldestnewsletter } from '@src/store/Modules/fieldsTable' import type { INewsState } from '@src/model/index'; import { DefaultNewsState } from '@src/model/index' @@ -92,7 +93,8 @@ export default defineComponent({ label: 'Newsletter creata il ' + tools.getstrDateTimeAll(tools.getDateNow()), activate: true, datetoSent: tools.addMinutes(tools.getDateNow(), minuti), - templemail_str: globalStore.gettemplemailbyId(getValDb('TEMPLEMAIL_ID', true)) + templemail_str: globalStore.gettemplemailbyId(getValDb('TEMPLEMAIL_ID', true)), + destnewsletter_str: globalStore.getdestnewsletterbyId(getValDb('TEMPLEMAIL_DEST', true)), } await tools.createNewRecord($q, 'newstosent', mynews).then((myrecris) => { // reload data @@ -110,23 +112,25 @@ export default defineComponent({ console.log('Newsletter load') myloadingload.value = true const myris = await userStore.newsletterload(true) - newsstate.value = myris.newsstate + if (myris) { + newsstate.value = myris.newsstate - // console.log('newsstate') - // console.table('globalStore.serv_settings', globalStore.serv_settings) + // console.log('newsstate') + // console.table('globalStore.serv_settings', globalStore.serv_settings) - percsubscribed.value = newsstate.value.totsubscribed / newsstate.value.totemail + percsubscribed.value = newsstate.value.totsubscribed / newsstate.value.totemail - if (newsstate.value.lastnewstosent) - eseguipolling.value = (eseguipolling.value || newsstate.value.lastnewstosent.starting_job! && !newsstate.value.lastnewstosent.finish_job!) + if (newsstate.value.lastnewstosent) + eseguipolling.value = (eseguipolling.value || newsstate.value.lastnewstosent.starting_job! && !newsstate.value.lastnewstosent.finish_job!) - if (newsstate.value.nextnewstosent) - eseguipolling.value = eseguipolling.value || true + if (newsstate.value.nextnewstosent) + eseguipolling.value = eseguipolling.value || true - // console.log('eseguipolling', eseguipolling) - myloadingload.value = false + // console.log('eseguipolling', eseguipolling) + myloadingload.value = false - checkifpolling() + checkifpolling() + } } function DisableNewsletter() { @@ -202,6 +206,10 @@ export default defineComponent({ return colnewstosent } + function getcoldestnewsletter() { + return coldestnewsletter + } + function getcolmailinglist() { return colmailinglist } @@ -302,6 +310,7 @@ export default defineComponent({ fieldsTable, globalStore, idparam, + getcoldestnewsletter, } } }) diff --git a/src/rootgen/admin/newsletter/newsletter.vue b/src/rootgen/admin/newsletter/newsletter.vue index 4c7ba1a6..a118c3fb 100755 --- a/src/rootgen/admin/newsletter/newsletter.vue +++ b/src/rootgen/admin/newsletter/newsletter.vue @@ -1,61 +1,163 @@