Sprint 5 staging

app/config/apiMapping.js

@@ -251,6 +251,11 @@ var apiMapping = {
         submitRequest: {
             'endpoint': '/private/queue',
             'controller': 'services'
+        },
+        page: {
+            'endpoint': '/private/queue',
+            'controller': 'services',
+            'method': 'page'
         }
     },
     Notification: {

app/config/routes.js

@@ -1,20 +1,20 @@
 app.config(function ($routeProvider) {
     $routeProvider.
     when('/management', {
-        redirectTo: '/management/services',
-        access: ["ROLE_ADMIN", "ROLE_WEB_MANAGER", "ROLE_SERVICE_MANAGER"]
+        redirectTo: function () {
+            if (sessionStorage.role === 'ROLE_WEB_MANAGER') {
+                return '/management/notes';
+            } else if (sessionStorage.role === 'ROLE_NOTICE_MANAGER') {
+                return '/management/notifications';
+            } else {
+                return '/management/services';
+            }
+        },
+        access: ["ROLE_ADMIN", "ROLE_SERVICE_ADMIN", "ROLE_SERVICE_MANAGER", "ROLE_WEB_MANAGER", "ROLE_NOTICE_MANAGER"]
     }).
     when('/management/:tab', {
         templateUrl: 'views/management.html',
-        access: ["ROLE_ADMIN", "ROLE_WEB_MANAGER", "ROLE_SERVICE_MANAGER"]
-    }).
-    when('/services', {
-        templateUrl: 'views/management/services.html',
-        access: ["ROLE_ADMIN", "ROLE_WEB_MANAGER", "ROLE_SERVICE_MANAGER"]
-    }).
-    when('/notes', {
-        templateUrl: 'views/management/notes.html',
-        access: ["ROLE_ADMIN", "ROLE_WEB_MANAGER", "ROLE_SERVICE_MANAGER"]
+        access: ["ROLE_ADMIN", "ROLE_SERVICE_ADMIN", "ROLE_SERVICE_MANAGER", "ROLE_WEB_MANAGER", "ROLE_NOTICE_MANAGER"]
     }).
     when('/service/:serviceId/detail', {
         templateUrl: 'views/detail/service.html',

app/controllers/abstractIdeaController.js

@@ -46,8 +46,10 @@ app.controller('AbstractIdeaController', function ($controller, $scope, FeatureP
 
     $scope.clearOverallCheckbox = function () {
         var overallCheckbox = angular.element('#overallCheckbox')[0];
-        overallCheckbox.indeterminate = false;
-        overallCheckbox.checked = false;
+        if(overallCheckbox) {
+            overallCheckbox.indeterminate = false;
+            overallCheckbox.checked = false;	
+        }
     };
 
     $scope.createFeatureProposal = function () {

app/controllers/appAbstractController.js

@@ -4,8 +4,17 @@ app.controller("AppAbstractController", function ($controller, $scope) {
         $scope: $scope
     }));
 
-    $scope.isManager = function () {
-        return $scope.isServiceManager() || $scope.isWebManager();
+    $scope.hasAdminAccess = function () {
+        return ($scope.isAdmin() || $scope.isServiceAdmin());
+    };
+
+    // Admins have management access
+    $scope.hasManagementAccess= function () {
+        return ($scope.hasAdminAccess() || $scope.isWebManager() || $scope.isServiceManager() || $scope.isNoticeManager());
+    };
+
+    $scope.isServiceAdmin = function () {
+        return (sessionStorage.role === "ROLE_SERVICE_ADMIN");
     };
 
     $scope.isWebManager = function () {
@@ -16,15 +25,17 @@ app.controller("AppAbstractController", function ($controller, $scope) {
         return (sessionStorage.role === "ROLE_SERVICE_MANAGER");
     };
 
+    $scope.isNoticeManager = function () {
+        return (sessionStorage.role === "ROLE_NOTICE_MANAGER");
+    };
+
     $scope.isStaff = function () {
         return (sessionStorage.role === "ROLE_STAFF");
     };
 
     $scope.isFullServiceConsumer = function () {
         return $scope.isStaff() ||
-            $scope.isServiceManager() ||
-            $scope.isWebManager() ||
-            $scope.isAdmin();
+            $scope.hasManagementAccess();
     };
 
 });

app/controllers/dashboardController.js

@@ -13,7 +13,9 @@ app.controller("DashboardController", function ($controller, $scope, UserService
     $scope.showPublic = function () {
         var user = UserService.getCurrentUser();
         var publicView = false;
-        if (user.role === 'ROLE_ANONYMOUS' || user.role === 'ROLE_USER') {
+        if (user.role === undefined || user.role === null) {
+            publicView = true;
+        } else if (user.role === 'ROLE_ANONYMOUS' || user.role === 'ROLE_USER') {
             publicView = true;
         }
         return publicView;
@@ -38,4 +40,4 @@ app.controller("DashboardController", function ($controller, $scope, UserService
 
     NoteRepo.page();
 
-});
+});

app/controllers/featureProposalController.js

@@ -1,63 +1,87 @@
-app.controller('FeatureProposalController', function ($controller, $scope, Idea, FeatureProposal, FeatureProposalRepo, ProjectService) {
+app.controller('FeatureProposalController', function($controller, $scope, Idea, FeatureProposal, ProjectService) {
 
     angular.extend(this, $controller('AbstractIdeaController', {
         $scope: $scope
     }));
 
-    $scope.repo = FeatureProposalRepo;
-
     $scope.fpToDelete = {};
 
     $scope.ideaToAdd = {};
 
-    $scope.filters = [
-        {
-            gloss: 'Service',
-            property: 'service.name'
-        },
-        {
-            gloss: 'Title',
-            property: 'title'
-        },
-        {
-            gloss: 'Description',
-            property: 'description'
-        },
-        {
-            gloss: 'Submitted',
-            property: 'submitted'
-        },
-        {
-            gloss: 'Last Modified',
-            property: 'lastModified'
-        }
-    ];
+    $scope.weaverTable = {
+        repo: $scope.fpRepo,
+        columns: [{
+                gloss: 'Service',
+                property: 'service.name',
+                filterable: true,
+                sortable: true
+            },
+            {
+                gloss: 'Title',
+                property: 'title',
+                filterable: true,
+                sortable: true
+            },
+            {
+                gloss: 'Description',
+                property: 'description',
+                filterable: true,
+                sortable: false
+            },
+            {
+                gloss: 'Last Modified',
+                property: 'lastModified',
+                filterable: true,
+                sortable: true
+            },
+            {
+                gloss: 'Submitted',
+                property: 'submitted',
+                filterable: true,
+                sortable: true
+            },
+            {
+                gloss: 'Actions',
+                filterable: false,
+                sortable: false
+            }
+        ],
+        activeSort: [{
+                property: 'service.name',
+                direction: 'ASC'
+            },
+            {
+                property: 'lastModified',
+                direction: 'DESC'
+            }
+        ]
+    };
 
     $scope.removedIdeas = [];
 
-    $scope.tableParams = FeatureProposalRepo.getTableParams();
+    $scope.tableParams = $scope.fpRepo.getTableParams();
 
-    $scope.editFeatureProposal = function (fp) {
+    $scope.editFeatureProposal = function(fp) {
         $scope.fpData = fp;
         $scope.openModal('#editFpModal');
     };
 
-    $scope.removeIdea = function (idea) {
-        if ($scope.fpData.ideas.some(function (i) {
-            return i.id === idea.id;
-        })) {
+    $scope.removeIdea = function(idea) {
+        if ($scope.fpData.ideas.some(function(i) {
+                return i.id === idea.id;
+            })) {
             $scope.removedIdeas.push(new Idea(idea));
             $scope.forms.updateFp.$setDirty();
             $scope.fpData.dirty(true);
             $scope.fpData.ideas.splice($scope.fpData.ideas.indexOf(idea), 1);
         }
     };
 
-    $scope.updateFeatureProposal = function (fp) {
-        FeatureProposalRepo.update($scope.fpData).then(function (res) {
+    $scope.updateFeatureProposal = function(fp) {
+    	$scope.fpRepo.update($scope.fpData).then(function(res) {
             if (angular.fromJson(res.body).meta.status === 'SUCCESS') {
                 $scope.resetFeatureProposals();
-                for(var i in $scope.removedIdeas) {
+                for (var i in $scope.removedIdeas) {
                     var idea = $scope.removedIdeas[i];
                     idea.elevated = false;
                     idea.save();
@@ -67,27 +91,27 @@ app.controller('FeatureProposalController', function ($controller, $scope, Idea,
         });
     };
 
-    $scope.select = function (fp, modal) {
+    $scope.select = function(fp, modal) {
         $scope.fpData = fp;
         $scope.openModal(modal);
     };
 
-    $scope.submitFeatureProposal = function (fp) {
+    $scope.submitFeatureProposal = function(fp) {
         $scope.submitting = true;
-        ProjectService.submitFeatureProposal(fp).then(function () {
+        ProjectService.submitFeatureProposal(fp).then(function() {
             $scope.submitting = false;
             $scope.resetFeatureProposals();
         });
     };
 
-    $scope.confirmDeleteFp = function (fp) {
+    $scope.confirmDeleteFp = function(fp) {
         $scope.openModal('#deleteFpModal');
         $scope.fpToDelete = fp;
     };
 
-    $scope.deleteFp = function () {
+    $scope.deleteFp = function() {
         $scope.deleting = true;
-        $scope.fpToDelete.delete().then(function () {
+        $scope.fpToDelete.delete().then(function() {
             $scope.closeModal();
             $scope.deleting = false;
             $scope.fpToDelete = {};