Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
dashboard.panter.ch
Commits
90da56c9
Commit
90da56c9
authored
Jan 11, 2018
by
Alexis Reigel
Browse files
Merge branch 'fixes/latest-workload' into 'master'
latest workload instead of 1 year back See merge request
!39
parents
a639368e
9dd8b7bd
Pipeline
#12501
passed with stages
in 1 minute and 52 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/webcomponents/pan-fetch-employees.js
View file @
90da56c9
...
...
@@ -13,6 +13,8 @@ class PanFetchEmployees extends HTMLElement {
fetchJson
(
`
${
baseUrl
}
/staff`
),
fetchJson
(
`
${
baseUrl
}
/salary`
),
]).
then
(([
staffJson
,
salaryJson
])
=>
{
const
{
oneYearBack
}
=
salaryJson
.
salaries
;
const
bubbles
=
[
{
label
:
'
Average Age per Employee
'
,
...
...
@@ -36,7 +38,7 @@ class PanFetchEmployees extends HTMLElement {
},
{
label
:
'
Workload per Employee
'
,
value
:
`
${
salaryJson
.
salaries
.
oneYearBack
[
0
].
workload
}
%`
,
value
:
`
${
oneYearBack
[
oneYearBack
.
length
-
1
].
workload
}
%`
,
},
];
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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