Index: app/controllers/gantts_controller.rb =================================================================== --- app/controllers/gantts_controller.rb (revision 4734) +++ app/controllers/gantts_controller.rb (working copy) @@ -33,4 +33,16 @@ show end + def edit_gantt + date_from = Date.parse(params[:date_from]) + date_to = Date.parse(params[:date_to]) + months = date_to.month - date_from.month + 1 + params[:year] = date_from.year + params[:month] = date_from.month + params[:months] = months + @gantt = Redmine::Helpers::Gantt.new(params) + @gantt.project = @project + text, status = @gantt.edit(params) + render :text=>text, :status=>status + end end Index: app/helpers/issues_helper.rb =================================================================== --- app/helpers/issues_helper.rb (revision 4734) +++ app/helpers/issues_helper.rb (working copy) @@ -49,8 +49,8 @@ link_to_issue(issue) + "

" + "#{@cached_label_project}: #{link_to_project(issue.project)}
" + "#{@cached_label_status}: #{issue.status.name}
" + - "#{@cached_label_start_date}: #{format_date(issue.start_date)}
" + - "#{@cached_label_due_date}: #{format_date(issue.due_date)}
" + + "#{@cached_label_start_date}: #{format_date(issue.start_date)}
" + + "#{@cached_label_due_date}: #{format_date(issue.due_date)}
" + "#{@cached_label_assigned_to}: #{issue.assigned_to}
" + "#{@cached_label_priority}: #{issue.priority.name}" end Index: app/models/issue.rb =================================================================== --- app/models/issue.rb (revision 4734) +++ app/models/issue.rb (working copy) @@ -465,6 +465,16 @@ dependencies end + def all_precedes_issues + dependencies = [] + relations_from.each do |relation| + next unless relation.relation_type == IssueRelation::TYPE_PRECEDES + dependencies << relation.issue_to + dependencies += relation.issue_to.all_dependent_issues + end + dependencies + end + # Returns an array of issues that duplicate this one def duplicates relations_to.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.issue_from} Index: app/views/gantts/show.html.erb =================================================================== --- app/views/gantts/show.html.erb (revision 4734) +++ app/views/gantts/show.html.erb (working copy) @@ -1,3 +1,4 @@ +<% include_calendar_headers_tags %> <% @gantt.view = self %>

<%= l(:label_gantt) %>

@@ -41,7 +42,7 @@ <% zoom = 1 @gantt.zoom.times { zoom = zoom * 2 } -subject_width = 330 +subject_width = 280 header_heigth = 18 headers_height = header_heigth @@ -67,7 +68,145 @@ %> + + + + + <% if @gantt.truncated %>

<%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %>

<% end %> @@ -86,9 +225,20 @@ + +
+
+
+ +
+<%= @gantt.calendars %> +
+ +
+ -
+
 
<% # @@ -148,19 +298,20 @@ left = 0 height = g_height + header_heigth - 1 wday = @gantt.date_from.cwday + dt = @gantt.date_from (@gantt.date_to - @gantt.date_from + 1).to_i.times do width = zoom - 1 %>
5 %>" class="gantt_hdr"> - <%= day_name(wday).first %> + <%= "#{dt.day}
"if @gantt.zoom == 4 %><%= day_name(wday).first %>
<% left = left + width+1 wday = wday + 1 + dt = dt + 1 wday = 1 if wday > 7 end end %> - <%= @gantt.lines %> <% Index: config/routes.rb =================================================================== --- config/routes.rb (revision 4734) +++ config/routes.rb (working copy) @@ -80,8 +80,8 @@ map.quoted_issue '/issues/:id/quoted', :controller => 'journals', :action => 'new', :id => /\d+/, :conditions => { :method => :post } map.connect '/issues/:id/destroy', :controller => 'issues', :action => 'destroy', :conditions => { :method => :post } # legacy - map.resource :gantt, :path_prefix => '/issues', :controller => 'gantts', :only => [:show, :update] - map.resource :gantt, :path_prefix => '/projects/:project_id/issues', :controller => 'gantts', :only => [:show, :update] + map.resource :gantt, :path_prefix => '/issues', :controller => 'gantts', :only => [:show, :update, :edit_gantt] + map.resource :gantt, :path_prefix => '/projects/:project_id/issues', :controller => 'gantts', :only => [:show, :update, :edit_gantt] map.resource :calendar, :path_prefix => '/issues', :controller => 'calendars', :only => [:show, :update] map.resource :calendar, :path_prefix => '/projects/:project_id/issues', :controller => 'calendars', :only => [:show, :update] Index: lib/redmine/helpers/gantt.rb =================================================================== --- lib/redmine/helpers/gantt.rb (revision 4734) +++ lib/redmine/helpers/gantt.rb (working copy) @@ -70,6 +70,7 @@ @subjects = '' @lines = '' + @calendars = '' @number_of_rows = nil @issue_ancestors = [] @@ -154,12 +155,19 @@ render(options.merge(:only => :lines)) unless @lines_rendered @lines end + + # Renders the calendars of the Gantt chart, the right side + def calendars(options={}) + render(options.merge(:only => :calendars)) unless @calendars_rendered + @calendars + end def render(options={}) options = {:indent => 4, :render => :subject, :format => :html}.merge(options) - @subjects = '' unless options[:only] == :lines - @lines = '' unless options[:only] == :subjects + @subjects = '' unless options[:only] == :lines && options[:only] == :calendars + @lines = '' unless options[:only] == :subjects && options[:only] == :calendars + @calendars = '' unless options[:only] == :lines && options[:only] == :subjects @number_of_rows = 0 if @project @@ -171,8 +179,9 @@ end end - @subjects_rendered = true unless options[:only] == :lines - @lines_rendered = true unless options[:only] == :subjects + @subjects_rendered = true unless options[:only] == :lines && options[:only] == :calendars + @lines_rendered = true unless options[:only] == :subjects && options[:only] == :calendars + @calendars_rendered = true unless options[:only] == :lines && options[:only] == :subjects render_end(options) end @@ -182,8 +191,9 @@ options[:indent_increment] = 20 unless options.key? :indent_increment options[:top_increment] = 20 unless options.key? :top_increment - subject_for_project(project, options) unless options[:only] == :lines - line_for_project(project, options) unless options[:only] == :subjects + subject_for_project(project, options) unless options[:only] == :lines && options[:only] == :calendars + line_for_project(project, options) unless options[:only] == :subjects && options[:only] == :calendars + calendar_for_project(project, options) unless options[:only] == :lines && options[:only] == :subjects options[:top] += options[:top_increment] options[:indent] += options[:indent_increment] @@ -218,8 +228,9 @@ @issue_ancestors = [] issues.each do |i| - subject_for_issue(i, options) unless options[:only] == :lines - line_for_issue(i, options) unless options[:only] == :subjects + subject_for_issue(i, options) unless options[:only] == :lines && options[:only] == :calendars + line_for_issue(i, options) unless options[:only] == :subjects && options[:only] == :calendars + calendar_for_issue(i, options) unless options[:only] == :lines && options[:only] == :subjects options[:top] += options[:top_increment] @number_of_rows += 1 @@ -231,9 +242,10 @@ def render_version(version, options={}) # Version header - subject_for_version(version, options) unless options[:only] == :lines - line_for_version(version, options) unless options[:only] == :subjects - + subject_for_version(version, options) unless options[:only] == :lines && options[:only] == :calendars + line_for_version(version, options) unless options[:only] == :subjects && options[:only] == :calendars + calendar_for_version(version, options) unless options[:only] == :lines && options[:only] == :subjects + options[:top] += options[:top_increment] @number_of_rows += 1 return if abort? @@ -286,7 +298,7 @@ case options[:format] when :html - html_task(options, coords, :css => "project task", :label => label, :markers => true) + html_task(options, coords, :css => "project task", :label => label, :markers => true, :id => project.id, :kind => "p") when :image image_task(options, coords, :label => label, :markers => true, :height => 3) when :pdf @@ -325,7 +337,7 @@ 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, :id => version.id, :kind => "v") when :image image_task(options, coords, :label => label, :markers => true, :height => 3) when :pdf @@ -378,10 +390,13 @@ if issue.is_a?(Issue) && issue.due_before coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom]) label = "#{ issue.status.name } #{ issue.done_ratio }%" + if !issue.due_date && issue.fixed_version + label += "- #{h(issue.fixed_version.name)}" + end case options[:format] when :html - html_task(options, coords, :css => "task " + (issue.leaf? ? 'leaf' : 'parent'), :label => label, :issue => issue, :markers => !issue.leaf?) + html_task(options, coords, :css => "task " + (issue.leaf? ? 'leaf' : 'parent'), :label => label, :issue => issue, :markers => !issue.leaf?, :id => issue.id, :kind => "i") when :image image_task(options, coords, :label => label) when :pdf @@ -393,7 +408,7 @@ end end - # Generates a gantt image + # Generates a gantt image # Only defined if RMagick is avalaible def to_image(format='PNG') date_to = (@date_from >> @months)-1 @@ -621,6 +636,88 @@ pdf.Output end + def edit(pms) + id = pms[:id] + kind = id.slice!(0).chr + begin + case kind + when 'i' + @issue = Issue.find(pms[:id], :include => [:project, :tracker, :status, :author, :priority, :category]) + when 'p' + @issue = Project.find(pms[:id]) + when 'v' + @issue = Version.find(pms[:id], :include => [:project]) + end + rescue ActiveRecord::RecordNotFound + return "issue not found : #{pms[:id]}", 400 + end + + if !@issue.start_date || !@issue.due_before + #render :text=>l(:notice_locking_conflict), :status=>400 + return l(:notice_locking_conflict), 400 + end + @issue.init_journal(User.current) + date_from = Date.parse(pms[:date_from]) + old_start_date = @issue.start_date + o = get_issue_position(@issue, pms[:zoom]) + text_for_revert = "#{kind}#{id}=#{format_date(@issue.start_date)},#{@issue.start_date},#{format_date(@issue.due_before)},#{@issue.due_before},#{o[0]},#{o[1]},#{o[2]},#{o[3]}" + + if pms[:day] + #bar moved + day = pms[:day].to_i + duration = @issue.due_before - @issue.start_date + @issue.start_date = date_from + day + @issue.due_date = @issue.start_date + duration.to_i if @issue.due_date + elsif pms[:start_date] + #start date changed + start_date = Date.parse(pms[:start_date]) + if @issue.start_date == start_date + #render :text=>"" + return "", 200 #nothing has changed + end + @issue.start_date = start_date + @issue.due_date = start_date if @issue.due_date && start_date > @issue.due_date + elsif pms[:due_date] + #due date changed + due_date = Date.parse(pms[:due_date]) + if @issue.due_date == due_date + #render :text=>"" + return "", 200 #nothing has changed + end + @issue.due_date = due_date + @issue.start_date = due_date if due_date < @issue.start_date + end + fv = @issue.fixed_version + if fv && fv.effective_date && !@issue.due_date && fv.effective_date < @issue.start_date + @issue.start_date = old_start_date + end + + begin + @issue.save! + o = get_issue_position(@issue, pms[:zoom]) + text = "#{kind}#{id}=#{format_date(@issue.start_date)},#{@issue.start_date},#{format_date(@issue.due_before)},#{@issue.due_before},#{o[0]},#{o[1]},#{o[2]},#{o[3]}" + + prj_map = {} + text = set_project_data(@issue.project, pms[:zoom], text, prj_map) + version_map = {} + text = set_version_data(@issue.fixed_version, pms[:zoom], text, version_map) + + #check dependencies + issues = @issue.all_precedes_issues + issues.each do |i| + o = get_issue_position(i, pms[:zoom]) + text += "|i#{i.id}=#{format_date(i.start_date)},#{i.start_date},#{format_date(i.due_before)},#{i.due_before},#{o[0]},#{o[1]},#{o[2]},#{o[3]}" + text = set_project_data(i.project, pms[:zoom], text, prj_map) + text = set_version_data(i.fixed_version, pms[:zoom], text, version_map) + end + #render :text=>text + return text, 200 + rescue => e + #render :text=>@issue.errors.full_messages.join("\n") + "|" + text_for_revert , :status=>400 + return @issue.errors.full_messages.join("\n") + "|" + text_for_revert, 400 + end + end + private def coordinates(start_date, end_date, progress, zoom=nil) @@ -739,36 +836,53 @@ output = '' # Renders the task bar, with progress and late if coords[:bar_start] && coords[:bar_end] - output << "
 
" + i_width = coords[:bar_end] - coords[:bar_start] - 2 + output << "
" + output << "
 
" if coords[:bar_late_end] - output << "
 
" + l_width = coords[:bar_late_end] - coords[:bar_start] - 2 + output << "
 
" + else + output << "
 
" end if coords[:bar_progress_end] - output << "
 
" + d_width = coords[:bar_progress_end] - coords[:bar_start] - 2 + output << "
 
" + else + output << "
 
" end + output << "
" + else + output << "
" + output << "
 
" + output << "
 
" + output << "
 
" + output << "
" end # Renders the markers if options[:markers] if coords[:start] - output << "
 
" + output << "
 
" end if coords[:end] - output << "
 
" + output << "
 
" end end # Renders the label on the right if options[:label] - output << "
" + output << "
" output << options[:label] output << "
" end # Renders the tooltip if options[:issue] && coords[:bar_start] && coords[:bar_end] - output << "
" + output << "
" output << '' output << view.render_issue_tooltip(options[:issue]) output << "
" + + output << view.draggable_element("ev_#{options[:kind]}#{options[:id]}", :revert =>false, :scroll=>"'gantt-container'", :constraint => "'horizontal'", :snap=>params[:zoom],:onEnd=>'function( draggable, event ) {issue_moved(draggable.element);}') end @lines << output output @@ -857,6 +971,168 @@ params[:image].text(params[:subject_width] + (coords[:bar_end] || 0) + 5,params[:top] + 1, options[:label]) end end + + ## + ## for edit gantt + ## + def set_project_data(prj, zoom, text, prj_map = {}) + if !prj + return text + end + if !prj_map[prj.id] + o = get_project_position(prj, zoom) + text += "|p#{prj.id}=#{format_date(prj.start_date)},#{prj.start_date},#{format_date(prj.due_date)},#{prj.due_date},#{o[0]},#{o[1]},#{o[2]},#{o[3]},#{o[4]},#{o[5]}" + prj_map[prj.id] = prj + end + text = set_project_data(prj.parent, zoom, text, prj_map) + end + + def set_version_data(version, zoom, text, version_map = {}) + if !version + return text + end + if !version_map[version.id] + o = get_version_position(version, zoom) + text += "|v#{version.id}=#{format_date(version.start_date)},#{version.start_date},#{format_date(version.due_date)},#{version.due_date},#{o[0]},#{o[1]},#{o[2]},#{o[3]},#{o[4]},#{o[5]}" + version_map[version.id] = version + end + return text + end + + def get_pos(coords) + i_left = 0 + i_width = 0 + l_width = 0 + d_width = 0 + if coords[:bar_start] + i_left = coords[:bar_start] + if coords[:bar_end] + i_width = coords[:bar_end] - coords[:bar_start] - 2 + i_width = 0 if i_width < 0 + end + if coords[:bar_late_end] + l_width = coords[:bar_late_end] - coords[:bar_start] - 2 + end + if coords[:bar_progress_end] + d_width = coords[:bar_progress_end] - coords[:bar_start] - 2 + end + end + return i_left, i_width, l_width, d_width + end + + def get_issue_position(issue, zoom_str) + zoom = zoom_str.to_i + coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, zoom) + + return get_pos(coords) + end + + def get_project_position(project, zoom_str) + zoom = zoom_str.to_i + coords = coordinates(project.start_date, project.due_date, nil, zoom) + i_left, i_width, l_width, d_width = get_pos(coords) + return i_left, i_width, l_width, d_width, coords[:start], coords[:end] + zoom + end + + def get_version_position(version, zoom_str) + zoom = zoom_str.to_i + coords = coordinates(version.start_date, version.due_date, version.completed_pourcent, zoom) + i_left, i_width, l_width, d_width = get_pos(coords) + return i_left, i_width, l_width, d_width, coords[:start], coords[:end] + zoom + end + + def calendar_for_issue(issue, options) + # Skip issues that don't have a due_before (due_date or version's due_date) + if issue.is_a?(Issue) && issue.due_before + + case options[:format] + when :html + start_date = issue.start_date + if start_date + @calendars << "
" + @calendars << "" + @calendars << format_date(start_date) + @calendars << "" + @calendars << "" + @calendars << "#{view.calendar_for('i' + issue.id.to_s + '_start_date')}" + @calendars << observe_date_field("i#{issue.id}", 'start') + end + due_date = issue.due_date + if due_date + @calendars << "" + @calendars << format_date(due_date) + @calendars << "" + @calendars << "" + @calendars << "#{view.calendar_for('i' + issue.id.to_s + '_due_date')}" + @calendars << observe_date_field("i#{issue.id}", 'due') + @calendars << "
" + end + when :image + #nop + when :pdf + #nop + end + else + ActiveRecord::Base.logger.debug "GanttHelper#line_for_issue was not given an issue with a due_before" + '' + end + end + + def calendar_for_version(version, options) + # Skip version that don't have a due_before (due_date or version's due_date) + if version.is_a?(Version) && version.start_date && version.due_date + + case options[:format] + when :html + @calendars << "
" + @calendars << "" + @calendars << format_date(version.effective_date) + @calendars << "" + @calendars << "
" + when :image + #nop + when :pdf + #nop + end + else + ActiveRecord::Base.logger.debug "GanttHelper#line_for_issue was not given an issue with a due_before" + '' + end + end + + def calendar_for_project(project, options) + case options[:format] + when :html + @calendars << "
" + @calendars << "" + @calendars << format_date(project.start_date) if project.start_date + @calendars << "" + @calendars << "   " + @calendars << "" + @calendars << format_date(project.due_date) if project.due_date + @calendars << "" + @calendars << "
" + when :image + # nop + when :pdf + # nop + end + end + + def observe_date_field(id, type) + output = '' + output << "" + end end end end Index: public/stylesheets/application.css =================================================================== --- public/stylesheets/application.css (revision 4734) +++ public/stylesheets/application.css (working copy) @@ -801,6 +801,7 @@ .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; } .task_done { background:#00c600 url(../images/task_done.png); border: 1px solid #00c600; } .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; } +.task_none { background:transparent; border-style: none; } .task_todo.parent { background: #888; border: 1px solid #888; height: 3px;} .task_late.parent, .task_done.parent { height: 3px;}