--- /dev/null
+class GanttsController < ApplicationController
+ before_filter :find_optional_project
+
+ rescue_from Query::StatementInvalid, :with => :query_statement_invalid
+
+ helper :issues
+ helper :projects
+ helper :queries
+ include QueriesHelper
+ include Redmine::Export::PDF
+
+ def show
+ @gantt = Redmine::Helpers::Gantt.new(params)
+ retrieve_query
+ @query.group_by = nil
+ if @query.valid?
+ events = []
+ # Issues that have start and due dates
+ events += @query.issues(:include => [:tracker, :assigned_to, :priority],
+ :order => "start_date, due_date",
+ :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
+ )
+ # Issues that don't have a due date but that are assigned to a version with a date
+ events += @query.issues(:include => [:tracker, :assigned_to, :priority, :fixed_version],
+ :order => "start_date, effective_date",
+ :conditions => ["(((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
+ )
+ # Versions
+ events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @gantt.date_from, @gantt.date_to])
+
+ @gantt.events = events
+ end
+
+ basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'
+
+ respond_to do |format|
+ format.html { render :action => "show", :layout => !request.xhr? }
+ format.png { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
+ format.pdf { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") }
+ end
+ end
+
+ private
+
+ # Rescues an invalid query statement. Just in case...
+ # TODO: Refactor, move to ApplicationController with IssuesController
+ def query_statement_invalid(exception)
+ logger.error "Query::StatementInvalid: #{exception.message}" if logger
+ session.delete(:query)
+ sort_clear
+ render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
+ end
+
+ # TODO: Refactor, duplicates IssuesController
+ def find_optional_project
+ @project = Project.find(params[:project_id]) unless params[:project_id].blank?
+ allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
+ allowed ? true : deny_access
+ rescue ActiveRecord::RecordNotFound
+ render_404
+ end
+
+end
before_filter :find_issue, :only => [:show, :edit, :update, :reply]
before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
before_filter :find_project, :only => [:new, :create, :update_form, :preview, :auto_complete]
- before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :context_menu]
- before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
+ before_filter :authorize, :except => [:index, :changes, :calendar, :preview, :context_menu]
+ before_filter :find_optional_project, :only => [:index, :changes, :calendar]
before_filter :check_for_default_issue_status, :only => [:new, :create]
before_filter :build_new_issue_from_params, :only => [:new, :create]
accept_key_auth :index, :show, :changes
end
end
- def gantt
- @gantt = Redmine::Helpers::Gantt.new(params)
- retrieve_query
- @query.group_by = nil
- if @query.valid?
- events = []
- # Issues that have start and due dates
- events += @query.issues(:include => [:tracker, :assigned_to, :priority],
- :order => "start_date, due_date",
- :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
- )
- # Issues that don't have a due date but that are assigned to a version with a date
- events += @query.issues(:include => [:tracker, :assigned_to, :priority, :fixed_version],
- :order => "start_date, effective_date",
- :conditions => ["(((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
- )
- # Versions
- events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @gantt.date_from, @gantt.date_to])
-
- @gantt.events = events
- end
-
- basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'
-
- respond_to do |format|
- format.html { render :template => "issues/gantt.rhtml", :layout => !request.xhr? }
- format.png { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{basename}.png") } if @gantt.respond_to?('to_image')
- format.pdf { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") }
- end
- end
-
def calendar
if params[:year] and params[:year].to_i > 1900
@year = params[:year].to_i
--- /dev/null
+<h2><%= l(:label_gantt) %></h2>
+
+<% form_tag(params.merge(:month => nil, :year => nil, :months => nil), :id => 'query_form') do %>
+<fieldset id="filters" class="collapsible">
+ <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
+ <div>
+ <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+ </div>
+</fieldset>
+
+<p style="float:right;">
+<%= if @gantt.zoom < 4
+ link_to_remote image_tag('zoom_in.png'), {:url => @gantt.params.merge(:zoom => (@gantt.zoom+1)), :update => 'content'}, {:href => url_for(@gantt.params.merge(:zoom => (@gantt.zoom+1)))}
+ else
+ image_tag 'zoom_in_g.png'
+ end %>
+<%= if @gantt.zoom > 1
+ link_to_remote image_tag('zoom_out.png'), {:url => @gantt.params.merge(:zoom => (@gantt.zoom-1)), :update => 'content'}, {:href => url_for(@gantt.params.merge(:zoom => (@gantt.zoom-1)))}
+ else
+ image_tag 'zoom_out_g.png'
+ end %>
+</p>
+
+<p class="buttons">
+<%= text_field_tag 'months', @gantt.months, :size => 2 %>
+<%= l(:label_months_from) %>
+<%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
+<%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
+<%= hidden_field_tag 'zoom', @gantt.zoom %>
+
+<%= link_to_remote l(:button_apply),
+ { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
+ :update => "content",
+ :with => "Form.serialize('query_form')"
+ }, :class => 'icon icon-checked' %>
+
+<%= link_to_remote l(:button_clear),
+ { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
+ :update => "content",
+ }, :class => 'icon icon-reload' if @query.new_record? %>
+</p>
+<% end %>
+
+<%= error_messages_for 'query' %>
+<% if @query.valid? %>
+<% zoom = 1
+@gantt.zoom.times { zoom = zoom * 2 }
+
+subject_width = 330
+header_heigth = 18
+
+headers_height = header_heigth
+show_weeks = false
+show_days = false
+
+if @gantt.zoom >1
+ show_weeks = true
+ headers_height = 2*header_heigth
+ if @gantt.zoom > 2
+ show_days = true
+ headers_height = 3*header_heigth
+ end
+end
+
+g_width = (@gantt.date_to - @gantt.date_from + 1)*zoom
+g_height = [(20 * @gantt.events.length + 6)+150, 206].max
+t_height = g_height + headers_height
+%>
+
+<table width="100%" style="border:0; border-collapse: collapse;">
+<tr>
+<td style="width:<%= subject_width %>px; padding:0px;">
+
+<div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
+<div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
+<div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
+<%
+#
+# Tasks subjects
+#
+top = headers_height + 8
+@gantt.events.each do |i|
+left = 4 + (i.is_a?(Issue) ? i.level * 16 : 0)
+ %>
+ <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:<%= left %>px;overflow:hidden;"><small>
+ <% if i.is_a? Issue %>
+ <%= h("#{i.project} -") unless @project && @project == i.project %>
+ <%= link_to_issue i %>
+ <% else %>
+ <span class="icon icon-package">
+ <%= link_to_version i %>
+ </span>
+ <% end %>
+ </small></div>
+ <% top = top + 20
+end %>
+</div>
+</td>
+<td>
+
+<div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
+<div style="width:<%= g_width-1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"> </div>
+<%
+#
+# Months headers
+#
+month_f = @gantt.date_from
+left = 0
+height = (show_weeks ? header_heigth : header_heigth + g_height)
+@gantt.months.times do
+ width = ((month_f >> 1) - month_f) * zoom - 1
+ %>
+ <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
+ <%= 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}"%>
+ </div>
+ <%
+ left = left + width + 1
+ month_f = month_f >> 1
+end %>
+
+<%
+#
+# Weeks headers
+#
+if show_weeks
+ left = 0
+ height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
+ if @gantt.date_from.cwday == 1
+ # @date_from is monday
+ week_f = @gantt.date_from
+ else
+ # find next monday after @date_from
+ week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
+ width = (7 - @gantt.date_from.cwday + 1) * zoom-1
+ %>
+ <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr"> </div>
+ <%
+ left = left + width+1
+ end %>
+ <%
+ while week_f <= @gantt.date_to
+ width = (week_f + 6 <= @gantt.date_to) ? 7 * zoom -1 : (@gantt.date_to - week_f + 1) * zoom-1
+ %>
+ <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
+ <small><%= week_f.cweek if width >= 16 %></small>
+ </div>
+ <%
+ left = left + width+1
+ week_f = week_f+7
+ end
+end %>
+
+<%
+#
+# Days headers
+#
+if show_days
+ left = 0
+ height = g_height + header_heigth - 1
+ wday = @gantt.date_from.cwday
+ (@gantt.date_to - @gantt.date_from + 1).to_i.times do
+ width = zoom - 1
+ %>
+ <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
+ <%= day_name(wday).first %>
+ </div>
+ <%
+ left = left + width+1
+ wday = wday + 1
+ wday = 1 if wday > 7
+ end
+end %>
+
+<%
+#
+# Tasks
+#
+top = headers_height + 10
+@gantt.events.each do |i|
+ if i.is_a? Issue
+ 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 <= @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 - @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
+ css = "task " + (i.leaf? ? 'leaf' : 'parent')
+ %>
+ <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="<%= css %> task_todo"><div class="left"></div> <div class="right"></div></div>
+ <% if l_width > 0 %>
+ <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="<%= css %> task_late"> </div>
+ <% end %>
+ <% if d_width > 0 %>
+ <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="<%= css %> task_done"> </div>
+ <% end %>
+ <div style="top:<%= top %>px;left:<%= i_left + i_width + 8 %>px;background:#fff;" class="<%= css %>">
+ <%= i.status.name %>
+ <%= (i.done_ratio).to_i %>%
+ </div>
+ <div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
+ <span class="tip">
+ <%= render_issue_tooltip i %>
+ </span></div>
+<% else
+ i_left = ((i.start_date - @gantt.date_from)*zoom).floor
+ %>
+ <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone"> </div>
+ <div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
+ <strong><%= format_version_name i %></strong>
+ </div>
+<% end %>
+ <% top = top + 20
+end %>
+
+<%
+#
+# Today red line (excluded from cache)
+#
+if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
+ <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= ((Date.today-@gantt.date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;"> </div>
+<% end %>
+
+</div>
+</td>
+</tr>
+</table>
+
+<table width="100%">
+<tr>
+<td align="left"><%= link_to_remote ('« ' + l(:label_previous)), {:url => @gantt.params_previous, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_previous)} %></td>
+<td align="right"><%= link_to_remote (l(:label_next) + ' »'), {:url => @gantt.params_next, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_next)} %></td>
+</tr>
+</table>
+
+<% other_formats_links do |f| %>
+ <%= f.link_to 'PDF', :url => @gantt.params %>
+ <%= f.link_to('PNG', :url => @gantt.params) if @gantt.respond_to?('to_image') %>
+<% end %>
+<% end # query.valid? %>
+
+<% content_for :sidebar do %>
+ <%= render :partial => 'issues/sidebar' %>
+<% end %>
+
+<% html_title(l(:label_gantt)) -%>
<%= link_to(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) %><br />
<% end %>
<% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
- <%= link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) %><br />
+ <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %><br />
<% end %>
<%= call_hook(:view_issues_sidebar_planning_bottom) %>
+++ /dev/null
-<h2><%= l(:label_gantt) %></h2>
-
-<% form_tag(params.merge(:month => nil, :year => nil, :months => nil), :id => 'query_form') do %>
-<fieldset id="filters" class="collapsible">
- <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
- <div>
- <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
- </div>
-</fieldset>
-
-<p style="float:right;">
-<%= if @gantt.zoom < 4
- link_to_remote image_tag('zoom_in.png'), {:url => @gantt.params.merge(:zoom => (@gantt.zoom+1)), :update => 'content'}, {:href => url_for(@gantt.params.merge(:zoom => (@gantt.zoom+1)))}
- else
- image_tag 'zoom_in_g.png'
- end %>
-<%= if @gantt.zoom > 1
- link_to_remote image_tag('zoom_out.png'), {:url => @gantt.params.merge(:zoom => (@gantt.zoom-1)), :update => 'content'}, {:href => url_for(@gantt.params.merge(:zoom => (@gantt.zoom-1)))}
- else
- image_tag 'zoom_out_g.png'
- end %>
-</p>
-
-<p class="buttons">
-<%= text_field_tag 'months', @gantt.months, :size => 2 %>
-<%= l(:label_months_from) %>
-<%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
-<%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
-<%= hidden_field_tag 'zoom', @gantt.zoom %>
-
-<%= link_to_remote l(:button_apply),
- { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
- :update => "content",
- :with => "Form.serialize('query_form')"
- }, :class => 'icon icon-checked' %>
-
-<%= link_to_remote l(:button_clear),
- { :url => { :set_filter => (@query.new_record? ? 1 : nil) },
- :update => "content",
- }, :class => 'icon icon-reload' if @query.new_record? %>
-</p>
-<% end %>
-
-<%= error_messages_for 'query' %>
-<% if @query.valid? %>
-<% zoom = 1
-@gantt.zoom.times { zoom = zoom * 2 }
-
-subject_width = 330
-header_heigth = 18
-
-headers_height = header_heigth
-show_weeks = false
-show_days = false
-
-if @gantt.zoom >1
- show_weeks = true
- headers_height = 2*header_heigth
- if @gantt.zoom > 2
- show_days = true
- headers_height = 3*header_heigth
- end
-end
-
-g_width = (@gantt.date_to - @gantt.date_from + 1)*zoom
-g_height = [(20 * @gantt.events.length + 6)+150, 206].max
-t_height = g_height + headers_height
-%>
-
-<table width="100%" style="border:0; border-collapse: collapse;">
-<tr>
-<td style="width:<%= subject_width %>px; padding:0px;">
-
-<div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
-<div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
-<div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
-<%
-#
-# Tasks subjects
-#
-top = headers_height + 8
-@gantt.events.each do |i|
-left = 4 + (i.is_a?(Issue) ? i.level * 16 : 0)
- %>
- <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:<%= left %>px;overflow:hidden;"><small>
- <% if i.is_a? Issue %>
- <%= h("#{i.project} -") unless @project && @project == i.project %>
- <%= link_to_issue i %>
- <% else %>
- <span class="icon icon-package">
- <%= link_to_version i %>
- </span>
- <% end %>
- </small></div>
- <% top = top + 20
-end %>
-</div>
-</td>
-<td>
-
-<div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
-<div style="width:<%= g_width-1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"> </div>
-<%
-#
-# Months headers
-#
-month_f = @gantt.date_from
-left = 0
-height = (show_weeks ? header_heigth : header_heigth + g_height)
-@gantt.months.times do
- width = ((month_f >> 1) - month_f) * zoom - 1
- %>
- <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
- <%= 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}"%>
- </div>
- <%
- left = left + width + 1
- month_f = month_f >> 1
-end %>
-
-<%
-#
-# Weeks headers
-#
-if show_weeks
- left = 0
- height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
- if @gantt.date_from.cwday == 1
- # @date_from is monday
- week_f = @gantt.date_from
- else
- # find next monday after @date_from
- week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
- width = (7 - @gantt.date_from.cwday + 1) * zoom-1
- %>
- <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr"> </div>
- <%
- left = left + width+1
- end %>
- <%
- while week_f <= @gantt.date_to
- width = (week_f + 6 <= @gantt.date_to) ? 7 * zoom -1 : (@gantt.date_to - week_f + 1) * zoom-1
- %>
- <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
- <small><%= week_f.cweek if width >= 16 %></small>
- </div>
- <%
- left = left + width+1
- week_f = week_f+7
- end
-end %>
-
-<%
-#
-# Days headers
-#
-if show_days
- left = 0
- height = g_height + header_heigth - 1
- wday = @gantt.date_from.cwday
- (@gantt.date_to - @gantt.date_from + 1).to_i.times do
- width = zoom - 1
- %>
- <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>" class="gantt_hdr">
- <%= day_name(wday).first %>
- </div>
- <%
- left = left + width+1
- wday = wday + 1
- wday = 1 if wday > 7
- end
-end %>
-
-<%
-#
-# Tasks
-#
-top = headers_height + 10
-@gantt.events.each do |i|
- if i.is_a? Issue
- 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 <= @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 - @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
- css = "task " + (i.leaf? ? 'leaf' : 'parent')
- %>
- <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="<%= css %> task_todo"><div class="left"></div> <div class="right"></div></div>
- <% if l_width > 0 %>
- <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="<%= css %> task_late"> </div>
- <% end %>
- <% if d_width > 0 %>
- <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="<%= css %> task_done"> </div>
- <% end %>
- <div style="top:<%= top %>px;left:<%= i_left + i_width + 8 %>px;background:#fff;" class="<%= css %>">
- <%= i.status.name %>
- <%= (i.done_ratio).to_i %>%
- </div>
- <div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
- <span class="tip">
- <%= render_issue_tooltip i %>
- </span></div>
-<% else
- i_left = ((i.start_date - @gantt.date_from)*zoom).floor
- %>
- <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone"> </div>
- <div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
- <strong><%= format_version_name i %></strong>
- </div>
-<% end %>
- <% top = top + 20
-end %>
-
-<%
-#
-# Today red line (excluded from cache)
-#
-if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
- <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= ((Date.today-@gantt.date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;"> </div>
-<% end %>
-
-</div>
-</td>
-</tr>
-</table>
-
-<table width="100%">
-<tr>
-<td align="left"><%= link_to_remote ('« ' + l(:label_previous)), {:url => @gantt.params_previous, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_previous)} %></td>
-<td align="right"><%= link_to_remote (l(:label_next) + ' »'), {:url => @gantt.params_next, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_next)} %></td>
-</tr>
-</table>
-
-<% other_formats_links do |f| %>
- <%= f.link_to 'PDF', :url => @gantt.params %>
- <%= f.link_to('PNG', :url => @gantt.params) if @gantt.respond_to?('to_image') %>
-<% end %>
-<% end # query.valid? %>
-
-<% content_for :sidebar do %>
- <%= render :partial => 'issues/sidebar' %>
-<% end %>
-
-<% html_title(l(:label_gantt)) -%>
| <%= link_to(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) %>
<% end %>
<% if User.current.allowed_to?(:view_gantt, @project, :global => true) %>
- | <%= link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) %>
+ | <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %>
<% end %>
</p>
</div>
issues_views.connect 'projects/:project_id/issues', :action => 'index'
issues_views.connect 'projects/:project_id/issues.:format', :action => 'index'
issues_views.connect 'projects/:project_id/issues/new', :action => 'new'
- issues_views.connect 'projects/:project_id/issues/gantt', :action => 'gantt'
+ issues_views.connect 'projects/:project_id/issues/gantt', :controller => 'gantts', :action => 'show'
issues_views.connect 'projects/:project_id/issues/calendar', :action => 'calendar'
issues_views.connect 'projects/:project_id/issues/:copy_from/copy', :action => 'new'
issues_views.connect 'issues/:id', :action => 'show', :id => /\d+/
issues_routes.with_options :conditions => {:method => :post} do |issues_actions|
issues_actions.connect 'issues', :action => 'index'
issues_actions.connect 'projects/:project_id/issues', :action => 'create'
+ issues_actions.connect 'projects/:project_id/issues/gantt', :controller => 'gantts', :action => 'show'
issues_actions.connect 'issues/:id/quoted', :action => 'reply', :id => /\d+/
issues_actions.connect 'issues/:id/:action', :action => /edit|move|destroy/, :id => /\d+/
issues_actions.connect 'issues.:format', :action => 'create', :format => /xml/
issues_routes.with_options :conditions => {:method => :delete} do |issues_actions|
issues_actions.connect 'issues/:id.:format', :action => 'destroy', :id => /\d+/, :format => /xml/
end
+ issues_routes.connect 'issues/gantt', :controller => 'gantts', :action => 'show'
issues_routes.connect 'issues/:action'
end
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, :issues => :gantt
+ map.permission :view_gantt, :gantts => :show
map.permission :view_calendar, :issues => :calendar
# Watchers
map.permission :view_issue_watchers, {}
--- /dev/null
+require 'test_helper'
+
+class GanttsControllerTest < ActionController::TestCase
+ fixtures :all
+
+ context "#gantt" do
+ should "work" do
+ get :show, :project_id => 1
+ assert_response :success
+ assert_template 'show.html.erb'
+ 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
+
+ should "work cross project" do
+ get :show
+ assert_response :success
+ assert_template 'show.html.erb'
+ assert_not_nil assigns(:gantt)
+ events = assigns(:gantt).events
+ assert_not_nil events
+ end
+
+ should "export to pdf" do
+ get :show, :project_id => 1, :format => 'pdf'
+ assert_response :success
+ assert_equal 'application/pdf', @response.content_type
+ assert @response.body.starts_with?('%PDF')
+ assert_not_nil assigns(:gantt)
+ end
+
+ should "export to pdf cross project" do
+ get :show, :format => 'pdf'
+ assert_response :success
+ assert_equal 'application/pdf', @response.content_type
+ assert @response.body.starts_with?('%PDF')
+ assert_not_nil assigns(:gantt)
+ end
+
+ should "export to png" do
+ get :show, :project_id => 1, :format => 'png'
+ assert_response :success
+ assert_equal 'image/png', @response.content_type
+ end if Object.const_defined?(:Magick)
+
+ end
+end
assert_equal columns, session[:query][:column_names].map(&:to_s)
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_cross_project_gantt
- get :gantt
- assert_response :success
- assert_template 'gantt.rhtml'
- assert_not_nil assigns(:gantt)
- events = assigns(:gantt).events
- assert_not_nil events
- end
-
- def test_gantt_export_to_pdf
- get :gantt, :project_id => 1, :format => 'pdf'
- assert_response :success
- assert_equal 'application/pdf', @response.content_type
- assert @response.body.starts_with?('%PDF')
- assert_not_nil assigns(:gantt)
- end
-
- def test_cross_project_gantt_export_to_pdf
- get :gantt, :format => 'pdf'
- assert_response :success
- assert_equal 'application/pdf', @response.content_type
- assert @response.body.starts_with?('%PDF')
- 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_calendar
get :calendar, :project_id => 1
assert_response :success
should_route :get, "/projects/project-name/issues/calendar", :controller => 'issues', :action => 'calendar', :project_id => 'project-name'
should_route :post, "/projects/project-name/issues/calendar", :controller => 'issues', :action => 'calendar', :project_id => 'project-name'
- should_route :get, "/issues/gantt", :controller => 'issues', :action => 'gantt'
- should_route :post, "/issues/gantt", :controller => 'issues', :action => 'gantt'
- should_route :get, "/projects/project-name/issues/gantt", :controller => 'issues', :action => 'gantt', :project_id => 'project-name'
- should_route :post, "/projects/project-name/issues/gantt", :controller => 'issues', :action => 'gantt', :project_id => 'project-name'
+ should_route :get, "/issues/gantt", :controller => 'gantts', :action => 'show'
+ should_route :post, "/issues/gantt", :controller => 'gantts', :action => 'show'
+ should_route :get, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'show', :project_id => 'project-name'
+ should_route :post, "/projects/project-name/issues/gantt", :controller => 'gantts', :action => 'show', :project_id => 'project-name'
should_route :get, "/issues/auto_complete", :controller => 'issues', :action => 'auto_complete'
end
projects / redmine.git / commitdiff