| @@ -556,16 +556,17 class ProjectsController < ApplicationController | |||
|
|
556 | 556 | # finish on sunday |
|
|
557 | 557 | @date_to = @date_to + (7-@date_to.cwday) |
|
|
558 | 558 | |
|
|
559 | @events = [] | |
|
|
559 | 560 | @project.issues_with_subprojects(params[:with_subprojects]) do |
|
|
560 |
@ |
|
|
|
561 | @events += Issue.find(:all, | |
|
|
561 | 562 | :include => [:tracker, :status, :assigned_to, :priority], |
|
|
562 | 563 | :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] |
|
|
563 | 564 | ) unless @selected_tracker_ids.empty? |
|
|
564 | 565 | end |
|
|
565 | @issues ||=[] | |
|
|
566 | @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to]) | |
|
|
566 | 567 | |
|
|
567 |
@ending_ |
|
|
|
568 |
@starting_ |
|
|
|
568 | @ending_events_by_days = @events.group_by {|event| event.due_date} | |
|
|
569 | @starting_events_by_days = @events.group_by {|event| event.start_date} | |
|
|
569 | 570 | |
|
|
570 | 571 | render :layout => false if request.xhr? |
|
|
571 | 572 | end |
| @@ -57,7 +57,8 while day <= @date_to | |||
|
|
57 | 57 | <% end %> |
|
|
58 | 58 | <td valign="top" class="<%= day.month==@month ? "even" : "odd" %>" style="width:14%; <%= Date.today == day ? 'background:#FDFED0;' : '' %>"> |
|
|
59 | 59 | <p class="textright"><%= day==Date.today ? "<b>#{day.day}</b>" : day.day %></p> |
|
|
60 |
<% ((@ending_ |
|
|
|
60 | <% ((@ending_events_by_days[day] || []) + (@starting_events_by_days[day] || [])).uniq.each do |i| %> | |
|
|
61 | <% if i.is_a? Issue %> | |
|
|
61 | 62 | <div class="tooltip"> |
|
|
62 | 63 | <%= if day == i.start_date and day == i.due_date |
|
|
63 | 64 | image_tag('arrow_bw.png') |
| @@ -71,6 +72,9 while day <= @date_to | |||
|
|
71 | 72 | <%= render :partial => "issues/tooltip", :locals => { :issue => i }%> |
|
|
72 | 73 | </span> |
|
|
73 | 74 | </div> |
|
|
75 | <% else %> | |
|
|
76 | <%= image_tag('milestone.png') %> <small><%= "#{l(:label_version)}: #{i.name}" %></small> | |
|
|
77 | <% end %> | |
|
|
74 | 78 | <% end %> |
|
|
75 | 79 | </td> |
|
|
76 | 80 | <%= '</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