diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts
index 118a2e93..dcb21e56 100755
--- a/src/common/shared_vuejs.ts
+++ b/src/common/shared_vuejs.ts
@@ -862,6 +862,8 @@ export const shared_consts = {
StatusNotifs: {
STATUS_FRIENDS_ACCEPTED: 1,
STATUS_FRIENDS_REFUSED: 2,
+ STATUS_GROUPS_ACCEPTED: 3,
+ STATUS_GROUPS_REFUSED: 4,
},
TypeNotifs: {
@@ -876,10 +878,13 @@ export const shared_consts = {
TYPEDIR_FRIENDS: 3,
ID_FRIENDS_NEW_REC: 1,
ID_FRIENDS_ACCEPTED: 2,
+ ID_FRIENDS_REFUSED: 3,
+ ID_FRIENDS_ACCEPTED_MY_REQUEST: 4,
TYPEDIR_GROUPS: 4,
ID_GROUP_NEW_REC: 1,
ID_GROUP_ACCEPTED: 2,
+ ID_GROUP_REFUSED: 3,
TYPEDIR_CIRCUITS: 5,
@@ -934,12 +939,24 @@ export const shared_consts = {
},
{
value: 4, //
+ labeltrans: 'typenotifs.groups',
+ descr: 'typenotifs.friends_descr',
+ icon:'fas fa-user-plus',
+ list: [
+ {
+ value: 1, // ID_GROUP_NEW_REC
+ labeltrans: 'notifsid.groups_new',
+ }
+ ],
+ },
+ {
+ value: 5, //
labeltrans: 'typenotifs.circuits',
descr: 'typenotifs.circuits_descr',
icon:'fas fa-coins',
},
{
- value: 5, //
+ value: 6, //
labeltrans: 'typenotifs.booking',
descr: '',
icon:'fas fa-book-open',
@@ -989,6 +1006,11 @@ export const shared_consts = {
labeltrans: 'notifs.new_friends',
directory: 3,
},
+ {
+ value: 1, //
+ labeltrans: 'notifsid.groups_new',
+ directory: 4,
+ },
],
diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts
index b92c887f..51a287b0 100755
--- a/src/components/CGridTableRec/CGridTableRec.ts
+++ b/src/components/CGridTableRec/CGridTableRec.ts
@@ -850,12 +850,12 @@ export default defineComponent({
// refresh()
})
- function isTutor() {
- return userStore.isTutor
+ function isFacilitatore() {
+ return userStore.isFacilitatore
}
function disabilita() {
- if ((mytable.value === 'users') && (isTutor())) {
+ if ((mytable.value === 'users') && (isFacilitatore() && !userStore.isAdmin && !userStore.isManager)) {
return true
}
diff --git a/src/components/MyHeader/MyHeader.ts b/src/components/MyHeader/MyHeader.ts
index d809b4e1..8d465812 100755
--- a/src/components/MyHeader/MyHeader.ts
+++ b/src/components/MyHeader/MyHeader.ts
@@ -108,8 +108,8 @@ export default defineComponent({
return isSocio.value ? 'green-7' : 'white'
}
- function isTutor() {
- return userStore.isTutor
+ function isFacilitatore() {
+ return userStore.isFacilitatore
}
function isZoomeri() {
@@ -443,7 +443,7 @@ export default defineComponent({
getClassColorHeader,
getcart,
getnumItemsCart,
- isTutor,
+ isFacilitatore,
isZoomeri,
isTratuttrici,
getUsernameChatByMsg,
diff --git a/src/components/MyHeader/MyHeader.vue b/src/components/MyHeader/MyHeader.vue
index 40cdd5c9..c0b25b7a 100755
--- a/src/components/MyHeader/MyHeader.vue
+++ b/src/components/MyHeader/MyHeader.vue
@@ -199,7 +199,7 @@
Residente
Consiglio
Segreteria
- Facilitatore
+ Facilitatore
Editor
diff --git a/src/layouts/menuone/menuOne.scss b/src/layouts/menuone/menuOne.scss
index 32148279..d0a32370 100755
--- a/src/layouts/menuone/menuOne.scss
+++ b/src/layouts/menuone/menuOne.scss
@@ -70,7 +70,7 @@
color: green !important;
}
-.isTutor {
+.isFacilitatore {
color: #201a80;
}
diff --git a/src/layouts/menuone/menuOne.ts b/src/layouts/menuone/menuOne.ts
index fcbd019b..01b77b93 100755
--- a/src/layouts/menuone/menuOne.ts
+++ b/src/layouts/menuone/menuOne.ts
@@ -88,7 +88,7 @@ export default defineComponent({
if (elem.onlySocioResidente) menu += ' isSocioResidente'
if (elem.onlyConsiglio) menu += ' isConsiglio'
if (elem.onlyDepartment) menu += ' isDepartment'
- if (elem.onlyFacilitatore) menu += ' isTutor'
+ if (elem.onlyFacilitatore) menu += ' isFacilitatore'
if (elem.onlyEditor) menu += ' isEditor'
}
diff --git a/src/layouts/toolbar/notifPopover/notifPopover.vue b/src/layouts/toolbar/notifPopover/notifPopover.vue
index 9bdfd83f..e888bbc7 100755
--- a/src/layouts/toolbar/notifPopover/notifPopover.vue
+++ b/src/layouts/toolbar/notifPopover/notifPopover.vue
@@ -85,12 +85,11 @@
-
-
+
+
-
-
+
-
+
{{ tools.timeAgo(notif.datenotif) }}
diff --git a/src/model/UserStore.ts b/src/model/UserStore.ts
index 6f9d78f8..28a9a784 100755
--- a/src/model/UserStore.ts
+++ b/src/model/UserStore.ts
@@ -168,7 +168,7 @@ export interface IUserState {
isAdmin?: boolean
isManager?: boolean
isDepartment?: boolean
- isTutor?: boolean
+ isFacilitatore?: boolean
isZoomeri?: boolean
isTratuttrici?: boolean
isEditor?: boolean
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 4e1d9974..77e1ade9 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -774,6 +774,7 @@ const msg_it = {
new_rec_bacheca: 'Annunci',
new_rec_bacheca_descr: 'Avvisami se vengono aggiunti nuovi Annunci',
friends: 'Richieste di Amicizia',
+ groups: 'Gruppi',
friends_descr: 'Avvisami se:',
events: 'Eventi',
events_descr: 'Avvisami se vengono aggiunti nuovi Eventi',
@@ -786,6 +787,7 @@ const msg_it = {
bacheca_new_service: 'Nuovo Servizio',
events_new: 'Nuovo Evento',
friends_new: 'Nuova Richiesta di Amicizia',
+ groups_new: 'Si creano Nuovi Gruppi',
},
event: {
_id: 'id',
diff --git a/src/store/Modules/tools.ts b/src/store/Modules/tools.ts
index cc76f8c6..99ba0314 100644
--- a/src/store/Modules/tools.ts
+++ b/src/store/Modules/tools.ts
@@ -1736,7 +1736,7 @@ export const tools = {
|| (elem.onlySocioResidente && userStore.my.profile.socioresidente)
|| (elem.onlyConsiglio && userStore.my.profile.consiglio)
|| (elem.onlyNotSoci && !userStore.my.profile.socio)
- || (elem.onlyFacilitatore && userStore.isTutor)
+ || (elem.onlyFacilitatore && userStore.isFacilitatore)
|| (elem.onlyEditor && userStore.isEditor)
|| (elem.onlyDepartment && userStore.isDepartment)
|| ((!elem.onlyAdmin) && (!elem.onlyManager) && (!elem.onlyFacilitatore) && (!elem.onlyEditor) && (!elem.onlyDepartment)
@@ -2231,9 +2231,9 @@ export const tools = {
return userStore.isAdmin
},
- isTutor() {
+ isFacilitatore() {
const userStore = useUserStore()
- return userStore.isTutor
+ return userStore.isFacilitatore
},
isZoomeri() {
diff --git a/src/store/UserStore.ts b/src/store/UserStore.ts
index c7d1a44a..6e95809d 100755
--- a/src/store/UserStore.ts
+++ b/src/store/UserStore.ts
@@ -127,7 +127,7 @@ export const useUserStore = defineStore('UserStore', {
isAdmin: false,
isManager: false,
isDepartment: false,
- isTutor: false,
+ isFacilitatore: false,
isZoomeri: false,
isTratuttrici: false,
isEditor: false,
@@ -540,7 +540,7 @@ export const useUserStore = defineStore('UserStore', {
this.isAdmin = tools.isBitActive(this.my.perm, shared_consts.Permissions.Admin.value)
this.isManager = tools.isBitActive(this.my.perm, shared_consts.Permissions.Manager.value)
- this.isTutor = tools.isBitActive(this.my.perm, shared_consts.Permissions.Facilitatore.value)
+ this.isFacilitatore = tools.isBitActive(this.my.perm, shared_consts.Permissions.Facilitatore.value)
this.isZoomeri = tools.isBitActive(this.my.perm, shared_consts.Permissions.Zoomeri.value)
this.isDepartment = tools.isBitActive(this.my.perm, shared_consts.Permissions.Department.value)
this.isTeacher = tools.isBitActive(this.my.perm, shared_consts.Permissions.Teacher.value)
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index 53cdb5f9..643d65c2 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -1387,7 +1387,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
// const isLogged = localStorage.getItem(toolsext.localStorage.username)
console.log('isLogged', isLogged)
- // calendarStore.editable = userStore.isAdmin || userStore.isManager || userStore.isTutor
+ // calendarStore.editable = userStore.isAdmin || userStore.isManager || userStore.isFacilitatore
if (res.data.myuser === null) {
if (isLogged) {
// Fai Logout