rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Return count of unread notifications. #474

Browse source
This commit is contained in:
Korina Cordero 2020-08-25 07:21:24 +00:00
parent f5f771c4ed
commit 08b4b25f4e
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public/assets/js/notification.js
View file

@ -23,9 +23,8 @@ class NotificationHandler {
var data = JSON.parse(xhr.responseText); var data = JSON.parse(xhr.responseText);
var notifs = data.notifications; var notifs = data.notifications;
// update notification count // update notification unread count
// TODO: notification count is total count or total unread count? var count_html = data.unread_count;
var count_html = data.count;
document.getElementById('notif-count').innerHTML = count_html; document.getElementById('notif-count').innerHTML = count_html;
// do we have any notifications? // do we have any notifications?
@ -41,7 +40,6 @@ class NotificationHandler {
var notif_html = '<div class="m-list-timeline__item">'; var notif_html = '<div class="m-list-timeline__item">';
notif_html += '<span class="m-list-timeline__badge -m-list-timeline__badge--state-success"></span>'; notif_html += '<span class="m-list-timeline__badge -m-list-timeline__badge--state-success"></span>';
notif_html += '<span class="m-list-timeline__text">'; notif_html += '<span class="m-list-timeline__text">';
//notif_html += '<a href="' + notif.link + '">' + notif.text + '</a>';
notif_html += '<a href="">' + notif.text + '</a>' notif_html += '<a href="">' + notif.text + '</a>'
notif_html += '</span>'; notif_html += '</span>';
notif_html += '<span class="m-list-timeline__time">'; notif_html += '<span class="m-list-timeline__time">';
@ -61,6 +59,7 @@ class NotificationHandler {
window.location.href = notif.link; window.location.href = notif.link;
}); });
}); });
notif_index++; notif_index++;
}); });
} }

7
src/Controller/NotificationController.php
View file

@ -56,10 +56,12 @@ class NotificationController extends AbstractController
$notifs = $em->getRepository(Notification::class)->findBy(['user_id' => 0]); $notifs = $em->getRepository(Notification::class)->findBy(['user_id' => 0]);
$notif_data = []; $notif_data = [];
// TODO: count how many notifs are unread and return the count $unread_count = 0;
foreach ($notifs as $notif) foreach ($notifs as $notif)
{ {
if (!($notif->isRead()))
$unread_count++;
$notif_data[] = [ $notif_data[] = [
'id' => $notif->getID(), 'id' => $notif->getID(),
'type' => 'jo_new', 'type' => 'jo_new',
@ -74,6 +76,7 @@ class NotificationController extends AbstractController
$sample_data = [ $sample_data = [
'count' => count($notif_data), 'count' => count($notif_data),
'unread_count' => $unread_count,
'notifications' => $notif_data, 'notifications' => $notif_data,
]; ];