Roadmap progress bars now differentiate the progress due to closed issues from…

Roadmap progress bars now differentiate the progress due to closed issues from the open issues progress (2 different colors). git-svn-id: http://redmine.rubyforge.org/svn/trunk@954 e93f8b46-1217-0410-a6f0-8f06a7374b81

Roadmap progress bars now differentiate the progress due to closed issues from…
Roadmap progress bars now differentiate the progress due to closed issues from the open issues progress (2 different colors). git-svn-id: http://redmine.rubyforge.org/svn/trunk@954 e93f8b46-1217-0410-a6f0-8f06a7374b81
355289fa · Jean-Philippe Lang · b536f4c6 · 355289fa · 355289fa · 355289fa
Commit 355289fa authored Dec 05, 2007 by Jean-Philippe Lang
Showing with 17 additions and 4 deletions

application_helper.rb app/helpers/application_helper.rb +7 -3

version.rb app/models/version.rb +8 -0

roadmap.rhtml app/views/projects/roadmap.rhtml +1 -1

application.css public/stylesheets/application.css +1 -0

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -319,13 +319,17 @@ module ApplicationHelper
    link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")   
  end
  
-  def progress_bar(pct, options={})
+  def progress_bar(pcts, options={})
+    pcts = [pcts, pcts] unless pcts.is_a?(Array)
+    pcts[1] = pcts[1] - pcts[0]
+    pcts << (100 - pcts[1] - pcts[0])
    width = options[:width] || '100px;'
    legend = options[:legend] || ''
    content_tag('table',
      content_tag('tr',
-        (pct > 0 ? content_tag('td', '', :width => "#{pct.floor}%;", :class => 'closed') : '') +
-        (pct < 100 ? content_tag('td', '', :width => "#{100-pct.floor}%;", :class => 'open') : '')
+        (pcts[0] > 0 ? content_tag('td', '', :width => "#{pcts[0].floor}%;", :class => 'closed') : '') +
+        (pcts[1] > 0 ? content_tag('td', '', :width => "#{pcts[1].floor}%;", :class => 'done') : '') +
+        (pcts[2] > 0 ? content_tag('td', '', :width => "#{pcts[2].floor}%;", :class => 'todo') : '')
      ), :class => 'progress', :style => "width: #{width};") +
      content_tag('p', legend, :class => 'pourcent')
  end

--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -49,6 +49,14 @@ class Version < ActiveRecord::Base
    end
  end
  
+  def closed_pourcent
+    if fixed_issues.count == 0
+      0
+    else
+      closed_issues_count * 100.0 / fixed_issues.count
+    end
+  end
+  
  # Returns true if the version is overdue: due date reached and some open issues
  def overdue?
    effective_date && (effective_date < Date.today) && (open_issues_count > 0)

--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -16,7 +16,7 @@
    <p><%=h version.description %></p>        
    
    <% if version.fixed_issues.count > 0 %>
-        <%= progress_bar(version.completed_pourcent, :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
+        <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
        <p class="progress-info">
            <%= link_to(version.closed_issues_count, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
            <%= lwr(:label_closed_issues, version.closed_issues_count) %>

--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -262,6 +262,7 @@ table.progress {

 table.progress td { height: 0.9em; }
 table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
+table.progress td.done { background: #DEF0DE none repeat scroll 0%; }
 table.progress td.open { background: #FFF none repeat scroll 0%; }
 p.pourcent {font-size: 80%;}
 p.progress-info {clear: left; font-style: italic; font-size: 80%;}