##// END OF EJS Templates
Fixes Gantt chart with ruby 1.8.7 (#1606)....
Jean-Philippe Lang -
r1633:bb76561ca68e
parent child
Show More
@@ -1,250 +1,249
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, :months => 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 <table width="100%" style="border:0; border-collapse: collapse;">
58 <table width="100%" style="border:0; border-collapse: collapse;">
59 <tr>
59 <tr>
60 <td style="width:<%= subject_width %>px;">
60 <td style="width:<%= subject_width %>px;">
61
61
62 <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
62 <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
63 <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
63 <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
64 <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
64 <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;" class="gantt_hdr"></div>
65 <%
65 <%
66 #
66 #
67 # Tasks subjects
67 # Tasks subjects
68 #
68 #
69 top = headers_height + 8
69 top = headers_height + 8
70 @events.each do |i| %>
70 @events.each do |i| %>
71 <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
71 <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>
72 <% if i.is_a? Issue %>
72 <% if i.is_a? Issue %>
73 <%= h("#{i.project} -") unless @project && @project == i.project %>
73 <%= h("#{i.project} -") unless @project && @project == i.project %>
74 <%= link_to_issue i %>: <%=h i.subject %>
74 <%= link_to_issue i %>: <%=h i.subject %>
75 <% else %>
75 <% else %>
76 <span class="icon icon-package">
76 <span class="icon icon-package">
77 <%= h("#{i.project} -") unless @project && @project == i.project %>
77 <%= h("#{i.project} -") unless @project && @project == i.project %>
78 <%= link_to_version i %>
78 <%= link_to_version i %>
79 </span>
79 </span>
80 <% end %>
80 <% end %>
81 </small></div>
81 </small></div>
82 <% top = top + 20
82 <% top = top + 20
83 end %>
83 end %>
84 </div>
84 </div>
85 </td>
85 </td>
86 <td>
86 <td>
87
87
88 <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
88 <div style="position:relative;height:<%= t_height + 24 %>px;overflow:auto;">
89 <div style="width:<%= g_width-1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
89 <div style="width:<%= g_width-1 %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr">&nbsp;</div>
90 <%
90 <%
91 #
91 #
92 # Months headers
92 # Months headers
93 #
93 #
94 month_f = @date_from
94 month_f = @date_from
95 left = 0
95 left = 0
96 height = (show_weeks ? header_heigth : header_heigth + g_height)
96 height = (show_weeks ? header_heigth : header_heigth + g_height)
97 @months.times do
97 @months.times do
98 width = ((month_f >> 1) - month_f) * zoom - 1
98 width = ((month_f >> 1) - month_f) * zoom - 1
99 %>
99 %>
100 <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
100 <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
101 <%= 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 <%= 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}"%>
102 </div>
102 </div>
103 <%
103 <%
104 left = left + width + 1
104 left = left + width + 1
105 month_f = month_f >> 1
105 month_f = month_f >> 1
106 end %>
106 end %>
107
107
108 <%
108 <%
109 #
109 #
110 # Weeks headers
110 # Weeks headers
111 #
111 #
112 if show_weeks
112 if show_weeks
113 left = 0
113 left = 0
114 height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
114 height = (show_days ? header_heigth-1 : header_heigth-1 + g_height)
115 if @date_from.cwday == 1
115 if @date_from.cwday == 1
116 # @date_from is monday
116 # @date_from is monday
117 week_f = @date_from
117 week_f = @date_from
118 else
118 else
119 # find next monday after @date_from
119 # find next monday after @date_from
120 week_f = @date_from + (7 - @date_from.cwday + 1)
120 week_f = @date_from + (7 - @date_from.cwday + 1)
121 width = (7 - @date_from.cwday + 1) * zoom-1
121 width = (7 - @date_from.cwday + 1) * zoom-1
122 %>
122 %>
123 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
123 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">&nbsp;</div>
124 <%
124 <%
125 left = left + width+1
125 left = left + width+1
126 end %>
126 end %>
127 <%
127 <%
128 while week_f <= @date_to
128 while week_f <= @date_to
129 width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
129 width = (week_f + 6 <= @date_to) ? 7 * zoom -1 : (@date_to - week_f + 1) * zoom-1
130 %>
130 %>
131 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
131 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
132 <small><%= week_f.cweek if width >= 16 %></small>
132 <small><%= week_f.cweek if width >= 16 %></small>
133 </div>
133 </div>
134 <%
134 <%
135 left = left + width+1
135 left = left + width+1
136 week_f = week_f+7
136 week_f = week_f+7
137 end
137 end
138 end %>
138 end %>
139
139
140 <%
140 <%
141 #
141 #
142 # Days headers
142 # Days headers
143 #
143 #
144 if show_days
144 if show_days
145 left = 0
145 left = 0
146 height = g_height + header_heigth - 1
146 height = g_height + header_heigth - 1
147 wday = @date_from.cwday
147 wday = @date_from.cwday
148 (@date_to - @date_from + 1).to_i.times do
148 (@date_to - @date_from + 1).to_i.times do
149 width = zoom - 1
149 width = zoom - 1
150 %>
150 %>
151 <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 <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">
152 <%= day_name(wday).first %>
152 <%= day_name(wday).first %>
153 </div>
153 </div>
154 <%
154 <%
155 left = left + width+1
155 left = left + width+1
156 wday = wday + 1
156 wday = wday + 1
157 wday = 1 if wday > 7
157 wday = 1 if wday > 7
158 end
158 end
159 end %>
159 end %>
160
160
161 <%
161 <%
162 #
162 #
163 # Tasks
163 # Tasks
164 #
164 #
165 top = headers_height + 10
165 top = headers_height + 10
166 @events.each do |i|
166 @events.each do |i|
167 if i.is_a? Issue
167 if i.is_a? Issue
168 i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
168 i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
169 i_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
169 i_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
170
170
171 i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
171 i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
172 i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
172 i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
173 i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
173 i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
174
174
175 i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
175 i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
176
176
177 i_left = ((i_start_date - @date_from)*zoom).floor
177 i_left = ((i_start_date - @date_from)*zoom).floor
178 i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2 # total width of the issue (- 2 for left and right borders)
178 i_width = ((i_end_date - i_start_date + 1)*zoom).floor - 2 # total width of the issue (- 2 for left and right borders)
179 d_width = ((i_done_date - i_start_date)*zoom).floor - 2 # done width
179 d_width = ((i_done_date - i_start_date)*zoom).floor - 2 # done width
180 l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
180 l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor - 2 : 0 # delay width
181 %>
181 %>
182 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
182 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;" class="task task_todo">&nbsp;</div>
183 <% if l_width > 0 %>
183 <% if l_width > 0 %>
184 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
184 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= l_width %>px;" class="task task_late">&nbsp;</div>
185 <% end %>
185 <% end %>
186 <% if d_width > 0 %>
186 <% if d_width > 0 %>
187 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
187 <div style="top:<%= top %>px;left:<%= i_left %>px;width:<%= d_width %>px;" class="task task_done">&nbsp;</div>
188 <% end %>
188 <% end %>
189 <div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
189 <div style="top:<%= top %>px;left:<%= i_left + i_width + 5 %>px;background:#fff;" class="task">
190 <%= i.status.name %>
190 <%= i.status.name %>
191 <%= (i.done_ratio).to_i %>%
191 <%= (i.done_ratio).to_i %>%
192 </div>
192 </div>
193 <% # === tooltip === %>
194 <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;">
195 <span class="tip">
194 <span class="tip">
196 <%= render_issue_tooltip i %>
195 <%= render_issue_tooltip i %>
197 </span></div>
196 </span></div>
198 <% else
197 <% else
199 i_left = ((i.start_date - @date_from)*zoom).floor
198 i_left = ((i.start_date - @date_from)*zoom).floor
200 %>
199 %>
201 <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>
202 <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">
203 <%= h("#{i.project} -") unless @project && @project == i.project %>
202 <%= h("#{i.project} -") unless @project && @project == i.project %>
204 <strong><%=h i %></strong>
203 <strong><%=h i %></strong>
205 </div>
204 </div>
206 <% end %>
205 <% end %>
207 <% top = top + 20
206 <% top = top + 20
208 end %>
207 end %>
209
208
210 <%
209 <%
211 #
210 #
212 # Today red line (excluded from cache)
211 # Today red line (excluded from cache)
213 #
212 #
214 if Date.today >= @date_from and Date.today <= @date_to %>
213 if Date.today >= @date_from and Date.today <= @date_to %>
215 <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>
214 <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 <% end %>
215 <% end %>
217
216
218 </div>
217 </div>
219 </td>
218 </td>
220 </tr>
219 </tr>
221 </table>
220 </table>
222
221
223 <table width="100%">
222 <table width="100%">
224 <tr>
223 <tr>
225 <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>
224 <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="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>
225 <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 </tr>
226 </tr>
228 </table>
227 </table>
229
228
230 <p class="other-formats">
229 <p class="other-formats">
231 <%= l(:label_export_to) %>
230 <%= l(:label_export_to) %>
232 <span><%= 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 => 'pdf' %></span>
231 <span><%= 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 => 'pdf' %></span>
233 <%= content_tag('span', 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 => 'image')) if respond_to?('gantt_image') %>
232 <%= content_tag('span', 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 => 'image')) if respond_to?('gantt_image') %>
234 </p>
233 </p>
235
234
236 <% content_for :sidebar do %>
235 <% content_for :sidebar do %>
237 <h3><%= l(:label_gantt) %></h3>
236 <h3><%= l(:label_gantt) %></h3>
238 <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil), :method => :get) do %>
237 <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil), :method => :get) do %>
239 <% @trackers.each do |tracker| %>
238 <% @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 />
239 <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
241 <% end %>
240 <% end %>
242 <% if @project.active_children.any? %>
241 <% if @project.active_children.any? %>
243 <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
242 <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
244 <%= hidden_field_tag 'with_subprojects', 0 %>
243 <%= hidden_field_tag 'with_subprojects', 0 %>
245 <% end %>
244 <% end %>
246 <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
245 <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
247 <% end %>
246 <% end %>
248 <% end %>
247 <% end %>
249
248
250 <% html_title(l(:label_gantt)) -%>
249 <% html_title(l(:label_gantt)) -%>
General Comments 0
You need to be logged in to leave comments. Login now