Mercurial > hg > soundsoftware-site
diff app/models/.svn/text-base/version.rb.svn-base @ 119:8661b858af72
* Update to Redmine trunk rev 4705
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 14:12:06 +0000 |
parents | 40f7cfd4df19 |
children | 0c939c159af4 |
line wrap: on
line diff
--- a/app/models/.svn/text-base/version.rb.svn-base Fri Nov 19 14:05:24 2010 +0000 +++ b/app/models/.svn/text-base/version.rb.svn-base Thu Jan 13 14:12:06 2011 +0000 @@ -43,7 +43,7 @@ end def start_date - effective_date + @start_date ||= fixed_issues.minimum('start_date') end def due_date @@ -77,8 +77,7 @@ def behind_schedule? if completed_pourcent == 100 return false - elsif due_date && fixed_issues.present? && fixed_issues.minimum('start_date') # TODO: should use #start_date but that method is wrong... - start_date = fixed_issues.minimum('start_date') + elsif due_date && start_date done_date = start_date + ((due_date - start_date+1)* completed_pourcent/100).floor return done_date <= Date.today else