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
c2d6dd32
Commit
c2d6dd32
authored
Mar 31, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove test_data and rely on data passed from rails
parent
f446ebc8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
30 deletions
+19
-30
app/assets/javascripts/burndown_chart/index.js
app/assets/javascripts/burndown_chart/index.js
+15
-10
app/assets/javascripts/burndown_chart/test_data.json
app/assets/javascripts/burndown_chart/test_data.json
+0
-17
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+1
-1
app/views/shared/milestones/_burndown.html.haml
app/views/shared/milestones/_burndown.html.haml
+3
-2
No files found.
app/assets/javascripts/burndown_chart/index.js
View file @
c2d6dd32
import
Cookies
from
'
js-cookie
'
;
import
Cookies
from
'
js-cookie
'
;
import
BurndownChart
from
'
./burndown_chart
'
;
import
BurndownChart
from
'
./burndown_chart
'
;
import
testData
from
'
./test_data.json
'
;
$
(()
=>
{
$
(()
=>
{
// handle hint dismissal
// handle hint dismissal
...
@@ -10,14 +9,20 @@ $(() => {
...
@@ -10,14 +9,20 @@ $(() => {
Cookies
.
set
(
'
hide_burndown_message
'
,
'
true
'
);
Cookies
.
set
(
'
hide_burndown_message
'
,
'
true
'
);
});
});
// render chart
// generate burndown chart (if data available)
const
chart
=
new
BurndownChart
({
const
container
=
'
.burndown-chart
'
;
container
:
'
.burndown-chart
'
,
const
chartElm
=
$
(
container
);
startDate
:
'
2017-03-01
'
,
dueDate
:
'
2017-03-31
'
,
if
(
chartElm
.
length
)
{
});
const
startDate
=
chartElm
.
data
(
'
startDate
'
);
const
dueDate
=
chartElm
.
data
(
'
endDate
'
);
const
chartData
=
chartElm
.
data
(
'
chartData
'
);
const
chart
=
new
BurndownChart
({
container
,
startDate
,
dueDate
});
chart
.
setData
(
chartData
,
{
label
:
'
Open Issues
'
,
animate
:
true
});
chart
.
setData
(
testData
,
{
label
:
'
Open Issues
'
,
animate
:
true
}
);
window
.
addEventListener
(
'
resize
'
,
()
=>
chart
.
animateResize
(
1
)
);
window
.
addEventListener
(
'
resize
'
,
()
=>
chart
.
animateResize
(
1
));
$
(
document
).
on
(
'
click
'
,
'
.js-sidebar-toggle
'
,
()
=>
chart
.
animateResize
(
2
));
$
(
document
).
on
(
'
click
'
,
'
.js-sidebar-toggle
'
,
()
=>
chart
.
animateResize
(
2
));
}
});
});
app/assets/javascripts/burndown_chart/test_data.json
deleted
100644 → 0
View file @
f446ebc8
[
[
"2017-03-01"
,
"54"
],
[
"2017-03-02"
,
"52"
],
[
"2017-03-03"
,
"51"
],
[
"2017-03-04"
,
"47"
],
[
"2017-03-05"
,
"48"
],
[
"2017-03-06"
,
"44"
],
[
"2017-03-07"
,
"41"
],
[
"2017-03-08"
,
"35"
],
[
"2017-03-09"
,
"32"
],
[
"2017-03-10"
,
"32"
],
[
"2017-03-11"
,
"31"
],
[
"2017-03-12"
,
"29"
],
[
"2017-03-13"
,
"26"
],
[
"2017-03-14"
,
"23"
],
[
"2017-03-15"
,
"20"
]
]
app/views/projects/milestones/show.html.haml
View file @
c2d6dd32
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
=
preserve
do
=
preserve
do
=
markdown_field
(
@milestone
,
:description
)
=
markdown_field
(
@milestone
,
:description
)
=
render
'shared/milestones/burndown'
,
milestone:
@milestone
,
project:
@project
=
render
'shared/milestones/burndown'
,
milestone:
@milestone
,
project:
@project
,
burndown:
@burndown
-
if
can?
(
current_user
,
:read_issue
,
@project
)
&&
@milestone
.
total_items_count
(
current_user
).
zero?
-
if
can?
(
current_user
,
:read_issue
,
@project
)
&&
@milestone
.
total_items_count
(
current_user
).
zero?
.alert.alert-success.prepend-top-default
.alert.alert-success.prepend-top-default
...
...
app/views/shared/milestones/_burndown.html.haml
View file @
c2d6dd32
-
milestone
=
local_assigns
[
:milestone
]
-
milestone
=
local_assigns
[
:milestone
]
-
project
=
local_assigns
[
:project
]
-
project
=
local_assigns
[
:project
]
-
can_generate_chart
=
@milestone
.
start_date
&&
@milestone
.
due_date
-
burndown
=
local_assigns
[
:burndown
]
-
can_generate_chart
=
burndown
.
start_date
&&
burndown
.
end_date
&&
burndown
-
content_for
:page_specific_javascripts
do
-
content_for
:page_specific_javascripts
do
=
page_specific_javascript_bundle_tag
(
'common_d3'
)
=
page_specific_javascript_bundle_tag
(
'common_d3'
)
...
@@ -25,4 +26,4 @@
...
@@ -25,4 +26,4 @@
.burndown-header
.burndown-header
%h3
%h3
Open issues
Open issues
.burndown-chart
.burndown-chart
{
data:
{
start_date:
burndown
.
start_date
.
strftime
(
"%Y-%m-%d"
),
end_date:
burndown
.
end_date
.
strftime
(
"%Y-%m-%d"
),
chart_data:
burndown
.
chart_data
.
to_json
}
}
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