From 7f25ca47178c16f2f94c890b0ba9a3b6cffc2f81 Mon Sep 17 00:00:00 2001 From: Paolo Arena Date: Mon, 11 Jul 2022 23:19:52 +0200 Subject: [PATCH] - Export Email - Etichetta Facilitatori --- .env.development | 2 +- .env.example.production | 2 +- _ALL_SITES/freeplanet.app/db/static_data.ts | 10 +++++----- _ALL_SITES/insiemesipuo.app/.env.development | 2 +- _ALL_SITES/insiemesipuo.app/db/static_data.ts | 10 +++++----- .../popolodelnuovomondo.app/.env.development | 2 +- .../popolodelnuovomondo.app/db/static_data.ts | 10 +++++----- _ALL_SITES/riso.app/.env.development | 2 +- _ALL_SITES/riso.app/.env.test | 2 +- _ALL_SITES/riso.app/db/static_data.ts | 16 ++++++++-------- .../terradellavisione.app/.env.development | 2 +- _ALL_SITES/terradellavisione.app/.env.test | 2 +- .../terradellavisione.app/db/static_data.ts | 16 ++++++++-------- src/common/shared_vuejs.ts | 4 ++-- src/components/CCopyBtn/CCopyBtn.vue | 2 +- src/components/MyHeader/MyHeader.vue | 2 +- src/db/static_data.ts | 18 +++++++++--------- src/layouts/menuone/menuOne.ts | 2 +- src/model/GlobalStore.ts | 2 +- src/rootgen/admin/userPanel/userPanel.ts | 14 +++++++++++++- src/rootgen/admin/userPanel/userPanel.vue | 6 ++++++ src/statics/lang/enUs.js | 10 +++++----- src/statics/lang/es.js | 10 +++++----- src/statics/lang/fr.js | 4 ++-- src/statics/lang/it.js | 12 ++++++------ src/statics/lang/pt.js | 10 +++++----- src/statics/lang/si.js | 8 ++++---- src/store/Modules/fieldsTable.ts | 4 ++-- src/store/Modules/tools.ts | 18 ++++++++++-------- src/store/UserStore.ts | 2 +- src/store/globalStore.ts | 2 +- 31 files changed, 114 insertions(+), 94 deletions(-) diff --git a/.env.development b/.env.development index 4497e2bc..1b0aef03 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.23" +APP_VERSION="0.3.24" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 16b7807a..58e091e9 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.3.23" +APP_VERSION="0.3.24" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/freeplanet.app/db/static_data.ts b/_ALL_SITES/freeplanet.app/db/static_data.ts index e14e8d1a..53a414c7 100755 --- a/_ALL_SITES/freeplanet.app/db/static_data.ts +++ b/_ALL_SITES/freeplanet.app/db/static_data.ts @@ -198,7 +198,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, /* { @@ -213,7 +213,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, */ @@ -229,7 +229,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: false + onlyFacilitatore: false }, { active: true, @@ -322,7 +322,7 @@ const routes_manager: IListRoutes[] = [ level_child: 0.5, onlyAdmin: true, onlyManager: true - // onlyTutor: true + // onlyFacilitatore: true }, { active: true, @@ -549,7 +549,7 @@ const baseroutes: IListRoutes[] = [ infooter: true, onlyAdmin: true, onlyManager: true, - onlyTutor: true, + onlyFacilitatore: true, onlyEditor: true }, ...routes_manager, diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index 1c1dab96..31f2cd01 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.23" +APP_VERSION="0.3.24" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/insiemesipuo.app/db/static_data.ts b/_ALL_SITES/insiemesipuo.app/db/static_data.ts index 7b48b41e..e391e58f 100755 --- a/_ALL_SITES/insiemesipuo.app/db/static_data.ts +++ b/_ALL_SITES/insiemesipuo.app/db/static_data.ts @@ -211,7 +211,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, /* { @@ -226,7 +226,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, */ @@ -242,7 +242,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: false + onlyFacilitatore: false }, { active: true, @@ -349,7 +349,7 @@ const routes_manager: IListRoutes[] = [ level_child: 0.5, onlyAdmin: true, onlyManager: true - // onlyTutor: true + // onlyFacilitatore: true }, { active: true, @@ -583,7 +583,7 @@ const baseroutes: IListRoutes[] = [ infooter: true, onlyAdmin: true, onlyManager: true, - onlyTutor: true, + onlyFacilitatore: true, onlyEditor: true }, ...routes_manager, diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index ec475d70..a1f036f5 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.23" +APP_VERSION="0.3.24" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts index fe4df875..3b519d93 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts +++ b/_ALL_SITES/popolodelnuovomondo.app/db/static_data.ts @@ -211,7 +211,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, /* { @@ -226,7 +226,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, */ @@ -242,7 +242,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: false + onlyFacilitatore: false }, { active: true, @@ -335,7 +335,7 @@ const routes_manager: IListRoutes[] = [ level_child: 0.5, onlyAdmin: true, onlyManager: true - // onlyTutor: true + // onlyFacilitatore: true }, { active: true, @@ -548,7 +548,7 @@ const baseroutes: IListRoutes[] = [ infooter: true, onlyAdmin: true, onlyManager: true, - onlyTutor: true, + onlyFacilitatore: true, onlyEditor: true }, ...routes_manager, diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index 4497e2bc..1b0aef03 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.23" +APP_VERSION="0.3.24" 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 82ce32c0..b7f3267a 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.3.23" +APP_VERSION="0.3.24" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/riso.app/db/static_data.ts b/_ALL_SITES/riso.app/db/static_data.ts index d3b47f85..51a74d5a 100755 --- a/_ALL_SITES/riso.app/db/static_data.ts +++ b/_ALL_SITES/riso.app/db/static_data.ts @@ -189,7 +189,7 @@ const routes_ris: IListRoutes[] = [ level_parent: 0.5, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, { active: true, @@ -203,7 +203,7 @@ const routes_ris: IListRoutes[] = [ level_parent: 0.5, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, { active: true, @@ -217,7 +217,7 @@ const routes_ris: IListRoutes[] = [ level_parent: 0.5, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, ] @@ -251,7 +251,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, /* { @@ -266,7 +266,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, */ @@ -298,7 +298,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: false + onlyFacilitatore: false }, { active: true, @@ -405,7 +405,7 @@ const routes_manager: IListRoutes[] = [ level_child: 0.5, onlyAdmin: true, onlyManager: true - // onlyTutor: true + // onlyFacilitatore: true }, { active: true, @@ -685,7 +685,7 @@ const baseroutes: IListRoutes[] = [ infooter: false, onlyAdmin: true, onlyManager: true, - onlyTutor: true, + onlyFacilitatore: true, onlyEditor: true }, ...routes_manager, diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index c2d3567a..a893049e 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.3.23" +APP_VERSION="0.3.24" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/terradellavisione.app/.env.test b/_ALL_SITES/terradellavisione.app/.env.test index 6e00e650..6500ab15 100755 --- a/_ALL_SITES/terradellavisione.app/.env.test +++ b/_ALL_SITES/terradellavisione.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.3.23" +APP_VERSION="0.3.24" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/db/static_data.ts b/_ALL_SITES/terradellavisione.app/db/static_data.ts index 34dfd939..09898bfb 100755 --- a/_ALL_SITES/terradellavisione.app/db/static_data.ts +++ b/_ALL_SITES/terradellavisione.app/db/static_data.ts @@ -188,7 +188,7 @@ const routes_ris: IListRoutes[] = [ level_parent: 0.5, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, { active: true, @@ -202,7 +202,7 @@ const routes_ris: IListRoutes[] = [ level_parent: 0.5, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, { active: true, @@ -216,7 +216,7 @@ const routes_ris: IListRoutes[] = [ level_parent: 0.5, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, ] @@ -250,7 +250,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, /* { @@ -265,7 +265,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, */ @@ -297,7 +297,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: false + onlyFacilitatore: false }, { active: true, @@ -432,7 +432,7 @@ const routes_manager: IListRoutes[] = [ level_child: 0.5, onlyAdmin: true, onlyManager: true - // onlyTutor: true + // onlyFacilitatore: true }, { active: true, @@ -548,7 +548,7 @@ const baseroutes: IListRoutes[] = [ infooter: false, onlyAdmin: true, onlyManager: true, - onlyTutor: true, + onlyFacilitatore: true, onlyEditor: true }, ...routes_manager, diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index a4ba54e9..afd3f076 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -617,9 +617,9 @@ export const shared_consts = { icon: 'fas fa-user-tie', color: 'blue', }, - Tutor: { + Facilitatore: { value: 8, - label: 'dashboard.tutor', + label: 'dashboard.facilitatore', icon: 'fas fa-user-tie', color: 'fuchsia', }, diff --git a/src/components/CCopyBtn/CCopyBtn.vue b/src/components/CCopyBtn/CCopyBtn.vue index 26d67c0c..ce3675bc 100755 --- a/src/components/CCopyBtn/CCopyBtn.vue +++ b/src/components/CCopyBtn/CCopyBtn.vue @@ -7,7 +7,7 @@ diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue index d9c00434..40cdd5c9 100755 --- a/src/components/MyHeader/MyHeader.vue +++ b/src/components/MyHeader/MyHeader.vue @@ -199,7 +199,7 @@
Residente
Consiglio
Segreteria
-
Tutor
+
Facilitatore
Editor
diff --git a/src/db/static_data.ts b/src/db/static_data.ts index 2724d194..a9cbe9a3 100755 --- a/src/db/static_data.ts +++ b/src/db/static_data.ts @@ -189,7 +189,7 @@ const routes_ris: IListRoutes[] = [ level_parent: 0.5, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, { active: true, @@ -203,7 +203,7 @@ const routes_ris: IListRoutes[] = [ level_parent: 0.5, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, { active: true, @@ -217,7 +217,7 @@ const routes_ris: IListRoutes[] = [ level_parent: 0.5, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, ] @@ -251,7 +251,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, { active: true, @@ -265,7 +265,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, /* { @@ -280,7 +280,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: true + onlyFacilitatore: true }, */ @@ -312,7 +312,7 @@ const routes_manager: IListRoutes[] = [ level_parent: 0, level_child: 0.5, onlyManager: true, - onlyTutor: false + onlyFacilitatore: false }, { active: true, @@ -419,7 +419,7 @@ const routes_manager: IListRoutes[] = [ level_child: 0.5, onlyAdmin: true, onlyManager: true - // onlyTutor: true + // onlyFacilitatore: true }, { active: true, @@ -699,7 +699,7 @@ const baseroutes: IListRoutes[] = [ infooter: false, onlyAdmin: true, onlyManager: true, - onlyTutor: true, + onlyFacilitatore: true, onlyEditor: true }, ...routes_manager, diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts index 3f41d430..7f780534 100755 --- a/src/layouts/menuone/menuOne.ts +++ b/src/layouts/menuone/menuOne.ts @@ -82,7 +82,7 @@ export default defineComponent({ if (elem.onlySocioResidente) menu += ' isSocioResidente' if (elem.onlyConsiglio) menu += ' isConsiglio' if (elem.onlyDepartment) menu += ' isDepartment' - if (elem.onlyTutor) menu += ' isTutor' + if (elem.onlyFacilitatore) menu += ' isTutor' if (elem.onlyEditor) menu += ' isEditor' } diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 8cc23561..7e7ff9b5 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -353,7 +353,7 @@ export interface IListRoutes { onlyConsiglio?: boolean onlyNotSoci?: boolean onlyDepartment?: boolean - onlyTutor?: boolean + onlyFacilitatore?: boolean color?: string onlyEditor?: boolean extraclass?: string diff --git a/src/rootgen/admin/userPanel/userPanel.ts b/src/rootgen/admin/userPanel/userPanel.ts index cd7528df..8023d102 100755 --- a/src/rootgen/admin/userPanel/userPanel.ts +++ b/src/rootgen/admin/userPanel/userPanel.ts @@ -1,6 +1,7 @@ import { defineComponent, onMounted, ref } from 'vue' import { CMyPage } from '@/components/CMyPage' +import { CCopyBtn } from '@/components/CCopyBtn' import { CKeyAndValue } from '@/components/CKeyAndValue' import { CGridTableRec } from '@/components/CGridTableRec' import { tools } from '@store/Modules/tools' @@ -10,18 +11,21 @@ import { fieldsTable } from '@src/store/Modules/fieldsTable' import { shared_consts } from '@/common/shared_vuejs' import { useUserStore } from '@store/UserStore' import { costanti } from '@costanti' +import { useQuasar } from 'quasar' export default defineComponent({ name: 'userPanel', - components: { CMyPage, CKeyAndValue }, + components: { CMyPage, CKeyAndValue, CCopyBtn }, setup() { const arrfilterand: any = ref([]) + const $q = useQuasar() const search = ref('') const colVisib = ref('') const mycolumns = ref([]) const myuser = ref({}) + const risultato = ref('') const userStore = useUserStore() @@ -52,6 +56,12 @@ export default defineComponent({ await refresh() } + async function exportListaEmail() { + risultato.value = await tools.exportListaEmail() + + tools.copyStringToClipboard($q, risultato.value, false) + } + onMounted(mounted) return { @@ -65,6 +75,8 @@ export default defineComponent({ refresh, mycolumns, colVisib, + exportListaEmail, + risultato, } } }) diff --git a/src/rootgen/admin/userPanel/userPanel.vue b/src/rootgen/admin/userPanel/userPanel.vue index 385dbd92..fb80f6f2 100755 --- a/src/rootgen/admin/userPanel/userPanel.vue +++ b/src/rootgen/admin/userPanel/userPanel.vue @@ -1,6 +1,12 @@