jro_apps/redmine Commit - r426:ef71edd3311e

Added versions due dates on calendar....

Jean-Philippe Lang -

r426:ef71edd3311e

parent child

Context file:

r426:ef71edd3311e

app/controllers/projects_controller.rb +5 -4

                 # finish on sunday
                 @date_to = @date_to + (7-@date_to.cwday)
+                @events = []
                 @project.issues_with_subprojects(params[:with_subprojects]) do
-                  @issues = Issue.find(:all,
+                  @events += Issue.find(:all,
                                        :include => [:tracker, :status, :assigned_to, :priority],
                                        :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 ||=[]
+                @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
-                @ending_issues_by_days = @issues.group_by {|issue| issue.due_date}
+                @ending_events_by_days = @events.group_by {|event| event.due_date}
-                @starting_issues_by_days = @issues.group_by {|issue| issue.start_date}
+                @starting_events_by_days = @events.group_by {|event| event.start_date}
                 render :layout => false if request.xhr?
               end

app/views/projects/calendar.rhtml +5 -1

             	<% end %>
             	<td valign="top" class="<%= day.month==@month ? "even" : "odd" %>" style="width:14%; <%= Date.today == day ? 'background:#FDFED0;' : '' %>">
             	<p class="textright"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p>
-            	<% ((@ending_issues_by_days[day] || []) + (@starting_issues_by_days[day] || [])).uniq.each do |i| %>
+            	<% ((@ending_events_by_days[day] || []) + (@starting_events_by_days[day] || [])).uniq.each do |i| %>
+            	    <% if i.is_a? Issue %>
             	    <div class="tooltip">
             		<%= if day == i.start_date and day == i.due_date
             		    image_tag('arrow_bw.png')
                     <%= render :partial => "issues/tooltip", :locals => { :issue => i }%>
                     </span>
             		</div>
+            		<% else %>
+                    <%= image_tag('milestone.png') %> <small><%= "#{l(:label_version)}: #{i.name}" %></small>
+            		<% end %>
             	<% end %>
                 </td>
             	<%= '</tr><tr style="height:100px">' if day.cwday >= 7 and day!=@date_to %>

General Comments 0

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

No TODOs yet

	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