Commit f7fbec33 authored by Prayas Jain's avatar Prayas Jain

Updated Report Changes

parent 159187de
...@@ -29,7 +29,6 @@ public class FunctionalGroupController { ...@@ -29,7 +29,6 @@ public class FunctionalGroupController {
@RequestMapping(value = "/getAllFunctionalGroups", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) @RequestMapping(value = "/getAllFunctionalGroups", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<?> getAllFunctionalGroups(HttpServletRequest request) { public ResponseEntity<?> getAllFunctionalGroups(HttpServletRequest request) {
List<String> functionalGroupsList = new ArrayList<>(); List<String> functionalGroupsList = new ArrayList<>();
functionalGroupsList.add("ALL");
functionalGroupsList.addAll(functionalGroupService.getAllFunctionalGroups().stream(). functionalGroupsList.addAll(functionalGroupService.getAllFunctionalGroups().stream().
filter(f -> !Arrays.asList("IT","Recruiter","Admin","HR","Accounts").contains(f.getName())).map(f -> f.getName()).collect(Collectors.toList())); filter(f -> !Arrays.asList("IT","Recruiter","Admin","HR","Accounts").contains(f.getName())).map(f -> f.getName()).collect(Collectors.toList()));
ResponseDetails getRespDetails = new ResponseDetails(new Date(), 905, "Retrieved FunctionalGroups successfully", ResponseDetails getRespDetails = new ResponseDetails(new Date(), 905, "Retrieved FunctionalGroups successfully",
......
...@@ -48,7 +48,7 @@ myApp.directive('hcPieChart', function () { ...@@ -48,7 +48,7 @@ myApp.directive('hcPieChart', function () {
$scope.records = []; $scope.records = [];
$scope.empSearchId = ""; $scope.empSearchId = "";
$scope.reportType = "ALL"; $scope.reportType = "ALL";
$scope.reportTypeList = ["All Functional Orgs", "Account", "Monthly Trends"]; $scope.reportTypeList = ["ALL","All Functional Orgs", "Account", "Monthly Trends"];
var today = new Date(); var today = new Date();
$scope.searchedReportDate = today; $scope.searchedReportDate = today;
$scope.maxReportDate = today; $scope.maxReportDate = today;
......
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