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
d956888e
Commit
d956888e
authored
May 22, 2019
by
Prayas Jain
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated_UPDATE_TEAMMATE_AND_UI
parent
fc54bb12
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
290 additions
and
174 deletions
+290
-174
ChartsController.js
src/main/webapp/WEB-INF/controllers/ChartsController.js
+5
-3
ProjectController.js
src/main/webapp/WEB-INF/controllers/ProjectController.js
+156
-48
custom-theme.css
src/main/webapp/WEB-INF/css/custom-theme.css
+12
-1
projectTeamDetails.html
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
+116
-121
reporteeTeam.html
src/main/webapp/WEB-INF/templates/reporteeTeam.html
+1
-1
No files found.
src/main/webapp/WEB-INF/controllers/ChartsController.js
View file @
d956888e
...
...
@@ -3,7 +3,8 @@ myApp.directive('hcPieChart', function () {
restrict
:
'E'
,
template
:
'<div></div>'
,
link
:
function
(
scope
,
element
)
{
getEmployeeDetails
(
scope
,
element
[
0
].
baseURI
+
'reports/getBillabilityDetailsByAccount'
,
'column'
,
element
,
"Billability By Account"
);
getEmployeeDetails
(
scope
,
element
[
0
].
baseURI
+
'reports/getEmployeesByFunctionalGroup'
,
'pie'
,
element
,
"Employees Overview Report"
);
//getEmployeeDetails(scope,element[0].baseURI+'reports/getBillabilityDetailsByAccount','column',element,"Billability By Account");
scope
.
clickMe
=
function
()
{
if
(
scope
.
reportId
==
1
){
getEmployeeDetails
(
scope
,
element
[
0
].
baseURI
+
'reports/getBillabilityDetailsByAccount'
,
'column'
,
element
,
" Billability By Account"
);
...
...
@@ -20,9 +21,10 @@ myApp.directive('hcPieChart', function () {
$scope
.
name
=
[];
$scope
.
records
=
[];
$scope
.
empSearchId
=
""
;
$scope
.
reportId
=
"1"
//$scope.reportId = "1"
$scope
.
reportId
=
"2"
$scope
.
reports
=
$scope
.
reportId
;
$scope
.
reports
=
[
{
Name
:
"Billability Report"
,
Id
:
"1"
},
{
Name
:
"Employees By Functional Group"
,
Id
:
"2"
},{
Name
:
"Billability Monthly Trends"
,
Id
:
"3"
}];
$scope
.
reports
=
[
/*{Name:"Billability Report",Id:"1"},*/
{
Name
:
"Employees By Functional Group"
,
Id
:
"2"
},{
Name
:
"Billability Monthly Trends"
,
Id
:
"3"
}];
$scope
.
employees
=
[];
...
...
src/main/webapp/WEB-INF/controllers/ProjectController.js
View file @
d956888e
This diff is collapsed.
Click to expand it.
src/main/webapp/WEB-INF/css/custom-theme.css
View file @
d956888e
...
...
@@ -599,6 +599,9 @@ cursor: pointer;
.update-Teammate
>
h4
{
border-bottom
:
1px
solid
#ccc
;
padding-bottom
:
5px
;
}
.update-teammate-dropdown
md-select
{
margin
:
-6px
0
0
0
;
}
.panel-default
>
.panel-heading
{
color
:
#fff
;
...
...
@@ -608,5 +611,13 @@ cursor: pointer;
}
.update-Teammate
.form-inline
{
margin-bottom
:
15px
;
}
.billable-table
{
margin-top
:
10px
;
}
.billable-table
.table
{
margin
:
0px
;
}
.grid-Dropdown
md-select
{
margin
:
0px
;
}
\ No newline at end of file
src/main/webapp/WEB-INF/templates/projectTeamDetails.html
View file @
d956888e
This diff is collapsed.
Click to expand it.
src/main/webapp/WEB-INF/templates/reporteeTeam.html
View file @
d956888e
...
...
@@ -31,7 +31,7 @@
</div>
<div
id=
"gridTest"
ui-grid=
"gridOptions"
ui-grid-pagination
<div
id=
"gridTest"
ui-grid=
"gridOptions"
ui-grid-
edit
ui-grid-
pagination
style=
"width:99%;height:230px;margin-left:10px;"
>
<div
class=
"watermark"
ng-show=
"!gridOptions.data.length"
>
No
data available
</div>
...
...
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