Skip to content

M
mytime
Commit 7d429dda authored by Prayas Jain's avatar Prayas Jain
Browse files
Options

Dashboard controller updated

parent e8fb3db6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/main/webapp/WEB-INF/controllers/DashboardController.js
View file @ 7d429dda
......@@ -187,8 +187,8 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
{field : 'account',displayName: 'Account', enableColumnMenu: false, enableSorting: false,minWidth : 100,width: 150},
{field : 'managerName',displayName: 'Manager Name', enableColumnMenu: false, enableSorting: false,minWidth : 100,width: 150},
{field : 'billableStatus',displayName: 'Billability', enableColumnMenu: false, enableSorting: false,minWidth : 100,width: 150},
{field : 'startDate',displayName: 'Start Date', enableColumnMenu: false, enableSorting: false, cellFilter: 'date:"dd-MMM-yyyy"',minWidth : 100,width: 150},
{field : 'endDate',displayName: 'End Date', enableColumnMenu: false, enableSorting: false, cellFilter: 'date:"dd-MMM-yyyy"' ,minWidth : 100,width: 150},
{field : 'projectStartDate',displayName: 'Start Date', enableColumnMenu: false, enableSorting: false, cellFilter: 'date:"dd-MMM-yyyy"',minWidth : 100,width: 150},
{field : 'projectEndDate',displayName: 'End Date', enableColumnMenu: false, enableSorting: false, cellFilter: 'date:"dd-MMM-yyyy"' ,minWidth : 100,width: 150},
{field : 'active',displayName: 'Active', enableColumnMenu: false,cellTemplate:getCellActiveTemplate,enableSorting: false,minWidth : 100,width: 150}
]
};
......@@ -268,7 +268,7 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
}).then(function mySuccess(response) {
//alert("response"+response);
// alert("response"+response.data);
$scope.gridOptionsProjectAllocatons.data = response.data;
$scope.gridOptionsProjectAllocatons.data = response.data.records;
}, function myError(response) {
showAlert("Something went wrong while fetching data!!!");
});
......@@ -278,7 +278,7 @@ myApp.controller("dashboardController", function($scope, $http, myFactory,export
}).then(function mySuccess(response) {
//alert("response"+response);
// alert("response"+response.data);
$scope.gridOptionsEmpLocationDetails.data = response.data;
$scope.gridOptionsEmpLocationDetails.data = response.data.records;
}, function myError(response) {
showAlert("Something went wrong while fetching data!!!");
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment