Skip to content
Permalink
Browse files

Visual tweaks

  • Loading branch information
sec11008 committed Dec 10, 2015
1 parent ad0e6f2 commit 56a17a02ad160dd85d0596f9176848ca8908670c
Showing with 8 additions and 8 deletions.
  1. +8 −8 TeamDBAwesome/TeamDBAwesome/js/adminController.js
@@ -1,10 +1,8 @@
// This controller will hold logic for the employee Portal homepage (Order List, Logout), Customer Info, Media Center, and Reports

<<<<<<< HEAD
angular.module('routerApp').controller('adminController', function ($scope, $http, $log, $timeout, $cookies, urlService, $anchorScroll, $location, $q, $state, $rootScope, HolderService, uiGridConstants) {
=======
angular.module('routerApp').controller('adminController', function ($scope, $http, $log, $timeout, $cookies, urlService, $anchorScroll, $location, $q, $state, $rootScope, HolderService, $uibModal) {
>>>>>>> origin/master

angular.module('routerApp').controller('adminController', function ($scope, $http, $log, $timeout, $cookies, urlService, $anchorScroll, $location, $q, $state, $rootScope, HolderService, $uibModal,uiGridConstants) {

/* Retrieve Url */
var url = urlService.web;
$scope.name = $cookies.get('name');
@@ -520,7 +518,8 @@ angular.module('routerApp').controller('adminController', function ($scope, $htt
condition: uiGridConstants.filter.LESS_THAN,
placeholder: 'less than'
}
]
],
width: '5%'
},
{ field: 'customerId', displayName: 'Customer Id',
filters: [
@@ -532,12 +531,13 @@ angular.module('routerApp').controller('adminController', function ($scope, $htt
condition: uiGridConstants.filter.LESS_THAN,
placeholder: 'less than'
}
]
],
width: '5%'
},
{ field: 'invoiceDate', displayName: 'Date' },
{ field: 'address', displayName: 'Street Address' },
{ field: 'city', displayName: 'City' },
{ field: 'state', displayName: 'State' },
{ field: 'state', displayName: 'State', width: '5%' },
{ field: 'country', displayName: 'Country' },
{ field: 'post', displayName: 'Postal Code' },
{field: 'total',

0 comments on commit 56a17a0

Please sign in to comment.
You can’t perform that action at this time.