Commit ae8ef069 authored by Mike Greiling's avatar Mike Greiling

don't confuse the due date and the last data entry date

parent 0cf67a93
class Burndown class Burndown
attr_accessor :start_date, :end_date, :issues_count, :issues_weight attr_accessor :start_date, :due_date, :end_date, :issues_count, :issues_weight
def initialize(milestone) def initialize(milestone)
@milestone = milestone @milestone = milestone
@start_date = @milestone.start_date @start_date = @milestone.start_date
@due_date = @milestone.due_date
@end_date = @milestone.due_date @end_date = @milestone.due_date
@end_date = Date.today if @end_date.present? && @end_date > Date.today @end_date = Date.today if @end_date.present? && @end_date > Date.today
...@@ -38,7 +39,7 @@ class Burndown ...@@ -38,7 +39,7 @@ class Burndown
end end
def valid? def valid?
start_date && end_date start_date && due_date
end end
private private
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
Issues Issues
%button.btn.btn-xs{ data: { show: 'weight' } } %button.btn.btn-xs{ data: { show: 'weight' } }
Issue weight Issue weight
.burndown-chart{ data: { start_date: burndown.start_date.strftime("%Y-%m-%d"), due_date: burndown.end_date.strftime("%Y-%m-%d"), chart_data: burndown.to_json } } .burndown-chart{ data: { start_date: burndown.start_date.strftime("%Y-%m-%d"), due_date: burndown.due_date.strftime("%Y-%m-%d"), chart_data: burndown.to_json } }
- elsif can?(current_user, :admin_milestone, @project) && cookies['hide_burndown_message'].nil? - elsif can?(current_user, :admin_milestone, @project) && cookies['hide_burndown_message'].nil?
.burndown-hint.content-block.container-fluid .burndown-hint.content-block.container-fluid
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment