surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Friends Notification

Browse Source 
Starting Group Create Notification...
This commit is contained in:
Paolo Arena
2022-07-28 21:46:58 +02:00
parent 7f23fe6d05
commit 68106e69fc
12 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/shared_vuejs.ts
View File

@@ -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,
},
],

6
src/components/CGridTableRec/CGridTableRec.ts
View File

@@ -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
}

6
src/components/MyHeader/MyHeader.ts
View File

@@ -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,

2
src/components/MyHeader/MyHeader.vue
View File

@@ -199,7 +199,7 @@
<div v-if="isSocioResidente()" class="text-weight-bold text-user q-px-xs bg-amber">Residente</div>
<div v-if="isConsiglio()" class="text-weight-bold text-user q-px-xs bg-deep-orange-10">Consiglio</div>
<div v-if="isManager()" class="text-weight-bold text-user bg-blue q-px-xs">Segreteria</div>
<div v-if="isTutor()" class="text-weight-bold text-user q-px-xs">Facilitatore</div>
<div v-if="isFacilitatore()" class="text-weight-bold text-user q-px-xs">Facilitatore</div>
<div v-if="isTratuttrici()" class="text-weight-bold text-user q-px-xs">Editor</div>
</div>
<div v-if="!tools.isLogged()" class="text-user text-italic bg-red">

2
src/layouts/menuone/menuOne.scss
View File

@@ -70,7 +70,7 @@
color: green !important;
}
.isTutor {
.isFacilitatore {
color: #201a80;
}

2
src/layouts/menuone/menuOne.ts
View File

@@ -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'
}

9
src/layouts/toolbar/notifPopover/notifPopover.vue
View File

@@ -85,12 +85,11 @@
</q-avatar>
</q-item-section>
<q-item-section v-ripple @click="clickNotif(notif)">
<q-item-label lines="3" :class="(!notif.read) ? 'unread' : 'read'">
<q-item-section v-ripple>
<q-item-label lines="3" :class="(!notif.read) ? 'unread' : 'read'" @click="clickNotif(notif)">
<div v-html="getNotifText($t, notif, false)"></div>
</q-item-label>
<q-item-label caption lines="2" v-if="notif.typedir === shared_consts.TypeNotifs.TYPEDIR_FRIENDS && notif.status === 0">
<q-item-label caption lines="2" v-if="notif.typedir === shared_consts.TypeNotifs.TYPEDIR_FRIENDS && notif.status === 0" v-ripple>
<div class="row no-wrap justify-evenly" v-if="userStore.IsReqFriendByUsername(notif.sender)">
<q-btn
dense
@@ -111,7 +110,7 @@
</div>
</q-item-label>
<q-item-label caption lines="1" :class="(!notif.read) ? 'unread-date' : 'read-date'">
<q-item-label caption lines="1" :class="(!notif.read) ? 'unread-date' : 'read-date'" @click="clickNotif(notif)">
{{ tools.timeAgo(notif.datenotif) }}
<!--{{ // getUsernameChatByNotif(notif) }}-->
</q-item-label>

2
src/model/UserStore.ts
View File

@@ -168,7 +168,7 @@ export interface IUserState {
isAdmin?: boolean
isManager?: boolean
isDepartment?: boolean
isTutor?: boolean
isFacilitatore?: boolean
isZoomeri?: boolean
isTratuttrici?: boolean
isEditor?: boolean

2
src/statics/lang/it.js
View File

@@ -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',

6
src/store/Modules/tools.ts
View File

@@ -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() {

4
src/store/UserStore.ts
View File

@@ -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)

2
src/store/globalStore.ts
View File

@@ -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