# HG changeset patch # User Toshi MARUYAMA # Date 1354540563 -32400 # Node ID 6bb9e5303c929e06a0ed80c606808759237dfd30 # Parent 9005303af95a9d0f3f1aff223c54076935874c34 gantt: progress line (#12122) diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -289,10 +289,18 @@ module Redmine 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 @@ -313,7 +321,8 @@ module Redmine 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 @@ -336,6 +345,13 @@ module Redmine 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 @@ -347,7 +363,7 @@ module Redmine 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 @@ -611,7 +627,7 @@ module Redmine 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 @@ -638,6 +654,10 @@ module Redmine 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) } @@ -678,9 +698,10 @@ module Redmine 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 @@ -714,9 +735,12 @@ module Redmine style << "top:#{params[:top]}px;" 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] output << view.content_tag(:div, ' '.html_safe, :style => style, - :class => "#{options[:css]} task_todo") + :class => "#{options[:css]} task_todo", + :id => html_id) if coords[:bar_late_end] width = coords[:bar_late_end] - coords[:bar_start] - 2 style = "" @@ -733,9 +757,12 @@ module Redmine 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, ' '.html_safe, :style => style, - :class => "#{options[:css]} task_done") + :class => "#{options[:css]} task_done", + :id => html_id) end end # Renders the markers # HG changeset patch # User Toshi MARUYAMA # Date 1353885966 -32400 # Node ID 202e7b927aeb0985839beca6967257fbe638a3d5 # Parent 6bb9e5303c929e06a0ed80c606808759237dfd30 gantt: progress line (#12122) diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -12,6 +12,15 @@ <%= render :partial => 'queries/filters', :locals => {:query => @query} %> +
<%= gantt_zoom_link(@gantt, :in) %> diff --git a/config/locales/en.yml b/config/locales/en.yml --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -889,6 +889,7 @@ en: 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 diff --git a/config/locales/ja.yml b/config/locales/ja.yml --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -840,6 +840,7 @@ ja: label_git_report_last_commit: ファイルとディレクトリの最新コミットを表示する label_parent_revision: 親 label_child_revision: 子 + label_gantt_progress_line: イナズマ線 button_login: ログイン button_submit: 送信 # HG changeset patch # User Toshi MARUYAMA # Date 1353882249 -32400 # Node ID ada0d1ec989df89c742dab0f17f8830c6b434480 # Parent 202e7b927aeb0985839beca6967257fbe638a3d5 gantt: progress line (#12122) diff --git a/app/views/gantts/show.html.erb b/app/views/gantts/show.html.erb --- a/app/views/gantts/show.html.erb +++ b/app/views/gantts/show.html.erb @@ -1,3 +1,14 @@ +<% content_for :header_tags do %> + <%= javascript_include_tag 'raphael' %> + <%= javascript_include_tag 'gantt' %> +<% end %> +<%= javascript_tag do %> + $(document).ready(drawGanttHandler); + $(window).resize(drawGanttHandler); + $(function() { + $("#draw_progress_line").change(drawGanttHandler); + }); +<% end %> <% @gantt.view = self %>