Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mytime
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Narendar Vakiti
mytime
Commits
f7fbec33
Commit
f7fbec33
authored
Feb 13, 2020
by
Prayas Jain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated Report Changes
parent
159187de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
FunctionalGroupController.java
...om/nisum/myteam/controller/FunctionalGroupController.java
+0
-1
ChartsController.js
src/main/webapp/WEB-INF/controllers/ChartsController.js
+1
-1
No files found.
src/main/java/com/nisum/myteam/controller/FunctionalGroupController.java
View file @
f7fbec33
...
...
@@ -29,7 +29,6 @@ public class FunctionalGroupController {
@RequestMapping
(
value
=
"/getAllFunctionalGroups"
,
method
=
RequestMethod
.
GET
,
produces
=
MediaType
.
APPLICATION_JSON_VALUE
)
public
ResponseEntity
<?>
getAllFunctionalGroups
(
HttpServletRequest
request
)
{
List
<
String
>
functionalGroupsList
=
new
ArrayList
<>();
functionalGroupsList
.
add
(
"ALL"
);
functionalGroupsList
.
addAll
(
functionalGroupService
.
getAllFunctionalGroups
().
stream
().
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"
,
...
...
src/main/webapp/WEB-INF/controllers/ChartsController.js
View file @
f7fbec33
...
...
@@ -48,7 +48,7 @@ myApp.directive('hcPieChart', function () {
$scope
.
records
=
[];
$scope
.
empSearchId
=
""
;
$scope
.
reportType
=
"ALL"
;
$scope
.
reportTypeList
=
[
"All Functional Orgs"
,
"Account"
,
"Monthly Trends"
];
$scope
.
reportTypeList
=
[
"A
LL"
,
"A
ll Functional Orgs"
,
"Account"
,
"Monthly Trends"
];
var
today
=
new
Date
();
$scope
.
searchedReportDate
=
today
;
$scope
.
maxReportDate
=
today
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment