Index: app/helpers/issues_helper.rb =================================================================== --- app/helpers/issues_helper.rb (revision 9835) +++ app/helpers/issues_helper.rb (working copy) @@ -51,8 +51,10 @@ (link_to_issue(issue) + "

" + "#{@cached_label_project}: #{link_to_project(issue.project)}
" + "#{@cached_label_status}: #{h(issue.status.name)}
" + - "#{@cached_label_start_date}: #{format_date(issue.start_date)}
" + - "#{@cached_label_due_date}: #{format_date(issue.due_date)}
" + + #pstart + "#{@cached_label_start_date}: #{format_date(issue.start_date)}
" + + "#{@cached_label_due_date}: #{format_date(issue.due_date)}
" + + #pend "#{@cached_label_assigned_to}: #{h(issue.assigned_to)}
" + "#{@cached_label_priority}: #{h(issue.priority.name)}").html_safe end Index: app/helpers/application_helper.rb =================================================================== --- app/helpers/application_helper.rb (revision 9835) +++ app/helpers/application_helper.rb (working copy) @@ -959,6 +959,14 @@ javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });") end + #pstart + def g_calendar_for(field_id) + include_calendar_headers_tags + image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) + + javascript_tag("Calendar.setup({inputField : '#{field_id}', electric : false, ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });") + end + #pend + def include_calendar_headers_tags unless @calendar_headers_tags_included @calendar_headers_tags_included = true Index: app/models/issue.rb =================================================================== --- app/models/issue.rb (revision 9835) +++ app/models/issue.rb (working copy) @@ -539,6 +539,18 @@ dependencies end + #pstart + 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 + #pend + # 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/controllers/gantts_controller.rb =================================================================== --- app/controllers/gantts_controller.rb (revision 9835) +++ app/controllers/gantts_controller.rb (working copy) @@ -45,4 +45,38 @@ format.pdf { send_data(@gantt.to_pdf, :type => 'application/pdf', :filename => "#{basename}.pdf") } end end + + #pstart + 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 + + def find_optional_project + begin + if params[:action] && params[:action].to_s == "edit_gantt" + @project = Project.find(params[:project_id]) unless params[:project_id].blank? + allowed = User.current.allowed_to?(:edit_issues, @project, :global => true) + if allowed + return true + else + render :text=>"lack of permission to edit issues", :status=>403 + end + else + super + end + rescue => e + return e.to_s + "\n===\n" + [$!,$@.join("\n")].join("\n") + end + end + #pend + end Index: app/views/gantts/show.html.erb =================================================================== --- app/views/gantts/show.html.erb (revision 9835) +++ app/views/gantts/show.html.erb (working copy) @@ -1,3 +1,4 @@ +<% include_calendar_headers_tags %> <% @gantt.view = self %>

<%= @query.new_record? ? l(:label_gantt) : h(@query.name) %>

@@ -32,7 +33,7 @@ <% zoom = 1 @gantt.zoom.times { zoom = zoom * 2 } -subject_width = 330 +subject_width = 280 header_heigth = 18 headers_height = header_heigth @@ -59,6 +60,151 @@ %> + + + + + + <% if @gantt.truncated %>

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

<% end %> @@ -77,9 +223,22 @@ + + +
+
+
+ +
+<%= @gantt.calendars %> +
+ +
+ + -
+
 
<% # @@ -139,15 +298,18 @@ 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 %> Index: lib/redmine/helpers/gantt.rb =================================================================== --- lib/redmine/helpers/gantt.rb (revision 9835) +++ lib/redmine/helpers/gantt.rb (working copy) @@ -70,6 +70,9 @@ @subjects = '' @lines = '' + #pstart + @calendars = '' + #pend @number_of_rows = nil @issue_ancestors = [] @@ -129,6 +132,14 @@ @lines end + #pstart + # Renders the calendars of the Gantt chart, the right side + def calendars(options={}) + render(options.merge(:only => :calendars)) unless @calendars_rendered + @calendars + end + #pend + # Returns issues that will be rendered def issues @issues ||= @query.issues( @@ -175,8 +186,17 @@ options = {:top => 0, :top_increment => 20, :indent_increment => 20, :render => :subject, :format => :html}.merge(options) indent = options[:indent] || 4 - @subjects = '' unless options[:only] == :lines - @lines = '' unless options[:only] == :subjects + #pstart + if options[:format] == :html + @subjects = '' unless options[:only] == :lines && options[:only] == :calendars + @lines = '' unless options[:only] == :subjects && options[:only] == :calendars + @calendars = '' unless options[:only] == :lines && options[:only] == :subjects + else + @subjects = '' unless options[:only] == :lines + @lines = '' unless options[:only] == :subjects + end + #pend + @number_of_rows = 0 Project.project_tree(projects) do |project, level| @@ -185,16 +205,33 @@ break if abort? end - @subjects_rendered = true unless options[:only] == :lines - @lines_rendered = true unless options[:only] == :subjects + #pstart + if options[:format] == :html + @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 + else + @subjects_rendered = true unless options[:only] == :lines + @lines_rendered = true unless options[:only] == :subjects + end + #pend render_end(options) end def render_project(project, options={}) - subject_for_project(project, options) unless options[:only] == :lines - line_for_project(project, options) unless options[:only] == :subjects + #pstart + if options[:format] == :html + 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 + else + subject_for_project(project, options) unless options[:only] == :lines + line_for_project(project, options) unless options[:only] == :subjects + end + #pend + options[:top] += options[:top_increment] options[:indent] += options[:indent_increment] @number_of_rows += 1 @@ -220,9 +257,18 @@ @issue_ancestors = [] issues.each do |i| - subject_for_issue(i, options) unless options[:only] == :lines - line_for_issue(i, options) unless options[:only] == :subjects + #pstart + if options[:format] == :html + 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 + else + subject_for_issue(i, options) unless options[:only] == :lines + line_for_issue(i, options) unless options[:only] == :subjects + end + #pend + options[:top] += options[:top_increment] @number_of_rows += 1 break if abort? @@ -233,9 +279,18 @@ def render_version(project, version, options={}) # Version header - subject_for_version(version, options) unless options[:only] == :lines - line_for_version(version, options) unless options[:only] == :subjects + #pstart + if options[:format] == :html + 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 + else + subject_for_version(version, options) unless options[:only] == :lines + line_for_version(version, options) unless options[:only] == :subjects + end + #pend + options[:top] += options[:top_increment] @number_of_rows += 1 return if abort? @@ -283,7 +338,11 @@ case options[:format] when :html - html_task(options, coords, :css => "project task", :label => label, :markers => true) + + #pstart + html_task(options, coords, :css => "project task", :label => label, :markers => true, :id => project.id, :kind => "p") + #pend + when :image image_task(options, coords, :label => label, :markers => true, :height => 3) when :pdf @@ -322,7 +381,11 @@ case options[:format] when :html - html_task(options, coords, :css => "version task", :label => label, :markers => true) + + #pstart + html_task(options, coords, :css => "version task", :label => label, :markers => true, :id => version.id, :kind => "v") + #pend + when :image image_task(options, coords, :label => label, :markers => true, :height => 3) when :pdf @@ -376,9 +439,23 @@ coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom]) label = "#{ issue.status.name } #{ issue.done_ratio }%" + #pstart + if !issue.due_date && issue.fixed_version + if options[:format] == :html + label += "- #{h(issue.fixed_version.name)}" + else + label += "-#{h(issue.fixed_version.name)}" + end + end + #pend + case options[:format] when :html - html_task(options, coords, :css => "task " + (issue.leaf? ? 'leaf' : 'parent'), :label => label, :issue => issue, :markers => !issue.leaf?) + + #pstart + html_task(options, coords, :css => "task " + (issue.leaf? ? 'leaf' : 'parent'), :label => label, :issue => issue, :markers => !issue.leaf?, :id => issue.id, :kind => "i") + #pend + when :image image_task(options, coords, :label => label) when :pdf @@ -618,6 +695,107 @@ pdf.Output end + #pstart + 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 + + #check parent + is = @issue + while + pid = is.parent_issue_id + break if !pid + i = Issue.find(pid) + 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]},#{o[4]},#{o[5]}" + text = set_project_data(i.project, pms[:zoom], text, prj_map) + text = set_version_data(i.fixed_version, pms[:zoom], text, version_map) + is = i + end + #render :text=>text + return text, 200 + rescue => e + #render :text=>@issue.errors.full_messages.join("\n") + "|" + text_for_revert , :status=>400 + if @issue.errors.full_messages.to_s == "" + return e.to_s + "\n" + [$!,$@.join("\n")].join("\n") + "\n" + @issue.errors.full_messages.join("\n") + "|" + text_for_revert, 400 + else + return @issue.errors.full_messages.join("\n") + "|" + text_for_revert, 400 + end + end + end + #pend + private def coordinates(start_date, end_date, progress, zoom=nil) @@ -737,33 +915,67 @@ output = '' # Renders the task bar, with progress and late if coords[:bar_start] && coords[:bar_end] - output << "
 
".html_safe + #pstart + i_width = coords[:bar_end] - coords[:bar_start] - 2 + output << "
".html_safe + output << "
 
".html_safe + #pend if coords[:bar_late_end] - output << "
 
".html_safe + #pstart + l_width = coords[:bar_late_end] - coords[:bar_start] - 2 + output << "
 
".html_safe + else + output << "
 
".html_safe + #pend end if coords[:bar_progress_end] - output << "
 
".html_safe + #pstart + d_width = coords[:bar_progress_end] - coords[:bar_start] - 2 + output << "
 
".html_safe + else + output << "
 
".html_safe + #pend end + #pstart + output << "
".html_safe + else + output << "
".html_safe + output << "
 
".html_safe + output << "
 
".html_safe + output << "
 
".html_safe + output << "
".html_safe + #pend end # Renders the markers if options[:markers] if coords[:start] - output << "
 
".html_safe + #pstart + output << "
 
".html_safe + #pend end if coords[:end] - output << "
 
".html_safe + #pstart + output << "
 
".html_safe + #pend end + #pstart + else + 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);}') #pend end # Renders the label on the right if options[:label] - output << "
".html_safe + #psrat + output << "
".html_safe + #pend output << options[:label] output << "
".html_safe end # Renders the tooltip if options[:issue] && coords[:bar_start] && coords[:bar_end] - output << "
".html_safe + #pstart + output << "
".html_safe + #pend output << ''.html_safe output << view.render_issue_tooltip(options[:issue]).html_safe output << "
".html_safe @@ -855,6 +1067,212 @@ params[:image].text(params[:subject_width] + (coords[:bar_end] || 0) + 5,params[:top] + 1, options[:label]) end end + + #pstart + ## + ## 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) + z = zoom_str.to_i + zoom = 1 + z.times { zoom = zoom * 2} + id = issue.due_before + if id && @date_to < id + id = @date_to + end + coords = coordinates(issue.start_date, id, issue.done_ratio, zoom) + + i_left, i_width, l_width, d_width = get_pos(coords) + if coords[:end] + return i_left, i_width, l_width, d_width, coords[:start], coords[:end] + zoom + else + return i_left, i_width, l_width, d_width, coords[:start], nil + end + end + + def get_project_position(project, zoom_str) + z = zoom_str.to_i + zoom = 1 + z.times { zoom = zoom * 2} + pd = project.due_date + if pd && @date_to < pd + pd = @date_to + end + coords = coordinates(project.start_date, pd, nil, zoom) + i_left, i_width, l_width, d_width = get_pos(coords) + if coords[:end] + return i_left, i_width, l_width, d_width, coords[:start], coords[:end] + zoom + else + return i_left, i_width, l_width, d_width, coords[:start], nil + end + end + + def get_version_position(version, zoom_str) + z = zoom_str.to_i + zoom = 1 + z.times { zoom = zoom * 2} + vd = version.due_date + if vd && @date_to < vd + vd = @date_to + end + coords = coordinates(version.start_date, vd, version.completed_pourcent, zoom) + i_left, i_width, l_width, d_width = get_pos(coords) + if coords[:end] + return i_left, i_width, l_width, d_width, coords[:start], coords[:end] + zoom + else + return i_left, i_width, l_width, d_width, coords[:start], nil + end + 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 + @calendars << "
" + start_date = issue.start_date + if start_date + @calendars << "" + @calendars << format_date(start_date) + @calendars << "" + @calendars << "" + if issue.leaf? + @calendars << "#{view.g_calendar_for('i' + issue.id.to_s + '_start_date')}" + else + @calendars << "   " + end + @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 << "" + if issue.leaf? + @calendars << "#{view.g_calendar_for('i' + issue.id.to_s + '_due_date')}" + else + @calendars << "" + end + @calendars << observe_date_field("i#{issue.id}", 'due') + end + @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_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 = '' + prj_id = '' + prj_id = @project.to_param if @project + output << "" + end + #pend + end end end Index: public/stylesheets/application.css =================================================================== --- public/stylesheets/application.css (revision 9835) +++ public/stylesheets/application.css (working copy) @@ -857,6 +857,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;}