jro_apps/redmine Commit - r10980:237f297f03e2

Gantt progress lines (#12122)....

Jean-Philippe Lang -

r10980:237f297f03e2

parent child

Context file:

r10980:237f297f03e2

Collapse all files

app/views/gantts/show.html.erb +38 -1

@@ -12,6 +12,39
12	<%= render :partial => 'queries/filters', :locals => {:query => @query} %>	12	<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
13	</div>	13	</div>
14	</fieldset>	14	</fieldset>
		15	<fieldset id="filters" class="collapsible">
		16	<legend onclick="toggleFieldset(this);"><%= l(:label_display) %></legend>
		17	<div>
		18	<table>
		19	<tr>
		20	<td>
		21	<fieldset>
		22	<legend><%= l(:label_related_issues) %></legend>
		23	<label>
		24	<%= check_box_tag "draw_rels", params["draw_rels"], true %>
		25	<% rels = [IssueRelation::TYPE_BLOCKS, IssueRelation::TYPE_PRECEDES] %>
		26	<% rels.each do \|rel\| %>
		27	<% color = Redmine::Helpers::Gantt::DRAW_TYPES[rel][:color] %>
		28	<%= content_tag(:span, '   '.html_safe,
		29	:style => "background-color: #{color}") %>
		30	<%= l(IssueRelation::TYPES[rel][:name]) %>
		31	<% end %>
		32	</label>
		33	</fieldset>
		34	</td>
		35	<td>
		36	<fieldset>
		37	<legend><%= l(:label_gantt_progress_line) %></legend>
		38	<label>
		39	<%= check_box_tag "draw_progress_line", params[:draw_progress_line], false %>
		40	<%= l(:label_display) %>
		41	</label>
		42	</fieldset>
		43	</td>
		44	</tr>
		45	</table>
		46	</div>
		47	</fieldset>
15		48
16	<p class="contextual">	49	<p class="contextual">
17	<%= gantt_zoom_link(@gantt, :in) %>	50	<%= gantt_zoom_link(@gantt, :in) %>
@@ -229,7 +262,7
229	style += "width:10px;"	262	style += "width:10px;"
230	style += "border-left: 1px dashed red;"	263	style += "border-left: 1px dashed red;"
231	%>	264	%>
232	<%= content_tag(:div, ' '.html_safe, :style => style) %>	265	<%= content_tag(:div, ' '.html_safe, :style => style, :id => 'today_line') %>
233	<% end %>	266	<% end %>
234	<%	267	<%
235	style = ""	268	style = ""
@@ -279,4 +312,8
279	var issue_relation_type = <%= raw Redmine::Helpers::Gantt::DRAW_TYPES.to_json %>;	312	var issue_relation_type = <%= raw Redmine::Helpers::Gantt::DRAW_TYPES.to_json %>;
280	$(document).ready(drawGanttHandler);	313	$(document).ready(drawGanttHandler);
281	$(window).resize(drawGanttHandler);	314	$(window).resize(drawGanttHandler);
		315	$(function() {
		316	$("#draw_rels").change(drawGanttHandler);
		317	$("#draw_progress_line").change(drawGanttHandler);
		318	});
282	<% end %>	319	<% end %>

config/locales/en.yml +1 0

               label_cross_project_tree: With project tree
               label_cross_project_hierarchy: With project hierarchy
               label_cross_project_system: With all projects
+              label_gantt_progress_line: Progress line
               button_login: Login
               button_submit: Submit

config/locales/ja.yml +1 0

               label_git_report_last_commit: ファイルとディレクトリの最新コミットを表示する
               label_parent_revision: 親
               label_child_revision: 子
+              label_gantt_progress_line: イナズマ線
               button_login: ログイン
               button_submit: 送信

lib/redmine/helpers/gantt.rb +32 -7

                       html_class << 'icon icon-package '
                       html_class << (version.behind_schedule? ? 'version-behind-schedule' : '') << " "
                       html_class << (version.overdue? ? 'version-overdue' : '')
+                      html_class << ' version-closed' unless version.open?
+                      if version.start_date && version.due_date && version.completed_pourcent
+                        progress_date = calc_progress_date(version.start_date,
+                                                           version.due_date, version.completed_pourcent)
+                        html_class << ' behind-start-date' if progress_date < self.date_from
+                        html_class << ' over-end-date' if progress_date > self.date_to
+                      end
                       s = view.link_to_version(version).html_safe
                       subject = view.content_tag(:span, s,
                                                  :class => html_class).html_safe
-                      html_subject(options, subject, :css => "version-name")
+                      html_subject(options, subject, :css => "version-name",
+                                   :id => "version-#{version.id}")
                     when :image
                       image_subject(options, version.to_s_with_project)
                     when :pdf
                       label = h("#{version.project} -") + label unless @project && @project == version.project
                       case options[:format]
                       when :html
-                        html_task(options, coords, :css => "version task", :label => label, :markers => true)
+                        html_task(options, coords, :css => "version task",
+                                  :label => label, :markers => true, :version => version)
                       when :image
                         image_task(options, coords, :label => label, :markers => true, :height => 3)
                       when :pdf
                       css_classes << ' issue-overdue' if issue.overdue?
                       css_classes << ' issue-behind-schedule' if issue.behind_schedule?
                       css_classes << ' icon icon-issue' unless Setting.gravatar_enabled? && issue.assigned_to
+                      css_classes << ' issue-closed' if issue.closed?
+                      if issue.start_date && issue.due_before && issue.done_ratio
+                        progress_date = calc_progress_date(issue.start_date,
+                                                           issue.due_before, issue.done_ratio)
+                        css_classes << ' behind-start-date' if progress_date < self.date_from
+                        css_classes << ' over-end-date' if progress_date > self.date_to
+                      end
                       s = "".html_safe
                       if issue.assigned_to.present?
                         assigned_string = l(:field_assigned_to) + ": " + issue.assigned_to.name
                       s << view.link_to_issue(issue).html_safe
                       subject = view.content_tag(:span, s, :class => css_classes).html_safe
                       html_subject(options, subject, :css => "issue-subject",
-                                   :title => issue.subject) + "\n"
+                                   :title => issue.subject, :id => "issue-#{issue.id}") + "\n"
                     when :image
                       image_subject(options, issue.subject)
                     when :pdf
                         coords[:bar_end] = self.date_to - self.date_from + 1
                       end
                       if progress
-                        progress_date = start_date + (end_date - start_date + 1) * (progress / 100.0)
+                        progress_date = calc_progress_date(start_date, end_date, progress)
                         if progress_date > self.date_from && progress_date > start_date
                           if progress_date < self.date_to
                             coords[:bar_progress_end] = progress_date - self.date_from
                     coords
                   end
+                  def calc_progress_date(start_date, end_date, progress)
+                    start_date + (end_date - start_date + 1) * (progress / 100.0)
+                  end
                   # Sorts a collection of issues by start_date, due_date, id for gantt rendering
                   def sort_issues!(issues)
                     issues.sort! { |a, b| gantt_issue_compare(a, b) }
                   def html_subject(params, subject, options={})
                     style = "position: absolute;top:#{params[:top]}px;left:#{params[:indent]}px;"
                     style << "width:#{params[:subject_width] - params[:indent]}px;" if params[:subject_width]
-                    output = view.content_tag('div', subject,
+                    output = view.content_tag(:div, subject,
                                               :class => options[:css], :style => style,
-                                              :title => options[:title])
+                                              :title => options[:title],
+                                              :id => options[:id])
                     @subjects << output
                     output
                   end
                       style << "left:#{coords[:bar_start]}px;"
                       style << "width:#{width}px;"
                       html_id = "task-todo-issue-#{options[:issue].id}" if options[:issue]
+                      html_id = "task-todo-version-#{options[:version].id}" if options[:version]
                       content_opt = {:style => style,
                                      :class => "#{options[:css]} task_todo",
                                      :id => html_id}
                         style << "top:#{params[:top]}px;"
                         style << "left:#{coords[:bar_start]}px;"
                         style << "width:#{width}px;"
+                        html_id = "task-done-issue-#{options[:issue].id}" if options[:issue]
+                        html_id = "task-done-version-#{options[:version].id}" if options[:version]
                         output << view.content_tag(:div, '&nbsp;'.html_safe,
                                                    :style => style,
-                                                   :class => "#{options[:css]} task_done")
+                                                   :class => "#{options[:css]} task_done",
+                                                   :id => html_id)
                       end
                     end
                     # Renders the markers

public/javascripts/gantt.js +64 -1

@@ -98,6 +98,66 function drawRelations() {
98	});	98	});
99	}	99	}
100		100
		101	function getProgressLinesArray() {
		102	var arr = new Array();
		103	var today_left = $('#today_line').position().left;
		104	arr.push({left: today_left, top: 0});
		105	$.each($('div.issue-subject, div.version-name'), function(index, element) {
		106	var t = $(element).position().top - draw_top ;
		107	var h = ($(element).height() / 9);
		108	var element_top_upper = t - h;
		109	var element_top_center = t + (h * 3);
		110	var element_top_lower = t + (h * 8);
		111	var issue_closed = $(element).children('span').hasClass('issue-closed');
		112	var version_closed = $(element).children('span').hasClass('version-closed');
		113	if (issue_closed \|\| version_closed) {
		114	arr.push({left: today_left, top: element_top_center});
		115	} else {
		116	var issue_done = $("#task-done-" + $(element).attr("id"));
		117	var is_behind_start = $(element).children('span').hasClass('behind-start-date');
		118	var is_over_end = $(element).children('span').hasClass('over-end-date');
		119	if (is_over_end) {
		120	arr.push({left: draw_right, top: element_top_upper, is_right_edge: true});
		121	arr.push({left: draw_right, top: element_top_lower, is_right_edge: true, none_stroke: true});
		122	} else if (issue_done.size() > 0) {
		123	var done_left = issue_done.first().position().left +
		124	issue_done.first().width();
		125	arr.push({left: done_left, top: element_top_center});
		126	} else if (is_behind_start) {
		127	arr.push({left: 0 , top: element_top_upper, is_left_edge: true});
		128	arr.push({left: 0 , top: element_top_lower, is_left_edge: true, none_stroke: true});
		129	} else {
		130	var todo_left = today_left;
		131	var issue_todo = $("#task-todo-" + $(element).attr("id"));
		132	if (issue_todo.size() > 0){
		133	todo_left = issue_todo.first().position().left;
		134	}
		135	arr.push({left: Math.min(today_left, todo_left), top: element_top_center});
		136	}
		137	}
		138	});
		139	return arr;
		140	}
		141
		142	function drawGanttProgressLines() {
		143	var arr = getProgressLinesArray();
		144	var color = $("#today_line")
		145	.css("border-left-color");
		146	var i;
		147	for(i = 1 ; i < arr.length ; i++) {
		148	if (!("none_stroke" in arr[i]) &&
		149	(!("is_right_edge" in arr[i - 1] && "is_right_edge" in arr[i]) &&
		150	!("is_left_edge" in arr[i - 1] && "is_left_edge" in arr[i]))
		151	) {
		152	var x1 = (arr[i - 1].left == 0) ? 0 : arr[i - 1].left + draw_left;
		153	var x2 = (arr[i].left == 0) ? 0 : arr[i].left + draw_left;
		154	draw_gantt.path(["M", x1, arr[i - 1].top,
		155	"L", x2, arr[i].top])
		156	.attr({stroke: color, "stroke-width": 2});
		157	}
		158	}
		159	}
		160
101	function drawGanttHandler() {	161	function drawGanttHandler() {
102	var folder = document.getElementById('gantt_draw_area');	162	var folder = document.getElementById('gantt_draw_area');
103	if(draw_gantt != null)	163	if(draw_gantt != null)
@@ -105,5 +165,8 function drawGanttHandler() {
105	else	165	else
106	draw_gantt = Raphael(folder);	166	draw_gantt = Raphael(folder);
107	setDrawArea();	167	setDrawArea();
108	drawRelations();	168	if ($("#draw_progress_line").attr('checked'))
		169	drawGanttProgressLines();
		170	if ($("#draw_rels").attr('checked'))
		171	drawRelations();
109	}	172	}

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