diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index de90a040..64978c0d 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -95,6 +95,7 @@ export const shared_consts = { TABLES_MYBACHECAS: 'mybachecas', TABLES_MYHOSPS: 'myhosps', TABLES_MYGOODS: 'mygoods', + TABLES_MYEVENTS: 'myevents', TABLES_ENABLE_GETREC_BYID: ['mybachecas', 'myhosps'], @@ -869,6 +870,7 @@ export const shared_consts = { TYPEDIR_FRIENDS: 3, ID_FRIENDS_NEW_REC: 1, + ID_FRIENDS_ACCEPTED: 2, TYPEDIR_CIRCUITS: 4, diff --git a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts index ca9cf6d2..cb87a8f3 100644 --- a/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts +++ b/src/components/CMyCardGrpPopup/CMyCardGrpPopup.ts @@ -17,6 +17,8 @@ import { costanti } from '@costanti' import { IColGridTable, IImgGallery, IUserFields } from 'model' import { shared_consts } from '@/common/shared_vuejs' import { colCitys, fieldsTable } from '@store/Modules/fieldsTable' +import { useRoute } from 'vue-router' +import { useNotifStore } from '@store/NotifStore' export default defineComponent({ name: 'CMyCardGrpPopup', @@ -40,12 +42,16 @@ export default defineComponent({ setup(props) { const userStore = useUserStore() + const notifStore = useNotifStore() const globalStore = useGlobalStore() const $q = useQuasar() + const $route = useRoute() const { t } = useI18n() const showPic = ref(false) + const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '') + const myrec = ref({}) const col = ref({}) @@ -56,8 +62,9 @@ export default defineComponent({ function load() { // Carica il profilo di quest'utente if (props.idRec && props.idRec > 0) { - userStore.loadGeneric(props.table, props.idRec).then((ris) => { + userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => { myrec.value = ris + notifStore.setAsRead(idnotif.value) }) } else { diff --git a/src/components/CMyCardPopup/CMyCardPopup.ts b/src/components/CMyCardPopup/CMyCardPopup.ts index 6291c899..3d72bb26 100644 --- a/src/components/CMyCardPopup/CMyCardPopup.ts +++ b/src/components/CMyCardPopup/CMyCardPopup.ts @@ -17,6 +17,8 @@ import { costanti } from '@costanti' import { IColGridTable, IImgGallery, IUserFields } from 'model' import { shared_consts } from '@/common/shared_vuejs' import { colCitys, fieldsTable } from '@store/Modules/fieldsTable' +import { useRoute } from 'vue-router' +import { useNotifStore } from '@store/NotifStore' export default defineComponent({ name: 'CMyCardPopup', @@ -45,8 +47,10 @@ export default defineComponent({ setup(props) { const userStore = useUserStore() + const notifStore = useNotifStore() const globalStore = useGlobalStore() const $q = useQuasar() + const $route = useRoute() const { t } = useI18n() const showPic = ref(false) @@ -54,6 +58,8 @@ export default defineComponent({ const myrec = ref({}) const col = ref({}) + const idnotif = computed(() => $route.query.idnotif ? $route.query.idnotif.toString() : '') + function profile() { return userStore.my.profile } @@ -61,8 +67,9 @@ export default defineComponent({ function load() { // Carica il profilo di quest'utente if (props.idRec > 0) { - userStore.loadGeneric(props.table, props.idRec).then((ris) => { + userStore.loadGeneric(props.table, props.idRec, idnotif.value).then((ris) => { myrec.value = ris + notifStore.setAsRead(idnotif.value) }) } else { diff --git a/src/components/CMySelect/CMySelect.ts b/src/components/CMySelect/CMySelect.ts index ae9a6911..d064a1fe 100755 --- a/src/components/CMySelect/CMySelect.ts +++ b/src/components/CMySelect/CMySelect.ts @@ -176,7 +176,7 @@ export default defineComponent({ ) watch(() => props.arrvalue, (value: any, oldval: any) => { - console.log(' MODIF props.arrvalue', props.arrvalue) + // console.log(' MODIF props.arrvalue', props.arrvalue) update() }, ) @@ -268,7 +268,7 @@ export default defineComponent({ } function update() { - console.log('update', props.value, props) + // console.log('update', props.value, props) // console.log(' #### mounted myselect', props.options, 'arrvalue', myarrvalue.value) let rec: any if (optionsreal.value) { diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts index d8f6ee87..fcbd019b 100755 --- a/src/layouts/menuone/menuOne.ts +++ b/src/layouts/menuone/menuOne.ts @@ -29,10 +29,9 @@ export default defineComponent({ const myroutes = ref([]) - function getmenu(): any { - // console.log('getmenu menuOne!') - return globalStore.getmenu - } + const getmenu = computed(() => globalStore.getmenu ) + + const islogged = computed(() => userStore.isLogged) function setParentVisibilityBasedOnRoute(parent: any) { parent.routes.forEach((item: any) => { @@ -42,19 +41,26 @@ export default defineComponent({ }) } - watch(() => userStore.isLogged || finishLoading.value,(to, from) => { - myroutes.value = [] - myroutes.value = static_data.routes - }) - - watch(() => path, (to, from) => { + function updatemenu() { const mymenu = globalStore.getmenu - // console.log('watch:', mymenu) Object.keys(mymenu).forEach((parentName: any) => { - // console.log('parentName', parentName) // @ts-ignore setParentVisibilityBasedOnRoute(mymenu[parentName]) }) + myroutes.value = [] + myroutes.value = static_data.routes + } + + watch(() => islogged.value,(to, from) => { + updatemenu() + }) + + watch(() => finishLoading.value,(to, from) => { + updatemenu() + }) + + watch(() => path, (to, from) => { + updatemenu() }) /* function replaceUnderlineToSpace(text: string) { diff --git a/src/layouts/menuone/menuOne.vue b/src/layouts/menuone/menuOne.vue index 876eeab2..10d40e84 100755 --- a/src/layouts/menuone/menuOne.vue +++ b/src/layouts/menuone/menuOne.vue @@ -1,7 +1,7 @@