##// END OF EJS Templates
Fixed: unable to change how many months are displayed on the gantt....
Jean-Philippe Lang -
r817:3a0cd55622e5
parent child
Show More
@@ -1,247 +1,247
1 <% zoom = 1
1 <% zoom = 1
2 @zoom.times { zoom = zoom * 2 }
2 @zoom.times { zoom = zoom * 2 }
3
3
4 subject_width = 330
4 subject_width = 330
5 header_heigth = 18
5 header_heigth = 18
6
6
7 headers_height = header_heigth
7 headers_height = header_heigth
8 show_weeks = false
8 show_weeks = false
9 show_days = false
9 show_days = false
10
10
11 if @zoom >1
11 if @zoom >1
12 show_weeks = true
12 show_weeks = true
13 headers_height = 2*header_heigth
13 headers_height = 2*header_heigth
14 if @zoom > 2
14 if @zoom > 2
15 show_days = true
15 show_days = true
16 headers_height = 3*header_heigth
16 headers_height = 3*header_heigth
17 end
17 end
18 end
18 end
19
19
20 g_width = (@date_to - @date_from + 1)*zoom
20 g_width = (@date_to - @date_from + 1)*zoom
21 g_height = [(20 * @events.length + 6)+150, 206].max
21 g_height = [(20 * @events.length + 6)+150, 206].max
22 t_height = g_height + headers_height
22 t_height = g_height + headers_height
23 %>
23 %>
24
24
25 <div class="contextual">
25 <div class="contextual">
26 </div>
26 </div>
27
27
28 <h2><%= l(:label_gantt) %></h2>
28 <h2><%= l(:label_gantt) %></h2>
29
29
30 <% form_tag(params.merge(:month => nil, :year => nil, :years => nil)) do %>
30 <% form_tag(params.merge(:month => nil, :year => nil, :months => nil)) do %>
31 <table width="100%">
31 <table width="100%">
32 <tr>
32 <tr>
33 <td align="left">
33 <td align="left">
34 <input type="text" name="months" size="2" value="<%= @months %>" />
34 <input type="text" name="months" size="2" value="<%= @months %>" />
35 <%= l(:label_months_from) %>
35 <%= l(:label_months_from) %>
36 <%= select_month(@month_from, :prefix => "month", :discard_type => true) %>
36 <%= select_month(@month_from, :prefix => "month", :discard_type => true) %>
37 <%= select_year(@year_from, :prefix => "year", :discard_type => true) %>
37 <%= select_year(@year_from, :prefix => "year", :discard_type => true) %>
38 <%= hidden_field_tag 'zoom', @zoom %>
38 <%= hidden_field_tag 'zoom', @zoom %>
39 <%= submit_tag l(:button_submit), :class => "button-small" %>
39 <%= submit_tag l(:button_submit), :class => "button-small" %>
40 </td>
40 </td>
41
41
42 <td align="right">
42 <td align="right">
43 <%= if @zoom < 4
43 <%= if @zoom < 4
44 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]}
44 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]}
45 else
45 else
46 image_tag 'zoom_in_g.png'
46 image_tag 'zoom_in_g.png'
47 end %>
47 end %>
48 <%= if @zoom > 1
48 <%= if @zoom > 1
49 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]}
49 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]}
50 else
50 else
51 image_tag 'zoom_out_g.png'
51 image_tag 'zoom_out_g.png'
52 end %>
52 end %>
53 </td>
53 </td>
54 </tr>
54 </tr>
55 </table>
55 </table>
56 <% end %>
56 <% end %>
57
57
58 <% cache(:year => @year_from, :month => @month_from, :months => @months, :zoom => @zoom, :tracker_ids => @selected_tracker_ids, :subprojects => params[:with_subprojects], :lang => current_language) do %>
58 <% cache(:year => @year_from, :month => @month_from, :months => @months, :zoom => @zoom, :tracker_ids => @selected_tracker_ids, :subprojects => params[:with_subprojects], :lang => current_language) do %>
59
59
60 <table width="100%" style="border:0; border-collapse: collapse;">
60 <table width="100%" style="border:0; border-collapse: collapse;">
61 <tr>
61 <tr>
62 <td style="width:<%= subject_width %>px;">
62 <td style="width:<%= subject_width %>px;">
63
63
64 <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
64 <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
65 <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
65 <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
66 <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
66 <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
67 <%
67 <%
68 #
68 #
69 # Tasks subjects
69 # Tasks subjects
70 #
70 #
71 top = headers_height + 8
71 top = headers_height + 8
72 @events.each do |i| %>
72 @events.each do |i| %>
73 <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
73 <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
74 <% if i.is_a? Issue %>
74 <% if i.is_a? Issue %>
75 <%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>:
75 <%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>:
76 <%=h i.subject %>
76 <%=h i.subject %>
77 <% else %>
77 <% else %>
78 <%= link_to_version i, :class => "icon icon-package" %>
78 <%= link_to_version i, :class => "icon icon-package" %>
79 <% end %>
79 <% end %>
80 </small></div>
80 </small></div>
81 <% top = top + 20
81 <% top = top + 20
82 end %>
82 end %>
83 </div>
83 </div>
84 </td>
84 </td>
85 <td>
85 <td>
86
86
87 <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
87 <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
88 <div style="width:<%= g_width-1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
88 <div style="width:<%= g_width-1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
89 <%
89 <%
90 #
90 #
91 # Months headers
91 # Months headers
92 #
92 #
93 month_f = @date_from
93 month_f = @date_from
94 left = 0
94 left = 0
95 height = (show_weeks ? header_heigth : header_heigth + g_height)
95 height = (show_weeks ? header_heigth : header_heigth + g_height)
96 @months.times do
96 @months.times do
97 width = ((month_f >> 1) - month_f) * zoom - 1
97 width = ((month_f >> 1) - month_f) * zoom - 1
98 %>
98 %>
99 <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
99 <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
100 <%= 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}"%>
100 <%= 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}"%>
101 </div>
101 </div>
102 <%
102 <%
103 left = left + width + 1
103 left = left + width + 1
104 month_f = month_f >> 1
104 month_f = month_f >> 1
105 end %>
105 end %>
106
106
107 <%
107 <%
108 #
108 #
109 # Weeks headers
109 # Weeks headers
110 #
110 #
111 if show_weeks
111 if show_weeks
112 left = 0
112 left = 0
113 height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
113 height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
114 if @date_from.cwday == 1
114 if @date_from.cwday == 1
115 # @date_from is monday
115 # @date_from is monday
116 week_f = @date_from
116 week_f = @date_from
117 else
117 else
118 # find next monday after @date_from
118 # find next monday after @date_from
119 week_f = @date_from + (7 - @date_from.cwday + 1)
119 week_f = @date_from + (7 - @date_from.cwday + 1)
120 width = (7 - @date_from.cwday + 1) * zoom-1
120 width = (7 - @date_from.cwday + 1) * zoom-1
121 %>
121 %>
122 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
122 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
123 <%
123 <%
124 left = left + width+1
124 left = left + width+1
125 end %>
125 end %>
126 <%
126 <%
127 while week_f <= @date_to
127 while week_f <= @date_to
128 width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
128 width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
129 %>
129 %>
130 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
130 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
131 <small><%= week_f.cweek if width >= 16 %></small>
131 <small><%= week_f.cweek if width >= 16 %></small>
132 </div>
132 </div>
133 <%
133 <%
134 left = left + width+1
134 left = left + width+1
135 week_f = week_f+7
135 week_f = week_f+7
136 end
136 end
137 end %>
137 end %>
138
138
139 <%
139 <%
140 #
140 #
141 # Days headers
141 # Days headers
142 #
142 #
143 if show_days
143 if show_days
144 left = 0
144 left = 0
145 height = g_height + header_heigth - 1
145 height = g_height + header_heigth - 1
146 wday = @date_from.cwday
146 wday = @date_from.cwday
147 (@date_to - @date_from + 1).to_i.times do
147 (@date_to - @date_from + 1).to_i.times do
148 width = zoom - 1
148 width = zoom - 1
149 %>
149 %>
150 <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">
150 <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">
151 <%= day_name(wday).first %>
151 <%= day_name(wday).first %>
152 </div>
152 </div>
153 <%
153 <%
154 left = left + width+1
154 left = left + width+1
155 wday = wday + 1
155 wday = wday + 1
156 wday = 1 if wday > 7
156 wday = 1 if wday > 7
157 end
157 end
158 end %>
158 end %>
159
159
160 <%
160 <%
161 #
161 #
162 # Tasks
162 # Tasks
163 #
163 #
164 top = headers_height + 10
164 top = headers_height + 10
165 @events.each do |i|
165 @events.each do |i|
166 if i.is_a? Issue
166 if i.is_a? Issue
167 i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
167 i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
168 i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
168 i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
169
169
170 i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
170 i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
171 i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
171 i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
172 i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
172 i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
173
173
174 i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
174 i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
175
175
176 i_left = ((i_start_date - @date_from)*zoom).floor
176 i_left = ((i_start_date - @date_from)*zoom).floor
177 i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2 # total width of the issue (- 2 for left and right borders)
177 i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2 # total width of the issue (- 2 for left and right borders)
178 d_width = ((i_done_date - i_start_date)*zoom).floor - 2 # done width
178 d_width = ((i_done_date - i_start_date)*zoom).floor - 2 # done width
179 l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
179 l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
180 %>
180 %>
181 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
181 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
182 <% if l_width > 0 %>
182 <% if l_width > 0 %>
183 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
183 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
184 <% end %>
184 <% end %>
185 <% if d_width > 0 %>
185 <% if d_width > 0 %>
186 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
186 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
187 <% end %>
187 <% end %>
188 <div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
188 <div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
189 <%= i.status.name %>
189 <%= i.status.name %>
190 <%= (i.done_ratio).to_i %>%
190 <%= (i.done_ratio).to_i %>%
191 </div>
191 </div>
192 <% # === tooltip === %>
192 <% # === tooltip === %>
193 <div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
193 <div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
194 <span class="tip">
194 <span class="tip">
195 <%= render_issue_tooltip i %>
195 <%= render_issue_tooltip i %>
196 </span></div>
196 </span></div>
197 <% else
197 <% else
198 i_left = ((i.start_date - @date_from)*zoom).floor
198 i_left = ((i.start_date - @date_from)*zoom).floor
199 %>
199 %>
200 <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone">&nbsp;</div>
200 <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone">&nbsp;</div>
201 <div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
201 <div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
202 <strong><%= i.name %></strong>
202 <strong><%= i.name %></strong>
203 </div>
203 </div>
204 <% end %>
204 <% end %>
205 <% top = top + 20
205 <% top = top + 20
206 end %>
206 end %>
207
207
208 <% end # cache
208 <% end # cache
209 %>
209 %>
210
210
211 <%
211 <%
212 #
212 #
213 # Today red line (excluded from cache)
213 # Today red line (excluded from cache)
214 #
214 #
215 if Date.today >= @date_from and Date.today <= @date_to %>
215 if Date.today >= @date_from and Date.today <= @date_to %>
216 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= ((Date.today-@date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
216 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= ((Date.today-@date_from+1)*zoom).floor()-1 %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
217 <% end %>
217 <% end %>
218
218
219 </div>
219 </div>
220 </td>
220 </td>
221 </tr>
221 </tr>
222 </table>
222 </table>
223
223
224 <table width="100%">
224 <table width="100%">
225 <tr>
225 <tr>
226 <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>
226 <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>
227 <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>
227 <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>
228 </tr>
228 </tr>
229 </table>
229 </table>
230
230
231 <div class="contextual"><%= l(:label_export_to) %>
231 <div class="contextual"><%= l(:label_export_to) %>
232 <%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'pdf'}, :class => 'icon icon-pdf' %>
232 <%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'pdf'}, :class => 'icon icon-pdf' %>
233 <%= link_to 'PNG', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'png'}, :class => 'icon icon-image' if respond_to?('gantt_image') %>
233 <%= link_to 'PNG', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'png'}, :class => 'icon icon-image' if respond_to?('gantt_image') %>
234 </div>
234 </div>
235
235
236 <% content_for :sidebar do %>
236 <% content_for :sidebar do %>
237 <h3><%= l(:label_gantt) %></h3>
237 <h3><%= l(:label_gantt) %></h3>
238 <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil)) do %>
238 <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil)) do %>
239 <% @trackers.each do |tracker| %>
239 <% @trackers.each do |tracker| %>
240 <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
240 <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
241 <% end %>
241 <% end %>
242 <% if @project.active_children.any? %>
242 <% if @project.active_children.any? %>
243 <br /><label><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%></label>
243 <br /><label><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%></label>
244 <% end %>
244 <% end %>
245 <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
245 <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
246 <% end %>
246 <% end %>
247 <% end %>
247 <% end %>
General Comments 0
You need to be logged in to leave comments. Login now