Merge pull request #209 from AppliedIS/bug-admintable

Admin table fixes
ais-open · Dec 2, 2016 · 5f07b6b · 5f07b6b
2 parents 48430a1 + 5b7ab71
commit 5f07b6b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/DOL.WHD.Section14c.Web/src/modules/pages/adminDashboardController.js b/DOL.WHD.Section14c.Web/src/modules/pages/adminDashboardController.js
@@ -1,6 +1,7 @@
 'use strict';
 
 import findIndex from 'lodash/findIndex'
+import get from 'lodash/get';
 
 module.exports = function(ngModule) {
     ngModule.controller('adminDashboardController', function($scope, $location, responsesService, stateService, statusesService) {
@@ -27,6 +28,11 @@ module.exports = function(ngModule) {
                     return items.filter(function (item) {
                         return value && item[predicate] ? findIndex(item[predicate], ['id', value]) !== -1 : true;
                     });
+                },
+                filterStatus: function (items, value, predicate) {
+                    return items.filter(function (item) {
+                        return value ? get(item, predicate, undefined) === value : true;
+                    });
                 }
             }
         };

diff --git a/DOL.WHD.Section14c.Web/src/modules/pages/adminDashboardTemplate.html b/DOL.WHD.Section14c.Web/src/modules/pages/adminDashboardTemplate.html
@@ -90,7 +90,7 @@ <h1>Dashboard</h1>
                         <td><a href="" ng-click="gotoApplication(item.id)">{{ item.employerName }}</a></td>
                         <td ng-bind="item.certificateEffectiveDate | date:'MM/dd/yyyy'"></td>
                         <td ng-bind="item.certificateExpirationDate | date:'MM/dd/yyyy'"></td>
-                        <td ng-bind="item.statusName"></td>
+                        <td ng-bind="item.status.name"></td>
                         <td><span class="certificate-type" ng-repeat="certType in item.certificateType">{{ certType.display }}</span></td>
                         <td ng-bind="item.certificateNumber"></td>
                         <td ng-bind="item.state"></td>

diff --git a/DOL.WHD.Section14c.Web/src/styles/globals.scss b/DOL.WHD.Section14c.Web/src/styles/globals.scss
@@ -17,18 +17,18 @@ $help-em-color: #D0E2FB;
     @include clearfix;
 }
 
-// Links 
+// Links
 a {
     // Modified from USWDS for DOL
     color: $color-link;
-    
+
     &:hover,
     &:active {
         color: $text-color;
     }
 }
 
-// Typography 
+// Typography
 h1,
 h2,
 h3,
@@ -89,5 +89,5 @@ button + .green-button {
     margin-right: 5px;
     background-image: url('../images/dol-loading-small-blue.gif');
     background-size: contain;
-    vertical-align: middle;    
-}
+    vertical-align: middle;
+}