Group approval ui (#8184)

* Added all ui components back

* Added group ui items back and initial group approval directive

* Added ability to mark tasks as requires approval. Added approvals ctrl. Added get approvals method to tasks service

* Added approval list view with approving functionality

* Added error to produce message when task requests approval

* Added notification display for group approvals

* Fixed notification read and adding task

* Fixed syncing with group approval required

* Added group id to notifications for redirect on client side

* Fixed approval request tests

* Fixed linting issues

* Removed expectation from beforeEach

* Moved string to locale

* Added eslint ignore

* Updated notification for group approved, added new icons, and updated styles

* Hid group plan ui
This commit is contained in:
Keith Holliday
2016-11-12 16:47:45 -06:00
committed by Matteo Pagliazzi
parent 3ff7692528
commit 13df60e0dd
25 changed files with 218 additions and 43 deletions

View File

@@ -74,6 +74,11 @@ habitrpg.controller('NotificationCtrl',
// Avoid showing the same notiication more than once
var lastShownNotifications = [];
function trasnferGroupNotification(notification) {
if (!User.user.groupNotifications) User.user.groupNotifications = [];
User.user.groupNotifications.push(notification);
}
function handleUserNotifications (after) {
if (!after || after.length === 0) return;
@@ -123,6 +128,14 @@ habitrpg.controller('NotificationCtrl',
if (notification.data.mp) Notification.mp(notification.data.mp);
}
break;
case 'GROUP_TASK_APPROVAL':
trasnferGroupNotification(notification);
markAsRead = false;
break;
case 'GROUP_TASK_APPROVED':
trasnferGroupNotification(notification);
markAsRead = false;
break;
default:
markAsRead = false; // If the notification is not implemented, skip it
break;