-
-
-
+
+
+
<%= @gantt.subjects.html_safe %>
@@ -77,9 +223,22 @@ t_height = g_height + headers_height
+
+
+
+
+
+
+
+<%= @gantt.calendars %>
+
+
+
+
-
+
<%
#
@@ -139,15 +298,18 @@ if show_days
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 %>
+
5 %>" class="gantt_hdr">
+
+ <%= "#{dt.day}
<%
left = left + width + 1
wday = wday + 1
+ dt = dt + 1
wday = 1 if wday > 7
end
end %>
diff -rupN a/config/routes.rb b/config/routes.rb
--- a/config/routes.rb 2012-06-18 23:24:21.000000000 +0300
+++ b/config/routes.rb 2012-07-20 13:36:06.000000000 +0300
@@ -65,6 +65,10 @@ ActionController::Routing::Routes.draw d
gantts_routes.connect '/projects/:project_id/issues/gantt.:format'
gantts_routes.connect '/issues/gantt.:format'
end
+ map.connect '/gantts/edit_gantt', :controller => 'gantts', :action => 'edit_gantt',
+ :conditions => { :method => :get}
+ map.connect '/gantts/edit_gantt/:id', :controller => 'gantts', :action => 'edit_gantt',
+ :conditions => { :method => :post}
map.with_options :controller => 'calendars', :action => 'show' do |calendars_routes|
calendars_routes.connect '/projects/:project_id/issues/calendar'
diff -rupN a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
--- a/lib/redmine/helpers/gantt.rb 2012-06-18 23:24:23.000000000 +0300
+++ b/lib/redmine/helpers/gantt.rb 2012-07-20 13:43:37.000000000 +0300
@@ -70,6 +70,7 @@ module Redmine
@subjects = ''
@lines = ''
+ @calendars = ''
@number_of_rows = nil
@issue_ancestors = []
@@ -129,6 +130,12 @@ module Redmine
@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
+
# Returns issues that will be rendered
def issues
@issues ||= @query.issues(
@@ -175,8 +182,15 @@ module Redmine
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
+ 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
+
@number_of_rows = 0
Project.project_tree(projects) do |project, level|
@@ -185,15 +199,32 @@ module Redmine
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]
@@ -220,8 +251,17 @@ module Redmine
@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
@@ -233,8 +273,17 @@ module Redmine
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
@@ -283,7 +332,11 @@ module Redmine
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 +375,11 @@ module Redmine
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 +433,23 @@ module Redmine
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 +689,107 @@ module Redmine
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 +909,67 @@ module Redmine
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 +1061,233 @@ module Redmine
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 << ""
+ @calendars << format_date(start_date)
+ @calendars << " "
+ @calendars << "
"
+ end
+ due_date = issue.due_date
+ if due_date
+ @calendars << "
"
+ @calendars << ""
+ @calendars << format_date(due_date)
+ @calendars << " "
+ @calendars << "
"
+ else
+ @calendars << "
"
+ @calendars << ""
+ @calendars << "Not set"
+ @calendars << " "
+ @calendars << "
"
+ 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 << ""
+ @calendars << format_date(project.start_date) if project.start_date
+ @calendars << " "
+ @calendars << "
"
+ @calendars << "
"
+ @calendars << ""
+ @calendars << format_date(project.due_date) if project.due_date
+ @calendars << " "
+ @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
diff -rupN a/public/stylesheets/application.css b/public/stylesheets/application.css
--- a/public/stylesheets/application.css 2012-06-18 23:24:30.000000000 +0300
+++ b/public/stylesheets/application.css 2012-07-20 13:36:06.000000000 +0300
@@ -912,6 +912,7 @@ background-image:url('../images/close_hl
.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;}
diff -rupN a/test/integration/routing/gantts_test.rb b/test/integration/routing/gantts_test.rb
--- a/test/integration/routing/gantts_test.rb 2012-06-18 23:23:36.000000000 +0300
+++ b/test/integration/routing/gantts_test.rb 2012-07-20 13:52:55.000000000 +0300
@@ -37,5 +37,9 @@ class RoutingGanttsTest < ActionControll
{ :controller => 'gantts', :action => 'show',
:project_id => 'project-name', :format => 'pdf' }
)
+ assert_routing(
+ { :method => 'get', :path => "/gantts/edit_gantt" },
+ { :controller => 'gantts', :action => 'edit_gantt' }
+ )
end
end