jro_apps/redmine Commit - r395:0a82489ddcc2

Added the ability to include subprojects issues on calendar & gantt (options box)...

Jean-Philippe Lang -

r395:0a82489ddcc2

parent child

Context file:

r395:0a82489ddcc2

Collapse all files

app/controllers/projects_controller.rb +13 -9

                 # finish on sunday
                 @date_to = @date_to + (7-@date_to.cwday)
-                @issues = @project.issues.find(:all,
+                @project.issues_with_subprojects(params[:with_subprojects]) do
-                                               :include => [:tracker, :status, :assigned_to, :priority],
+                  @issues = Issue.find(:all,
-                                               :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to]
+                                       :include => [:tracker, :status, :assigned_to, :priority],
-                                               ) unless @selected_tracker_ids.empty?
+                                       :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to]
+                                       ) unless @selected_tracker_ids.empty?
+                end
                 @issues ||=[]
                 @ending_issues_by_days = @issues.group_by {|issue| issue.due_date}
                 @date_from = Date.civil(@year_from, @month_from, 1)
                 @date_to = (@date_from >> @months) - 1
-                @issues = @project.issues.find(:all,
+                @project.issues_with_subprojects(params[:with_subprojects]) do
-                                               :order => "start_date, due_date",
+                  @issues = Issue.find(:all,
-                                               :include => [:tracker, :status, :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 and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
+                                       :include => [:tracker, :status, :assigned_to, :priority],
-                                               ) unless @selected_tracker_ids.empty?
+                                       :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 and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
+                                       ) unless @selected_tracker_ids.empty?
+                end
                 @issues ||=[]
                 if params[:output]=='pdf'

app/models/project.rb +13 0

@@ -47,6 +47,19 class Project < ActiveRecord::Base
47	errors[:identifier].nil? && !(new_record? \|\| identifier.blank?)	47	errors[:identifier].nil? && !(new_record? \|\| identifier.blank?)
48	end	48	end
49		49
		50	def issues_with_subprojects(include_subprojects=false)
		51	conditions = nil
		52	if include_subprojects && children.size > 0
		53	ids = [id] + children.collect {\|c\| c.id}
		54	conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
		55	else
		56	conditions = ["#{Issue.table_name}.project_id = ?", id]
		57	end
		58	Issue.with_scope :find => { :conditions => conditions } do
		59	yield
		60	end
		61	end
		62
50	# returns latest created projects	63	# returns latest created projects
51	# non public projects will be returned only if user is a member of those	64	# non public projects will be returned only if user is a member of those
52	def self.latest(user=nil, count=5)	65	def self.latest(user=nil, count=5)

app/views/projects/calendar.rhtml +8 -4

             <tr>
             <td align="left" style="width:15%">
                 <%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")),
-                                    {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1), :tracker_ids => @selected_tracker_ids }},
+                                    {:update => "content", :url => { :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }},
-                                    {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1), :tracker_ids => @selected_tracker_ids)}
+                                    {:href => url_for(:action => 'calendar', :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects])}
                                     %>
             </td>
             <td align="center" style="width:55%">
                   <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
                   <%= tracker.name %><br />
                 <% end %>
+                <% if @project.children.any? %>
+                <p><strong><%=l(:label_subproject_plural)%></strong></p>
+                <%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%= l(:general_text_Yes) %>
+                <% end %>
                 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
                 </div>
             </td>
             <td align="right" style="width:15%">
                 <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'),
-                                    {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1), :tracker_ids => @selected_tracker_ids }},
+                                    {:update => "content", :url => { :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] }},
-                                    {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1), :tracker_ids => @selected_tracker_ids)}
+                                    {:href => url_for(:action => 'calendar', :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1), :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects])}
                                     %>&nbsp;
             </td>
             </tr>

app/views/projects/gantt.rhtml +10 -6

             <div class="contextual">
             <%= l(:label_export_to) %>
-            <%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :output => 'pdf'}, :class => 'icon icon-pdf' %>
+            <%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :output => 'pdf'}, :class => 'icon icon-pdf' %>
             </div>
             <h2><%= l(:label_gantt) %></h2>
                   <%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
                   <%= tracker.name %><br />
                 <% end %>
+                <% if @project.children.any? %>
+                <p><strong><%=l(:label_subproject_plural)%></strong></p>
+                <%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%= l(:general_text_Yes) %>
+                <% end %>
                 <p><center><%= submit_tag l(:button_apply), :class => 'button-small' %></center></p>
                 </div>
             </td>
             <td align="right">
             <%= if @zoom < 4
-                link_to image_tag('zoom_in.png'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids}
+                link_to image_tag('zoom_in.png'), {:zoom => (@zoom+1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects]}
               else
                 image_tag 'zoom_in_g.png'
               end %>
             <%= if @zoom > 1
-                link_to image_tag('zoom_out.png'),{:zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids}
+                link_to image_tag('zoom_out.png'),{:zoom => (@zoom-1), :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects]}
               else
                 image_tag 'zoom_out_g.png'
               end %>
             	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}", { :year => month_f.year, :month => month_f.month, :zoom => @zoom, :months => @months }, :title => "#{month_name(month_f.month)} #{month_f.year}"%>
+            	<%= 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}"%>
             	</div>
             	<%
             	left = left + width + 1
             <table width="100%">
             <tr>
-            <td align="left"><%= link_to ('&#171; ' + l(:label_previous)), :year => (@date_from << @months).year, :month => (@date_from << @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids %></td>
+            <td align="left"><%= link_to ('&#171; ' + 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] %></td>
-            <td align="right"><%= link_to (l(:label_next) + ' &#187;'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids %></td>
+            <td align="right"><%= link_to (l(:label_next) + ' &#187;'), :year => (@date_from >> @months).year, :month => (@date_from >> @months).month, :zoom => @zoom, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects] %></td>
             </tr>
             </table>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages