r18533@gaspard (orig r1797): jplang | 2008-09-10 20:26:13 +0200

Adds support for free ticket filtering and custom queries on Gantt chart. ProjectsController#gantt moved to IssuesController. git-svn-id: http://redmine.rubyforge.org/svn/branches/nbc@1833 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-09-14 15:32:03 +00:00
parent 07a1c5beeb
commit 2252d61ef6
14 changed files with 412 additions and 398 deletions
@@ -3,12 +3,22 @@
 <% if @project %>
 <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
 <%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %>
+
+<% planning_links = []
+  planning_links << link_to_if_authorized(l(:label_calendar), :controller => 'projects', :action => 'calendar', :id => @project)
+  planning_links << link_to_if_authorized(l(:label_gantt), :action => 'gantt', :project_id => @project)
+  planning_links.compact!
+  unless planning_links.empty? %>
+<h3><%= l(:label_planning) %></h3>
+<p><%= planning_links.join(' | ') %></p>
+<% end %>
+
 <% end %>

 <% unless sidebar_queries.empty? -%>
 <h3><%= l(:label_query_plural) %></h3>

 <% sidebar_queries.each do |query| -%>
-<%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %><br />
+<%= link_to query.name, :query_id => query %><br />
 <% end -%>
 <% end -%>
@@ -0,0 +1,188 @@
+<%
+pdf=IfpdfHelper::IFPDF.new(current_language)
+pdf.SetTitle("#{@project.name} - #{l(:label_gantt)}")
+pdf.AliasNbPages
+pdf.footer_date = format_date(Date.today)
+pdf.AddPage("L")
+pdf.SetFontStyle('B',12)
+pdf.SetX(15)
+pdf.Cell(70, 20, @project.name)
+pdf.Ln
+pdf.SetFontStyle('B',9)
+
+subject_width = 70
+header_heigth = 5
+
+headers_heigth = header_heigth
+show_weeks = false
+show_days = false
+
+if @gantt.months < 7
+    show_weeks = true
+    headers_heigth = 2*header_heigth
+    if @gantt.months < 3
+        show_days = true
+        headers_heigth = 3*header_heigth
+    end
+end
+
+g_width = 210
+zoom = (g_width) / (@gantt.date_to - @gantt.date_from + 1)
+g_height = 120
+t_height = g_height + headers_heigth
+
+y_start = pdf.GetY
+
+
+#
+# Months headers
+#
+month_f = @gantt.date_from
+left = subject_width
+height = header_heigth
+@gantt.months.times do 
+	width = ((month_f >> 1) - month_f) * zoom 
+	pdf.SetY(y_start)
+	pdf.SetX(left)
+	pdf.Cell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")
+	left = left + width
+	month_f = month_f >> 1
+end  
+
+#
+# Weeks headers
+#
+if show_weeks
+	left = subject_width
+	height = header_heigth
+	if @gantt.date_from.cwday == 1
+	    # @gantt.date_from is monday
+        week_f = @gantt.date_from
+	else
+	    # find next monday after @gantt.date_from
+		week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
+		width = (7 - @gantt.date_from.cwday + 1) * zoom-1
+		pdf.SetY(y_start + header_heigth)
+		pdf.SetX(left)
+		pdf.Cell(width + 1, height, "", "LTR")
+		left = left + width+1
+	end
+	while week_f <= @gantt.date_to
+		width = (week_f + 6 <= @gantt.date_to) ? 7 * zoom : (@gantt.date_to - week_f + 1) * zoom
+		pdf.SetY(y_start + header_heigth)
+		pdf.SetX(left)
+		pdf.Cell(width, height, (width >= 5 ? week_f.cweek.to_s : ""), "LTR", 0, "C")
+		left = left + width
+		week_f = week_f+7
+	end
+end
+
+#
+# Days headers
+#
+if show_days
+	left = subject_width
+	height = header_heigth
+	wday = @gantt.date_from.cwday
+	pdf.SetFontStyle('B',7)
+	(@gantt.date_to - @gantt.date_from + 1).to_i.times do 
+		width = zoom
+		pdf.SetY(y_start + 2 * header_heigth)
+		pdf.SetX(left)
+		pdf.Cell(width, height, day_name(wday).first, "LTR", 0, "C")
+		left = left + width
+		wday = wday + 1
+		wday = 1 if wday > 7
+	end
+end
+
+pdf.SetY(y_start)
+pdf.SetX(15)
+pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)
+
+
+#
+# Tasks
+#
+top = headers_heigth + y_start
+pdf.SetFontStyle('B',7)
+@gantt.events.each do |i|
+	pdf.SetY(top)
+	pdf.SetX(15)
+	
+	if i.is_a? Issue
+		pdf.Cell(subject_width-15, 5, "#{i.tracker.name} #{i.id}: #{i.subject}".sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)'), "LR")
+	else
+		pdf.Cell(subject_width-15, 5, "#{l(:label_version)}: #{i.name}", "LR")
+	end
+
+	pdf.SetY(top)
+	pdf.SetX(subject_width)
+	pdf.Cell(g_width, 5, "", "LR")
+
+	pdf.SetY(top+1.5)
+	
+	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) 
+		i_width = ((i_end_date - i_start_date + 1)*zoom)
+		d_width = ((i_done_date - i_start_date)*zoom)
+		l_width = ((i_late_date - i_start_date+1)*zoom) if i_late_date
+		l_width ||= 0
+	
+		pdf.SetX(subject_width + i_left)
+		pdf.SetFillColor(200,200,200)
+		pdf.Cell(i_width, 2, "", 0, 0, "", 1)
+	
+		if l_width > 0
+			pdf.SetY(top+1.5)
+			pdf.SetX(subject_width + i_left)
+			pdf.SetFillColor(255,100,100)
+			pdf.Cell(l_width, 2, "", 0, 0, "", 1)
+		end 
+		if d_width > 0
+			pdf.SetY(top+1.5)
+			pdf.SetX(subject_width + i_left)
+			pdf.SetFillColor(100,100,255)
+			pdf.Cell(d_width, 2, "", 0, 0, "", 1)
+		end
+		
+		pdf.SetY(top+1.5)
+		pdf.SetX(subject_width + i_left + i_width)
+		pdf.Cell(30, 2, "#{i.status.name} #{i.done_ratio}%")
+	else
+		i_left = ((i.start_date - @gantt.date_from)*zoom) 
+		
+		pdf.SetX(subject_width + i_left)
+		pdf.SetFillColor(50,200,50)
+		pdf.Cell(2, 2, "", 0, 0, "", 1)	
+
+		pdf.SetY(top+1.5)
+		pdf.SetX(subject_width + i_left + 3)
+		pdf.Cell(30, 2, "#{i.name}")
+	end
+	
+	
+	top = top + 5
+	pdf.SetDrawColor(200, 200, 200)
+	pdf.Line(15, top, subject_width+g_width, top)
+	if pdf.GetY() > 180
+		pdf.AddPage("L")
+		top = 20
+		pdf.Line(15, top, subject_width+g_width, top)
+	end
+	pdf.SetDrawColor(0, 0, 0)
+end
+
+pdf.Line(15, top, subject_width+g_width, top)
+
+%>
+<%= pdf.Output %>
@@ -0,0 +1,258 @@
+<% form_tag(params.merge(:month => nil, :year => nil, :months => nil), :id => 'query_form') do %>
+<% if @query.new_record? %>
+    <h2><%=l(:label_gantt)%></h2>
+    <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
+    <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+    </fieldset>
+<% else %>
+    <h2><%=h @query.name %></h2>
+    <div id="query_form"></div>
+    <% html_title @query.name %>
+<% end %>
+
+<fieldset id="date-range"><legend><%= l(:label_date_range) %></legend>
+    <%= 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 %>
+</fieldset>
+
+<p style="float:right; margin:0px;">
+<%= 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">
+<%= 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| %>
+    <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>    
+    <% if i.is_a? Issue %>
+      	<%= h("#{i.project} -") unless @project && @project == i.project %>
+      	<%= link_to_issue i %>:	<%=h i.subject %>
+  	<% else %>
+		<span class="icon icon-package">
+	      	<%= h("#{i.project} -") unless @project && @project == i.project %>
+	      	<%= 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">&nbsp;</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">&nbsp;</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
+	%>
+	<div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
+	<% if l_width > 0 %>
+	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
+	<% end %>
+	<% if d_width > 0 %>
+	    <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
+	<% end %>
+	<div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
+	<%= 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">&nbsp;</div>
+	<div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
+		<%= h("#{i.project} -") unless @project && @project == i.project %>
+		<strong><%=h 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;">&nbsp;</div>
+<% end %>
+
+</div>
+</td>
+</tr>
+</table>
+
+<table width="100%">
+<tr>
+<td align="left"><%= link_to_remote ('&#171; ' + 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) + ' &#187;'), {:url => @gantt.params_next, :update => 'content', :complete => 'window.scrollTo(0,0)'}, {:href => url_for(@gantt.params_next)} %></td>
+</tr>
+</table>
+
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'PDF', @gantt.params.merge(:format => 'pdf'), :class => 'pdf' %></span>
+<% if @gantt.respond_to?('to_image') %>
+<span><%= link_to 'PNG', @gantt.params.merge(:format => 'png'), :class => 'image' %></span>
+<% end %>
+</p>
+<% end # query.valid? %>
+
+<% content_for :sidebar do %>
+    <%= render :partial => 'issues/sidebar' %>
+<% end %>
+
+<% html_title(l(:label_gantt)) -%>