Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4e90e758
Commit
4e90e758
authored
Jan 14, 2020
by
Brandon Labuschagne
Committed by
Martin Wortschack
Jan 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Neaten up tooltip styling on cycle analytics duration chart"
parent
6b45f448
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
...javascripts/analytics/cycle_analytics/components/base.vue
+3
-1
ee/app/assets/javascripts/analytics/shared/components/scatterplot.vue
...s/javascripts/analytics/shared/components/scatterplot.vue
+7
-2
No files found.
ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
View file @
4e90e758
...
...
@@ -8,10 +8,10 @@ import { PROJECTS_PER_PAGE, DEFAULT_DAYS_IN_PAST } from '../constants';
import
GroupsDropdownFilter
from
'
../../shared/components/groups_dropdown_filter.vue
'
;
import
ProjectsDropdownFilter
from
'
../../shared/components/projects_dropdown_filter.vue
'
;
import
Scatterplot
from
'
../../shared/components/scatterplot.vue
'
;
import
{
LAST_ACTIVITY_AT
,
dateFormats
}
from
'
../../shared/constants
'
;
import
StageDropdownFilter
from
'
./stage_dropdown_filter.vue
'
;
import
SummaryTable
from
'
./summary_table.vue
'
;
import
StageTable
from
'
./stage_table.vue
'
;
import
{
LAST_ACTIVITY_AT
}
from
'
../../shared/constants
'
;
import
TasksByTypeChart
from
'
./tasks_by_type_chart.vue
'
;
export
default
{
...
...
@@ -196,6 +196,7 @@ export default {
with_shared
:
false
,
order_by
:
LAST_ACTIVITY_AT
,
},
durationChartTooltipDateFormat
:
dateFormats
.
defaultDate
,
};
</
script
>
...
...
@@ -308,6 +309,7 @@ export default {
v-if=
"durationChartPlottableData"
:x-axis-title=
"s__('CycleAnalytics|Date')"
:y-axis-title=
"s__('CycleAnalytics|Total days to completion')"
:tooltip-date-format=
"$options.durationChartTooltipDateFormat"
:scatter-data=
"durationChartPlottableData"
/>
<div
v-else
ref=
"duration-chart-no-data"
class=
"bs-callout bs-callout-info"
>
...
...
ee/app/assets/javascripts/analytics/shared/components/scatterplot.vue
View file @
4e90e758
...
...
@@ -25,6 +25,11 @@ export default {
required
:
false
,
default
:
()
=>
[],
},
tooltipDateFormat
:
{
type
:
String
,
required
:
false
,
default
:
dateFormats
.
defaultDateTime
,
},
},
data
()
{
return
{
...
...
@@ -69,7 +74,7 @@ export default {
methods
:
{
renderTooltip
({
data
})
{
const
[,
metric
,
dateTime
]
=
data
;
this
.
tooltipTitle
=
dateFormat
(
dateTime
,
dateFormats
.
defaultDateTime
);
this
.
tooltipTitle
=
dateFormat
(
dateTime
,
this
.
tooltipDateFormat
);
this
.
tooltipContent
=
metric
;
},
},
...
...
@@ -86,7 +91,7 @@ export default {
>
<div
slot=
"tooltipTitle"
>
{{
tooltipTitle
}}
(
{{
xAxisTitle
}}
)
</div>
<div
slot=
"tooltipContent"
class=
"d-flex"
>
<div
class=
"flex-grow-1"
>
{{
yAxisTitle
}}
</div>
<div
class=
"flex-grow-1"
>
{{
yAxisTitle
}}
:
</div>
<div
class=
"font-weight-bold"
>
{{
tooltipContent
}}
</div>
</div>
</gl-discrete-scatter-chart>
...
...
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