- <%= link_to "#{month_f.year}-#{month_f.month}", { :year => month_f.year, :month => month_f.month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }, :title => "#{month_name(month_f.month)} #{month_f.year}"%>
+ <%= link_to "#{month_f.year}-#{month_f.month}", @gantt.params.merge(:year => month_f.year, :month => month_f.month), :title => "#{month_name(month_f.month)} #{month_f.year}"%>
<%
left = left + width + 1
@@ -112,21 +128,21 @@ end %>
if show_weeks
left = 0
height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
- if @date_from.cwday == 1
+ if @gantt.date_from.cwday == 1
# @date_from is monday
- week_f = @date_from
+ week_f = @gantt.date_from
else
# find next monday after @date_from
- week_f = @date_from + (7 - @date_from.cwday + 1)
- width = (7 - @date_from.cwday + 1) * zoom-1
+ week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
+ width = (7 - @gantt.date_from.cwday + 1) * zoom-1
%>
<%= week_f.cweek if width >= 16 %>
@@ -144,8 +160,8 @@ end %>
if show_days
left = 0
height = g_height + header_heigth - 1
- wday = @date_from.cwday
- (@date_to - @date_from + 1).to_i.times do
+ wday = @gantt.date_from.cwday
+ (@gantt.date_to - @gantt.date_from + 1).to_i.times do
width = zoom - 1
%>
5 %>" class="gantt_hdr">
@@ -163,18 +179,18 @@ end %>
# Tasks
#
top = headers_height + 10
-@events.each do |i|
+@gantt.events.each do |i|
if i.is_a? Issue
- i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
- i_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
+ i_start_date = (i.start_date >= @gantt.date_from ? i.start_date : @gantt.date_from )
+ i_end_date = (i.due_before <= @gantt.date_to ? i.due_before : @gantt.date_to )
i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
- i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
- i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
+ i_done_date = (i_done_date <= @gantt.date_from ? @gantt.date_from : i_done_date )
+ i_done_date = (i_done_date >= @gantt.date_to ? @gantt.date_to : i_done_date )
i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
- i_left = ((i_start_date - @date_from)*zoom).floor
+ i_left = ((i_start_date - @gantt.date_from)*zoom).floor
i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2 # total width of the issue (- 2 for left and right borders)
d_width = ((i_done_date - i_start_date)*zoom).floor - 2 # done width
l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
@@ -195,7 +211,7 @@ top = headers_height + 10
<%= render_issue_tooltip i %>
<% else
- i_left = ((i.start_date - @date_from)*zoom).floor
+ i_left = ((i.start_date - @gantt.date_from)*zoom).floor
%>
@@ -210,8 +226,8 @@ end %>
#
# Today red line (excluded from cache)
#
-if Date.today >= @date_from and Date.today <= @date_to %>
-
+if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
+
<% end %>
@@ -221,29 +237,22 @@ if Date.today >= @date_from and Date.today <= @date_to %>
-| <%= link_to ('« ' + l(:label_previous)), :year => (@date_from << @months).year, :month => (@date_from << @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] %> |
-<%= link_to (l(:label_next) + ' »'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] %> |
+<%= link_to_remote ('« ' + l(:label_previous)), {:url => @gantt.params_previous, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_previous)} %> |
+<%= link_to_remote (l(:label_next) + ' »'), {:url => @gantt.params_next, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_next)} %> |
<%= l(:label_export_to) %>
-<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'pdf'}, :class => 'pdf' %>
-<%= content_tag('span', link_to('PNG', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'png'}, :class => 'image')) if respond_to?('gantt_image') %>
+<%= link_to 'PDF', @gantt.params.merge(:format => 'pdf'), :class => 'pdf' %>
+<% if @gantt.respond_to?('to_image') %>
+<%= link_to 'PNG', @gantt.params.merge(:format => 'png'), :class => 'image' %>
+<% end %>
+<% end # query.valid? %>
<% content_for :sidebar do %>
-
<%= l(:label_gantt) %>
- <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil), :method => :get) do %>
- <% @trackers.each do |tracker| %>
-
- <% end %>
- <% if @project.active_children.any? %>
-
- <%= hidden_field_tag 'with_subprojects', 0 %>
- <% end %>
-
<%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %>
- <% end %>
+ <%= render :partial => 'issues/sidebar' %>
<% end %>
<% html_title(l(:label_gantt)) -%>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index d058ecf0f..fa0a60cdc 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -58,7 +58,7 @@
<% content_for :sidebar do %>
<% planning_links = []
planning_links << link_to_if_authorized(l(:label_calendar), :action => 'calendar', :id => @project)
- planning_links << link_to_if_authorized(l(:label_gantt), :action => 'gantt', :id => @project)
+ planning_links << link_to_if_authorized(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project)
planning_links.compact!
unless planning_links.empty? %>
<%= l(:label_planning) %>
diff --git a/config/initializers/20-mime_types.rb b/config/initializers/20-mime_types.rb
index 269742b16..dabac3463 100644
--- a/config/initializers/20-mime_types.rb
+++ b/config/initializers/20-mime_types.rb
@@ -2,3 +2,4 @@
Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
Mime::Type.register 'application/pdf', :pdf
+Mime::Type.register 'image/png', :png
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 3ba2f2cc3..882c1c917 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -45,7 +45,7 @@ Redmine::AccessControl.map do |map|
map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
map.permission :save_queries, {:queries => [:new, :edit, :destroy]}, :require => :loggedin
# Gantt & calendar
- map.permission :view_gantt, :projects => :gantt
+ map.permission :view_gantt, :issues => :gantt
map.permission :view_calendar, :projects => :calendar
# Watchers
map.permission :view_issue_watchers, {}
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
new file mode 100644
index 000000000..e24be1cae
--- /dev/null
+++ b/lib/redmine/helpers/gantt.rb
@@ -0,0 +1,223 @@
+# Redmine - project management software
+# Copyright (C) 2006-2008 Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+module Redmine
+ module Helpers
+ # Simple class to handle gantt chart data
+ class Gantt
+ attr_reader :year_from, :month_from, :date_from, :date_to, :zoom, :months, :events
+
+ def initialize(options={})
+ options = options.dup
+ @events = []
+
+ if options[:year] && options[:year].to_i >0
+ @year_from = options[:year].to_i
+ if options[:month] && options[:month].to_i >=1 && options[:month].to_i <= 12
+ @month_from = options[:month].to_i
+ else
+ @month_from = 1
+ end
+ else
+ @month_from ||= Date.today.month
+ @year_from ||= Date.today.year
+ end
+
+ zoom = (options[:zoom] || User.current.pref[:gantt_zoom]).to_i
+ @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
+ months = (options[:months] || User.current.pref[:gantt_months]).to_i
+ @months = (months > 0 && months < 25) ? months : 6
+
+ # Save gantt parameters as user preference (zoom and months count)
+ if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
+ User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
+ User.current.preference.save
+ end
+
+ @date_from = Date.civil(@year_from, @month_from, 1)
+ @date_to = (@date_from >> @months) - 1
+ end
+
+ def events=(e)
+ @events = e.sort {|x,y| x.start_date <=> y.start_date }
+ end
+
+ def params
+ { :zoom => zoom, :year => year_from, :month => month_from, :months => months }
+ end
+
+ def params_previous
+ { :year => (date_from << months).year, :month => (date_from << months).month, :zoom => zoom, :months => months }
+ end
+
+ def params_next
+ { :year => (date_from >> months).year, :month => (date_from >> months).month, :zoom => zoom, :months => months }
+ end
+
+ # Generates a gantt image
+ # Only defined if RMagick is avalaible
+ def to_image(format='PNG')
+ date_to = (@date_from >> @months)-1
+ show_weeks = @zoom > 1
+ show_days = @zoom > 2
+
+ subject_width = 320
+ header_heigth = 18
+ # width of one day in pixels
+ zoom = @zoom*2
+ g_width = (@date_to - @date_from + 1)*zoom
+ g_height = 20 * events.length + 20
+ headers_heigth = (show_weeks ? 2*header_heigth : header_heigth)
+ height = g_height + headers_heigth
+
+ imgl = Magick::ImageList.new
+ imgl.new_image(subject_width+g_width+1, height)
+ gc = Magick::Draw.new
+
+ # Subjects
+ top = headers_heigth + 20
+ gc.fill('black')
+ gc.stroke('transparent')
+ gc.stroke_width(1)
+ events.each do |i|
+ gc.text(4, top + 2, (i.is_a?(Issue) ? i.subject : i.name))
+ top = top + 20
+ end
+
+ # Months headers
+ month_f = @date_from
+ left = subject_width
+ @months.times do
+ width = ((month_f >> 1) - month_f) * zoom
+ gc.fill('white')
+ gc.stroke('grey')
+ gc.stroke_width(1)
+ gc.rectangle(left, 0, left + width, height)
+ gc.fill('black')
+ gc.stroke('transparent')
+ gc.stroke_width(1)
+ gc.text(left.round + 8, 14, "#{month_f.year}-#{month_f.month}")
+ left = left + width
+ month_f = month_f >> 1
+ end
+
+ # Weeks headers
+ if show_weeks
+ left = subject_width
+ height = header_heigth
+ if @date_from.cwday == 1
+ # date_from is monday
+ week_f = date_from
+ else
+ # find next monday after date_from
+ week_f = @date_from + (7 - @date_from.cwday + 1)
+ width = (7 - @date_from.cwday + 1) * zoom
+ gc.fill('white')
+ gc.stroke('grey')
+ gc.stroke_width(1)
+ gc.rectangle(left, header_heigth, left + width, 2*header_heigth + g_height-1)
+ left = left + width
+ end
+ while week_f <= date_to
+ width = (week_f + 6 <= date_to) ? 7 * zoom : (date_to - week_f + 1) * zoom
+ gc.fill('white')
+ gc.stroke('grey')
+ gc.stroke_width(1)
+ gc.rectangle(left.round, header_heigth, left.round + width, 2*header_heigth + g_height-1)
+ gc.fill('black')
+ gc.stroke('transparent')
+ gc.stroke_width(1)
+ gc.text(left.round + 2, header_heigth + 14, week_f.cweek.to_s)
+ left = left + width
+ week_f = week_f+7
+ end
+ end
+
+ # Days details (week-end in grey)
+ if show_days
+ left = subject_width
+ height = g_height + header_heigth - 1
+ wday = @date_from.cwday
+ (date_to - @date_from + 1).to_i.times do
+ width = zoom
+ gc.fill(wday == 6 || wday == 7 ? '#eee' : 'white')
+ gc.stroke('grey')
+ gc.stroke_width(1)
+ gc.rectangle(left, 2*header_heigth, left + width, 2*header_heigth + g_height-1)
+ left = left + width
+ wday = wday + 1
+ wday = 1 if wday > 7
+ end
+ end
+
+ # border
+ gc.fill('transparent')
+ gc.stroke('grey')
+ gc.stroke_width(1)
+ gc.rectangle(0, 0, subject_width+g_width, headers_heigth)
+ gc.stroke('black')
+ gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_heigth-1)
+
+ # content
+ top = headers_heigth + 20
+ gc.stroke('transparent')
+ events.each do |i|
+ if i.is_a?(Issue)
+ i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
+ i_end_date = (i.due_before <= date_to ? i.due_before : date_to )
+ i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
+ i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
+ i_done_date = (i_done_date >= date_to ? date_to : i_done_date )
+ i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
+
+ i_left = subject_width + ((i_start_date - @date_from)*zoom).floor
+ i_width = ((i_end_date - i_start_date + 1)*zoom).floor # total width of the issue
+ d_width = ((i_done_date - i_start_date)*zoom).floor # done width
+ l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor : 0 # delay width
+
+ gc.fill('grey')
+ gc.rectangle(i_left, top, i_left + i_width, top - 6)
+ gc.fill('red')
+ gc.rectangle(i_left, top, i_left + l_width, top - 6) if l_width > 0
+ gc.fill('blue')
+ gc.rectangle(i_left, top, i_left + d_width, top - 6) if d_width > 0
+ gc.fill('black')
+ gc.text(i_left + i_width + 5,top + 1, "#{i.status.name} #{i.done_ratio}%")
+ else
+ i_left = subject_width + ((i.start_date - @date_from)*zoom).floor
+ gc.fill('green')
+ gc.rectangle(i_left, top, i_left + 6, top - 6)
+ gc.fill('black')
+ gc.text(i_left + 11, top + 1, i.name)
+ end
+ top = top + 20
+ end
+
+ # today red line
+ if Date.today >= @date_from and Date.today <= date_to
+ gc.stroke('red')
+ x = (Date.today-@date_from+1)*zoom + subject_width
+ gc.line(x, headers_heigth, x, headers_heigth + g_height-1)
+ end
+
+ gc.draw(imgl)
+ imgl.format = format
+ imgl.to_blob
+ end if Object.const_defined?(:Magick)
+ end
+ end
+end
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e5ca9e8f2..327965281 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -84,7 +84,6 @@ table.list td { vertical-align: top; }
table.list td.id { width: 2%; text-align: center;}
table.list td.checkbox { width: 15px; padding: 0px;}
-table.list.issues { margin-top: 10px; }
tr.issue { text-align: center; white-space: nowrap; }
tr.issue td.subject, tr.issue td.category { white-space: normal; }
tr.issue td.subject { text-align: left; }
@@ -165,7 +164,7 @@ div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid
p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; }
-fieldset#filters { padding: 0.7em; }
+fieldset#filters, fieldset#date-range { padding: 0.7em; margin-bottom: 8px; }
fieldset#filters p { margin: 1.2em 0 0.8em 2px; }
fieldset#filters .buttons { font-size: 0.9em; }
fieldset#filters table { border-collapse: collapse; }
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index a248d8bde..67e7f1f91 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -125,6 +125,41 @@ class IssuesControllerTest < Test::Unit::TestCase
assert_not_nil assigns(:issues)
assert_equal 'application/pdf', @response.content_type
end
+
+ def test_gantt
+ get :gantt, :project_id => 1
+ assert_response :success
+ assert_template 'gantt.rhtml'
+ assert_not_nil assigns(:gantt)
+ events = assigns(:gantt).events
+ assert_not_nil events
+ # Issue with start and due dates
+ i = Issue.find(1)
+ assert_not_nil i.due_date
+ assert events.include?(Issue.find(1))
+ # Issue with without due date but targeted to a version with date
+ i = Issue.find(2)
+ assert_nil i.due_date
+ assert events.include?(i)
+ end
+
+ def test_gantt_export_to_pdf
+ get :gantt, :project_id => 1, :format => 'pdf'
+ assert_response :success
+ assert_template 'gantt.rfpdf'
+ assert_equal 'application/pdf', @response.content_type
+ assert_not_nil assigns(:gantt)
+ end
+
+ if Object.const_defined?(:Magick)
+ def test_gantt_image
+ get :gantt, :project_id => 1, :format => 'png'
+ assert_response :success
+ assert_equal 'image/png', @response.content_type
+ end
+ else
+ puts "RMagick not installed. Skipping tests !!!"
+ end
def test_changes
get :changes, :project_id => 1
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 8e57dc5fd..3d969d11f 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -231,47 +231,6 @@ class ProjectsControllerTest < Test::Unit::TestCase
assert_not_nil assigns(:calendar)
assert_tag :tag => 'a', :content => /#6/
end
-
- def test_gantt
- get :gantt, :id => 1
- assert_response :success
- assert_template 'gantt.rhtml'
- events = assigns(:events)
- assert_not_nil events
- # Issue with start and due dates
- i = Issue.find(1)
- assert_not_nil i.due_date
- assert events.include?(Issue.find(1))
- # Issue with without due date but targeted to a version with date
- i = Issue.find(2)
- assert_nil i.due_date
- assert events.include?(i)
- end
-
- def test_gantt_with_subprojects_should_not_show_private_subprojects
- get :gantt, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
- assert_response :success
- assert_template 'gantt.rhtml'
- assert_not_nil assigns(:events)
- assert_no_tag :tag => 'a', :content => /#6/
- end
-
- def test_gantt_with_subprojects_should_show_private_subprojects
- @request.session[:user_id] = 2
- get :gantt, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
- assert_response :success
- assert_template 'gantt.rhtml'
- assert_not_nil assigns(:events)
- assert_tag :tag => 'a', :content => /#6/
- end
-
- def test_gantt_export_to_pdf
- get :gantt, :id => 1, :format => 'pdf'
- assert_response :success
- assert_template 'gantt.rfpdf'
- assert_equal 'application/pdf', @response.content_type
- assert_not_nil assigns(:events)
- end
def test_archive
@request.session[:user_id] = 1 # admin
diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb
deleted file mode 100644
index d76d92bc9..000000000
--- a/test/unit/helpers/projects_helper_test.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007 Jean-Philippe Lang
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-require File.dirname(__FILE__) + '/../../test_helper'
-
-class ProjectsHelperTest < HelperTestCase
- include ProjectsHelper
- include ActionView::Helpers::TextHelper
- fixtures :projects, :trackers, :issue_statuses, :issues, :enumerations, :users, :issue_categories
-
- def setup
- super
- end
-
- if Object.const_defined?(:Magick)
- def test_gantt_image
- assert gantt_image(Issue.find(:all, :conditions => "start_date IS NOT NULL AND due_date IS NOT NULL"), Date.today, 6, 2)
- end
-
- def test_gantt_image_with_days
- assert gantt_image(Issue.find(:all, :conditions => "start_date IS NOT NULL AND due_date IS NOT NULL"), Date.today, 3, 4)
- end
- else
- puts "RMagick not installed. Skipping tests !!!"
- def test_fake; assert true end
- end
-end