jro_apps/redmine Commit - r895:9ad79612fed4

Roadmap: more accurate completion percentage calculation (done ratio of open issues is now taken into account)....

Jean-Philippe Lang -

r895:9ad79612fed4

parent child

Context file:

r895:9ad79612fed4

Collapse all files

app/helpers/application_helper.rb +11 0

@@ -313,6 +313,17 module ApplicationHelper
313	link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")	313	link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
314	end	314	end
315		315
		316	def progress_bar(pct, options={})
		317	width = options[:width] \|\| '100px;'
		318	legend = options[:legend] \|\| ''
		319	content_tag('table',
		320	content_tag('tr',
		321	(pct > 0 ? content_tag('td', '', :width => "#{pct.floor}%;", :class => 'closed') : '') +
		322	(pct < 100 ? content_tag('td', '', :width => "#{100-pct.floor}%;", :class => 'open') : '')
		323	), :class => 'progress', :style => "width: #{width};") +
		324	content_tag('p', legend, :class => 'pourcent')
		325	end
		326
316	def context_menu_link(name, url, options={})	327	def context_menu_link(name, url, options={})
317	options[:class] \|\|= ''	328	options[:class] \|\|= ''
318	if options.delete(:selected)	329	if options.delete(:selected)

app/helpers/queries_helper.rb +8 -3

                     format_date(value)
                   elsif value.is_a?(Time)
                     format_time(value)
-                  elsif column.name == :subject
+                  else
+                    case column.name
+                    when :subject
                     ((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
                       link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
-                  else
+                    when :done_ratio
-                    h(value)
+                      progress_bar(value, :width => '80px')
+                    else
+                      h(value)
+                    end
                   end
                 end
               end

app/models/version.rb +10 0

@@ -39,6 +39,16 class Version < ActiveRecord::Base
39	effective_date && (effective_date <= Date.today) && (open_issues_count == 0)	39	effective_date && (effective_date <= Date.today) && (open_issues_count == 0)
40	end	40	end
41		41
		42	def completed_pourcent
		43	if fixed_issues.count == 0
		44	0
		45	elsif open_issues_count == 0
		46	100
		47	else
		48	(closed_issues_count * 100 + Issue.sum('done_ratio', :include => 'status', :conditions => ["fixed_version_id = ? AND is_closed = ?", id, false]).to_f) / fixed_issues.count
		49	end
		50	end
		51
42	# Returns true if the version is overdue: due date reached and some open issues	52	# Returns true if the version is overdue: due date reached and some open issues
43	def overdue?	53	def overdue?
44	effective_date && (effective_date < Date.today) && (open_issues_count > 0)	54	effective_date && (effective_date < Date.today) && (open_issues_count > 0)

app/views/issues/show.rhtml +1 -1

             </tr>
             <tr>
                 <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
-                <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= @issue.done_ratio %> %</td>
+                <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
             </tr>
             <tr>
                 <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>

app/views/projects/roadmap.rhtml +33 -38

@@ -14,44 +14,39
14	<p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>	14	<p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
15	<% end %>	15	<% end %>
16	<p><%=h version.description %></p>	16	<p><%=h version.description %></p>
17	<% issues = version.fixed_issues.find(:all,	17
18	:include => [:status, :tracker],	18	<% if version.fixed_issues.count > 0 %>
19	:conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],	19	<%= progress_bar(version.completed_pourcent, :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
20	:order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?	20	<p class="progress-info">
21	issues \|\|= []	21	<%= link_to(version.closed_issues_count, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
22		22	<%= lwr(:label_closed_issues, version.closed_issues_count) %>
23	total = issues.size	23	(<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)
24	complete = issues.inject(0) {\|c,i\| i.status.is_closed? ? c + 1 : c }	24
25	percentComplete = total == 0 ? 100 : (100.0 / total * complete).floor	25	<%= link_to(version.open_issues_count, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>
26	percentIncomplete = 100 - percentComplete	26	<%= lwr(:label_open_issues, version.open_issues_count)%>
27	%>	27	(<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%)
28	<table class="progress">	28	</p>
29	<tr>	29	<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
30	<% if percentComplete > 0 %>	30	<% issues = version.fixed_issues.find(:all,
31	<td class="closed" style="width: <%= percentComplete %>%"></td>	31	:include => [:status, :tracker],
32	<% end; if percentIncomplete > 0 %>	32	:conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
33	<td class="open" style="width: <%= percentIncomplete %>%"></td>	33	:order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
34	<% end %>	34	issues \|\|= []
35	</tr>	35	%>
36	</table>	36	<ul>
37	<em><%= link_to(complete, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_closed_issues, complete) %> (<%= percentComplete %>%)	37	<% if issues.size > 0 %>
38	<%= link_to((total - complete), :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %> <%= lwr(:label_open_issues, total - complete)%> (<%= percentIncomplete %>%)</em>	38	<% issues.each do \|issue\| %>
39	<br />	39	<li>
40	<br />	40	<%= link = link_to_issue(issue)
41	<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>	41	issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
42	<ul>	42	<%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
43	<% if total == 0 %>	43	</li>
44	<li><%=l(:label_roadmap_no_issues)%></li>	44	<% end %>
45	<% e~~lse~~ %>	45	<% end %>
46	<% issues.each do \|issue\| %>	46	</ul>
47	<li>	47	<% else %>
48	<%= link = link_to_issue(issue)	48	<p><em><%= l(:label_roadmap_no_issues) %></em></p>
49	issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>	49	<% end %>
50	<%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
51	</li>
52	<% end %>
53	<% end %>
54	</ul>
55	<% end %>	50	<% end %>
56		51
57	<% content_for :sidebar do %>	52	<% content_for :sidebar do %>

public/stylesheets/application.css +9 -6

             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category { white-space: normal; }
             tr.issue td.subject { text-align: left; }
+            tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
             table.list tbody tr:hover { background-color:#ffffdd; }
             table td {padding:2px;}
             }
             /***** Progress bar *****/
-            .progress {
+            table.progress {
                 border: 1px solid #D7D7D7;
                 border-collapse: collapse;
                 border-spacing: 0pt;
                 empty-cells: show;
-                padding: 3px;
-                width: 40em;
                 text-align: center;
+                float:left;
+                margin: 1px 6px 1px 0px;
             }
-            .progress td { height: 1em; }
+            table.progress td { height: 0.9em; }
-            .progress .closed { background: #BAE0BA none repeat scroll 0%; }
+            table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
-            .progress .open { background: #FFF 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%;}
             /***** Tabs *****/
             #content .tabs{height: 2.6em;}

public/stylesheets/context_menu.css +1 -1

-            #context-menu { position: absolute; }
+            #context-menu { position: absolute; z-index: 10;}
             #context-menu ul, #context-menu li, #context-menu a {
             	display:block;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages