IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Distinguish between totalNotifications and unreadNotifications

Browse Source
This commit is contained in:
Wolfgang Huß 2019-09-23 08:49:48 +02:00
parent e3d6509010
commit 92fcaea452
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
webapp/components/notifications/NotificationMenu/NotificationMenu.vue
View File

@ -1,11 +1,11 @@
<template>
<ds-button v-if="totalNotifications <= 0" class="notifications-menu" disabled icon="bell">
{{ totalNotifications }}
{{ unreadNotifications }}
</ds-button>
<dropdown v-else class="notifications-menu" :placement="placement">
<template slot="default" slot-scope="{ toggleMenu }">
<ds-button primary icon="bell" @click.prevent="toggleMenu">
{{ totalNotifications }}
{{ unreadNotifications }}
</ds-button>
</template>
<template slot="popover">
@ -52,16 +52,16 @@ export default {
})
// add all the new notifications to the notifications
if (notifications) {
notifications.forEach(updatedElement => {
const sameNotification = this.notifications.find(function(oldElement) {
notifications.forEach(udatedListNotification => {
const sameNotification = this.notifications.find(function(oldListNotification) {
return (
oldElement.from.id === updatedElement.from.id &&
oldElement.createdAt === updatedElement.createdAt &&
oldElement.reason === updatedElement.reason
oldListNotification.from.id === udatedListNotification.from.id &&
oldListNotification.createdAt === udatedListNotification.createdAt &&
oldListNotification.reason === udatedListNotification.reason
)
})
if (sameNotification === undefined) {
this.notifications.unshift(updatedElement)
this.notifications.unshift(udatedListNotification)
}
})
}
@ -91,6 +91,15 @@ export default {
totalNotifications() {
return (this.notifications || []).length
},
unreadNotifications() {
let countUnread = 0
if (this.notifications) {
this.notifications.forEach(notification => {
if (!notification.read) countUnread++
})
}
return countUnread
},
},
apollo: {
notifications: {