@@ -268,6 +268,7 @@
v-slot="scope">
+ Boolean:
{{ visuValByType(myvalue, col, row) }}
@@ -307,7 +308,7 @@
@@ -319,7 +320,7 @@
v-model:value="myvalue"
:optval="fieldsTable.getKeyByTable(col.jointable)"
:optlab="fieldsTable.getLabelByTable(col.jointable)"
- :options="fieldsTable.getTableJoinByName(col.jointable)"
+ :options="globalStore.getTableJoinByName(col.jointable)"
:useinput="false">
@@ -377,7 +378,7 @@
:display-value="fieldsTable.getTitleByTable(col.jointable)"
emit-value
map-options
- :options="fieldsTable.getTableJoinByName(col.jointable)"
+ :options="globalStore.getTableJoinByName(col.jointable)"
:option-label="fieldsTable.getLabelByTable(col.jointable)"
:option-value="fieldsTable.getKeyByTable(col.jointable)"
style="min-width: 150px"
diff --git a/src/components/CMyToggleList/CMyToggleList.vue b/src/components/CMyToggleList/CMyToggleList.vue
index e42f5cba..e5a1b402 100755
--- a/src/components/CMyToggleList/CMyToggleList.vue
+++ b/src/components/CMyToggleList/CMyToggleList.vue
@@ -6,7 +6,7 @@
:label="rec.label"
:color="tools.getColorByIndexBest(index)"
keep-color
- @input="changeval">
+ @update:model-value="changeval">
diff --git a/src/db/static_data.ts b/src/db/static_data.ts
index d1a89c8a..54a904b6 100755
--- a/src/db/static_data.ts
+++ b/src/db/static_data.ts
@@ -109,6 +109,177 @@ const routes_admin: IListRoutes[] = [
}
]
+const routes_manager: IListRoutes[] = [
+ {
+ active: functionality.BOOKING_EVENTS,
+ order: 70,
+ path: '/admin/usereventlist',
+ materialIcon: 'edit',
+ name: 'otherpages.admin.usereventlist',
+ component: () => import('@/rootgen/admin/eventlist/eventlist.vue'),
+ inmenu: true,
+ submenu: true,
+ level_parent: 0,
+ level_child: 0.5,
+ infooter: true,
+ onlyManager: true,
+ onlyConsiglio: true,
+ onlyAdmin: true
+ },
+ {
+ active: true,
+ order: 10,
+ path: '/admin/userlist',
+ materialIcon: 'fas fa-users',
+ name: 'otherpages.admin.userlist',
+ component: () => import('@/rootgen/admin/usersList/usersList.vue'),
+ inmenu: true,
+ submenu: true,
+ level_parent: 0,
+ level_child: 0.5,
+ onlyManager: true,
+ onlyTutor: true
+ },
+ /*
+ {
+ active: true,
+ order: 10,
+ path: '/admin/iscritticonacreis',
+ materialIcon: 'fas fa-users',
+ name: 'otherpages.admin.iscritticonacreis',
+ component: () => import('@/rootgen/admin/iscritticonacreis/iscritticonacreis.vue'),
+ inmenu: true,
+ submenu: true,
+ level_parent: 0,
+ level_child: 0.5,
+ onlyManager: true,
+ onlyTutor: true
+ },
+
+ */
+ {
+ active: true,
+ order: 10,
+ path: '/admin/zoomlist',
+ materialIcon: 'fas fa-users',
+ name: 'otherpages.admin.zoomlist',
+ component: () => import('@/rootgen/admin/zoomList/zoomList.vue'),
+ inmenu: true,
+ submenu: true,
+ level_parent: 0,
+ level_child: 0.5,
+ onlyManager: true,
+ onlyTutor: false
+ },
+ {
+ active: true,
+ order: 27,
+ path: '/admin/tableslist',
+ materialIcon: 'fas fa-users',
+ name: 'otherpages.admin.tableslist',
+ component: () => import('@/rootgen/admin/tablesList/tablesList.vue'),
+ inmenu: true,
+ submenu: true,
+ level_parent: 0,
+ level_child: 0.5,
+ onlyAdmin: true,
+ onlyManager: true
+ },
+ {
+ active: true,
+ order: 30,
+ path: '/admin/pages',
+ materialIcon: 'fas fa-file-alt',
+ name: 'otherpages.admin.pages',
+ component: () => import('@/rootgen/admin/pages/pages.vue'),
+ inmenu: true,
+ submenu: true,
+ level_parent: 0,
+ level_child: 0.5,
+ onlyManager: true,
+ onlyEditor: true
+ },
+ /*{
+ active: true,
+ path: '/admin/newsletter',
+ order: 60,
+ faIcon: 'fa fa-list-alt',
+ materialIcon: 'fas fa-users',
+ name: 'otherpages.admin.newsletter',
+ routes2: routes_newsletter,
+ inmenu: false,
+ submenu: true,
+ level_parent: 0.5,
+ level_child: 0.5,
+ solotitle: true,
+ onlyAdmin: true,
+ onlyManager: true
+ },
+ {
+ active: functionality.ENABLE_ECOMMERCE,
+ path: '/admin/ecommerce',
+ order: 31,
+ faIcon: 'fa fa-list-alt',
+ materialIcon: 'next_week',
+ name: 'pages.admin_ecommerce',
+ routes2: routes_admin_ecommerce,
+ inmenu: false,
+ submenu: true,
+ level_parent: 0.5,
+ level_child: 0.5,
+ solotitle: true,
+ onlyAdmin: true,
+ onlyManager: true,
+ onlyDepartment: true
+ },
+
+ */
+ {
+ active: true,
+ order: 35,
+ path: '/admin/msg_template',
+ materialIcon: 'fas fa-file-alt',
+ name: 'msgs.messages',
+ component: () => import('@/rootgen/admin/msg_template/msg_template.vue'),
+ inmenu: true,
+ submenu: true,
+ level_parent: 0,
+ level_child: 0.5,
+ onlyAdmin: true,
+ onlyManager: true
+ // onlyTutor: true
+ },
+ {
+ active: true,
+ order: 40,
+ path: '/admin/gallery',
+ materialIcon: 'fas fa-file-alt',
+ name: 'otherpages.admin.gallery',
+ component: () => import('@/rootgen/admin/gallery/gallery.vue'),
+ inmenu: true,
+ submenu: true,
+ level_parent: 0,
+ level_child: 0.5,
+ onlyAdmin: true,
+ onlyManager: true
+ },
+ {
+ active: true,
+ order: 50,
+ path: '/admin/media',
+ materialIcon: 'fas fa-file-alt',
+ name: 'otherpages.admin.media',
+ component: () => import('@/rootgen/admin/uploader/uploader.vue'),
+ inmenu: true,
+ submenu: true,
+ level_parent: 0,
+ level_child: 0.5,
+ onlyAdmin: true,
+ onlyManager: true
+ },
+]
+
+
const baseroutes: IListRoutes[] = [
{
active: true,
@@ -175,6 +346,22 @@ const baseroutes: IListRoutes[] = [
onlyAdmin: true
},
...routes_admin,
+ {
+ active: true,
+ order: 2110,
+ path: '/manage',
+ materialIcon: 'fas fa-users-cog',
+ name: 'otherpages.manage.menu',
+ inmenu: true,
+ routes2: routes_manager,
+ solotitle: true,
+ infooter: true,
+ onlyAdmin: true,
+ onlyManager: true,
+ onlyTutor: true,
+ onlyEditor: true
+ },
+ ...routes_manager,
{
active: true,
order: 1000,
@@ -274,12 +461,14 @@ const lang_available: ILang[] = [
{
label: 'Italiano', icon: 'fa-flag-it', value: 'it', image: '../images/it.png', short: 'IT',
},
- {
+ /*{
label: 'English', icon: 'fa-flag-us', value: 'enUs', image: '../images/gb.png', short: 'EN',
},
{
label: 'Español', icon: 'fa-flag-es', value: 'es', image: '../images/es.png', short: 'ES',
},
+
+ */
// { label: 'Français', icon: 'fa-facebook', value: 'fr', image: '../public/images/fr.png', short: 'FR' }
// { label: 'German', icon: 'fa-flag-de', value: 'de', image: '../public/images/de.png', short: 'DE' },
]
diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts
index 5a45329f..63805c5b 100755
--- a/src/layouts/menuone/menuOne.ts
+++ b/src/layouts/menuone/menuOne.ts
@@ -19,10 +19,12 @@ export default defineComponent({
const route = useRoute()
const globalStore = useGlobalStore()
+ const finishLoading = computed(() => globalStore.finishLoading)
+
const path = computed(() => route.path)
function getmenu(): any {
- // console.log('getmenu menuOne!')
+ console.log('getmenu menuOne!')
return globalStore.getmenu
}
@@ -44,11 +46,6 @@ export default defineComponent({
})
})
- function isfinishLoading() {
- const globalStore = useGlobalStore()
- return globalStore.finishLoading
- }
-
/* function replaceUnderlineToSpace(text: string) {
while (text.indexOf('_') !== -1) {
text = text.replace('_', ' ')
@@ -85,7 +82,7 @@ export default defineComponent({
return {
getmenu,
- isfinishLoading,
+ finishLoading,
getmymenuclass,
getroute,
static_data,
diff --git a/src/layouts/menuone/menuOne.vue b/src/layouts/menuone/menuOne.vue
index 36cdfddb..8920f9e1 100755
--- a/src/layouts/menuone/menuOne.vue
+++ b/src/layouts/menuone/menuOne.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/root/mypage/mypage.ts b/src/root/mypage/mypage.ts
index a73578c4..c1876076 100755
--- a/src/root/mypage/mypage.ts
+++ b/src/root/mypage/mypage.ts
@@ -2,6 +2,7 @@ import { defineComponent, ref, onMounted, watch, computed } from 'vue'
import { useGlobalStore } from '@store/globalStore'
import { useRoute } from 'vue-router'
+import MixinMetaTags from '@/mixins/mixin-metatags'
export default defineComponent({
name: 'Mypage',
@@ -11,9 +12,14 @@ export default defineComponent({
const route = useRoute()
const path = computed(() => route.path)
+ const isfinishLoading = computed(() => globalStore.finishLoading)
+
+ const { setmeta } = MixinMetaTags()
+
async function created() {
- // console.log('this.$route.path', this.$route.path)
+ console.log('MyPage created')
rec.value = await globalStore.loadPage(route.path)
+
// console.log('mounted', this.rec)
}
@@ -25,10 +31,12 @@ export default defineComponent({
// return tools.metafunc(this)
}
- onMounted(created)
+ created()
return {
rec,
+ setmeta,
+ isfinishLoading,
}
},
})
diff --git a/src/root/mypage/mypage.vue b/src/root/mypage/mypage.vue
index 67265b9c..c241c781 100755
--- a/src/root/mypage/mypage.vue
+++ b/src/root/mypage/mypage.vue
@@ -1,7 +1,7 @@
-
+
{{
setmeta({
diff --git a/src/rootgen/admin/departments/departments.vue b/src/rootgen/admin/departments/departments.vue
index 22398b46..2b100fda 100755
--- a/src/rootgen/admin/departments/departments.vue
+++ b/src/rootgen/admin/departments/departments.vue
@@ -1,5 +1,5 @@
-
+
{{
setmeta({
title: 'Uffici',
diff --git a/src/rootgen/admin/eventlist/eventlist.vue b/src/rootgen/admin/eventlist/eventlist.vue
index 573dc9e2..30af8fa3 100755
--- a/src/rootgen/admin/eventlist/eventlist.vue
+++ b/src/rootgen/admin/eventlist/eventlist.vue
@@ -1,6 +1,6 @@
diff --git a/src/rootgen/admin/gallery/gallery.vue b/src/rootgen/admin/gallery/gallery.vue
index c676c621..12a2c199 100755
--- a/src/rootgen/admin/gallery/gallery.vue
+++ b/src/rootgen/admin/gallery/gallery.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/rootgen/admin/groups/groups.vue b/src/rootgen/admin/groups/groups.vue
index 9fe1244f..6e6e071e 100755
--- a/src/rootgen/admin/groups/groups.vue
+++ b/src/rootgen/admin/groups/groups.vue
@@ -1,5 +1,5 @@
-
+
{{
setmeta({
title: 'Gruppi',
diff --git a/src/rootgen/admin/msg_template/msg_template.vue b/src/rootgen/admin/msg_template/msg_template.vue
index d1b2ac0c..ec346f1c 100755
--- a/src/rootgen/admin/msg_template/msg_template.vue
+++ b/src/rootgen/admin/msg_template/msg_template.vue
@@ -1,6 +1,6 @@
{{
setmeta({
diff --git a/src/rootgen/admin/orders/orders.vue b/src/rootgen/admin/orders/orders.vue
index f9c2aa1b..b2dafd9e 100755
--- a/src/rootgen/admin/orders/orders.vue
+++ b/src/rootgen/admin/orders/orders.vue
@@ -1,5 +1,5 @@
-
+
{{ setmeta({
title: 'Ordini Ufficio',
description: "",
diff --git a/src/rootgen/admin/pages/pages.vue b/src/rootgen/admin/pages/pages.vue
index 418b12e8..5b3bcea9 100755
--- a/src/rootgen/admin/pages/pages.vue
+++ b/src/rootgen/admin/pages/pages.vue
@@ -1,5 +1,5 @@
-
+
{{
setmeta({
title: 'Pagine',
diff --git a/src/rootgen/admin/producer/producer.vue b/src/rootgen/admin/producer/producer.vue
index a70a2629..8f6d0d96 100755
--- a/src/rootgen/admin/producer/producer.vue
+++ b/src/rootgen/admin/producer/producer.vue
@@ -1,5 +1,5 @@
-
+
{{
setmeta({
title: 'Produttori',
diff --git a/src/rootgen/admin/products/products.vue b/src/rootgen/admin/products/products.vue
index aab9aaef..fd7df910 100755
--- a/src/rootgen/admin/products/products.vue
+++ b/src/rootgen/admin/products/products.vue
@@ -1,5 +1,5 @@
-
+
{{
setmeta({
title: 'Prodotti',
diff --git a/src/rootgen/admin/sharewithus/sharewithus.vue b/src/rootgen/admin/sharewithus/sharewithus.vue
index 4e6f504f..3275afbc 100755
--- a/src/rootgen/admin/sharewithus/sharewithus.vue
+++ b/src/rootgen/admin/sharewithus/sharewithus.vue
@@ -1,5 +1,5 @@
-
+
{{
setmeta({
title: 'Condividi',
diff --git a/src/rootgen/admin/storehouses/storehouses.vue b/src/rootgen/admin/storehouses/storehouses.vue
index 5dabfe97..932b66fc 100755
--- a/src/rootgen/admin/storehouses/storehouses.vue
+++ b/src/rootgen/admin/storehouses/storehouses.vue
@@ -1,5 +1,5 @@
-
+
{{
setmeta({
title: 'Magazzini',
diff --git a/src/router/route-config.ts b/src/router/route-config.ts
index fce7852b..5ae7f60f 100755
--- a/src/router/route-config.ts
+++ b/src/router/route-config.ts
@@ -33,6 +33,7 @@ export const cfgrouter = {
getmenu(): RouteRecordRaw[] {
const arrroutes: RouteRecordRaw[] = []
+
for (const route of static_data.routes) {
tools.addRoute(arrroutes, route)
}
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index 31efb4b0..db87bca5 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -3156,19 +3156,17 @@ export const tools = {
param2: true,
})
},
- AskGiaPartecipatoZoom(mythis: any, user: any) {
+ AskGiaPartecipatoZoom(mythisq: any, user: any) {
console.log('AskGiaPartecipatoZoom', user.username)
- const $q = useQuasar()
- this.askConfirm($q, translate('steps.zoom_gia_partecipato'), translate('steps.zoom_gia_partecipato'), translate('dialog.yes'), translate('dialog.no'), '', lists.MenuAction.ZOOM_GIA_PARTECIPATO, 0, {
+ this.askConfirm(mythisq, translate('steps.zoom_gia_partecipato'), translate('steps.zoom_gia_partecipato'), translate('dialog.yes'), translate('dialog.no'), '', lists.MenuAction.ZOOM_GIA_PARTECIPATO, 0, {
param1: user,
param2: user,
param3: 'Confermato',
})
},
- ActionRecTable(mythis: any, action: number, table: string, id: string, item: any, askaction: any) {
+ ActionRecTable(mythisq: any, action: number, table: string, id: string, item: any, askaction: any) {
// console.log('ActionRecTable', id)
- const $q = useQuasar()
- return this.askConfirm($q, 'Action', translate(askaction) + '?', translate('dialog.yes'), translate('dialog.no'), table, action, 0, {
+ return this.askConfirm(mythisq, 'Action', translate(askaction) + '?', translate('dialog.yes'), translate('dialog.no'), table, action, 0, {
param1: id,
param2: item,
}, this)
@@ -3365,9 +3363,11 @@ export const tools = {
},
getextfile(filename: string) {
- const mystr = filename.split('.')
- if (mystr)
- return mystr.pop()!.toLowerCase()
+ if (filename) {
+ const mystr = filename.split('.')
+ if (mystr)
+ return mystr.pop()!.toLowerCase()
+ }
return ''
},
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index 5474585d..26e04cbc 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -287,9 +287,9 @@ export const useGlobalStore = defineStore('GlobalStore', {
for (const page of this.mypage) {
if (page.active) {
- // console.log('page', page.lang)
+ console.log('page', page.lang)
if (this.isMyLang(page)) {
- // console.log('page', page.lang, 'OK')
+ console.log('page', page.title, 'OK')
arrpagesroute.push({
active: true,
order: page.order ? page.order : 1000,
diff --git a/yarn.lock b/yarn.lock
index ee35995a..71a759e1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1869,7 +1869,7 @@
"@types/eslint" "*"
"@types/estree" "*"
-"@types/eslint@*", "@types/eslint@^7.2.14":
+"@types/eslint@*":
version "7.28.0"
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a"
integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==
@@ -5234,17 +5234,6 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
-eslint-webpack-plugin@^3.0.1:
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.0.1.tgz#0990a80e9d5927e7e68365f93426cb340679e88c"
- integrity sha512-PAHHDjCg2yWBNoiBPYLZWcv+M83urkslQKER7XvK84lo5YLcihJK6qwnCH2Fkt3eVdX+G1iyGZRlKsIhTiczHw==
- dependencies:
- "@types/eslint" "^7.2.14"
- jest-worker "^27.0.6"
- micromatch "^4.0.4"
- normalize-path "^3.0.0"
- schema-utils "^3.1.0"
-
eslint@^7.32.0:
version "7.32.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"