##// END OF EJS Templates
jro_apps » redmine
RSS
code layout cleanup gantt weeks headers...
Toshi MARUYAMA -
r10129:0486ce99762d
parent child
Show More
Side by Side Unified
Context file:
r10129:0486ce99762d Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,202 +1,206
1 <% @gantt.view = self %>
1 <% @gantt.view = self %>
2 <h2><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
2 <h2><%= @query.new_record? ? l(:label_gantt) : h(@query.name) %></h2>
3
3
4 <%= form_tag({:controller => 'gantts', :action => 'show',
4 <%= form_tag({:controller => 'gantts', :action => 'show',
5 :project_id => @project, :month => params[:month],
5 :project_id => @project, :month => params[:month],
6 :year => params[:year], :months => params[:months]},
6 :year => params[:year], :months => params[:months]},
7 :method => :get, :id => 'query_form') do %>
7 :method => :get, :id => 'query_form') do %>
8 <%= hidden_field_tag 'set_filter', '1' %>
8 <%= hidden_field_tag 'set_filter', '1' %>
9 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
9 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
10 <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
10 <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
11 <div style="<%= @query.new_record? ? "" : "display: none;" %>">
11 <div style="<%= @query.new_record? ? "" : "display: none;" %>">
12 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
12 <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
13 </div>
13 </div>
14 </fieldset>
14 </fieldset>
15
15
16 <p class="contextual">
16 <p class="contextual">
17 <%= gantt_zoom_link(@gantt, :in) %>
17 <%= gantt_zoom_link(@gantt, :in) %>
18 <%= gantt_zoom_link(@gantt, :out) %>
18 <%= gantt_zoom_link(@gantt, :out) %>
19 </p>
19 </p>
20
20
21 <p class="buttons">
21 <p class="buttons">
22 <%= text_field_tag 'months', @gantt.months, :size => 2 %>
22 <%= text_field_tag 'months', @gantt.months, :size => 2 %>
23 <%= l(:label_months_from) %>
23 <%= l(:label_months_from) %>
24 <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
24 <%= select_month(@gantt.month_from, :prefix => "month", :discard_type => true) %>
25 <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
25 <%= select_year(@gantt.year_from, :prefix => "year", :discard_type => true) %>
26 <%= hidden_field_tag 'zoom', @gantt.zoom %>
26 <%= hidden_field_tag 'zoom', @gantt.zoom %>
27
27
28 <%= link_to_function l(:button_apply), '$("#query_form").submit()',
28 <%= link_to_function l(:button_apply), '$("#query_form").submit()',
29 :class => 'icon icon-checked' %>
29 :class => 'icon icon-checked' %>
30 <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
30 <%= link_to l(:button_clear), { :project_id => @project, :set_filter => 1 },
31 :class => 'icon icon-reload' %>
31 :class => 'icon icon-reload' %>
32 </p>
32 </p>
33 <% end %>
33 <% end %>
34
34
35 <%= error_messages_for 'query' %>
35 <%= error_messages_for 'query' %>
36 <% if @query.valid? %>
36 <% if @query.valid? %>
37 <%
37 <%
38 zoom = 1
38 zoom = 1
39 @gantt.zoom.times { zoom = zoom * 2 }
39 @gantt.zoom.times { zoom = zoom * 2 }
40
40
41 subject_width = 330
41 subject_width = 330
42 header_heigth = 18
42 header_heigth = 18
43
43
44 headers_height = header_heigth
44 headers_height = header_heigth
45 show_weeks = false
45 show_weeks = false
46 show_days = false
46 show_days = false
47
47
48 if @gantt.zoom > 1
48 if @gantt.zoom > 1
49 show_weeks = true
49 show_weeks = true
50 headers_height = 2 * header_heigth
50 headers_height = 2 * header_heigth
51 if @gantt.zoom > 2
51 if @gantt.zoom > 2
52 show_days = true
52 show_days = true
53 headers_height = 3 * header_heigth
53 headers_height = 3 * header_heigth
54 end
54 end
55 end
55 end
56
56
57 # Width of the entire chart
57 # Width of the entire chart
58 g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i
58 g_width = ((@gantt.date_to - @gantt.date_from + 1) * zoom).to_i
59 @gantt.render(:top => headers_height + 8,
59 @gantt.render(:top => headers_height + 8,
60 :zoom => zoom,
60 :zoom => zoom,
61 :g_width => g_width,
61 :g_width => g_width,
62 :subject_width => subject_width)
62 :subject_width => subject_width)
63 g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max
63 g_height = [(20 * (@gantt.number_of_rows + 6)) + 150, 206].max
64 t_height = g_height + headers_height
64 t_height = g_height + headers_height
65 %>
65 %>
66
66
67 <% if @gantt.truncated %>
67 <% if @gantt.truncated %>
68 <p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
68 <p class="warning"><%= l(:notice_gantt_chart_truncated, :max => @gantt.max_rows) %></p>
69 <% end %>
69 <% end %>
70
70
71 <table style="width:100%; border:0; border-collapse: collapse;">
71 <table style="width:100%; border:0; border-collapse: collapse;">
72 <tr>
72 <tr>
73 <td style="width:<%= subject_width %>px; padding:0px;">
73 <td style="width:<%= subject_width %>px; padding:0px;">
74
74
75 <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
75 <div style="position:relative;height:<%= t_height + 24 %>px;width:<%= subject_width + 1 %>px;">
76 <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
76 <div style="right:-2px;width:<%= subject_width %>px;height:<%= headers_height %>px;background: #eee;" class="gantt_hdr"></div>
77 <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;"
77 <div style="right:-2px;width:<%= subject_width %>px;height:<%= t_height %>px;border-left: 1px solid #c0c0c0;overflow:hidden;"
78 class="gantt_hdr"></div>
78 class="gantt_hdr"></div>
79
79
80 <div class="gantt_subjects">
80 <div class="gantt_subjects">
81 <%= @gantt.subjects.html_safe %>
81 <%= @gantt.subjects.html_safe %>
82 </div>
82 </div>
83
83
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;"
89 <div style="width:<%= g_width - 1 %>px;height:<%= headers_height %>px;background: #eee;"
90 class="gantt_hdr">&nbsp;</div>
90 class="gantt_hdr">&nbsp;</div>
91 <%
91 <%
92 #
92 #
93 # Months headers
93 # Months headers
94 #
94 #
95 %>
95 %>
96 <%
96 <%
97 month_f = @gantt.date_from
97 month_f = @gantt.date_from
98 left = 0
98 left = 0
99 height = (show_weeks ? header_heigth : header_heigth + g_height)
99 height = (show_weeks ? header_heigth : header_heigth + g_height)
100 %>
100 %>
101 <% @gantt.months.times do %>
101 <% @gantt.months.times do %>
102 <% width = (((month_f >> 1) - month_f) * zoom - 1).to_i %>
102 <% width = (((month_f >> 1) - month_f) * zoom - 1).to_i %>
103 <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
103 <div style="left:<%= left %>px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
104 <%= link_to h("#{month_f.year}-#{month_f.month}"),
104 <%= link_to h("#{month_f.year}-#{month_f.month}"),
105 @gantt.params.merge(:year => month_f.year, :month => month_f.month),
105 @gantt.params.merge(:year => month_f.year, :month => month_f.month),
106 :title => "#{month_name(month_f.month)} #{month_f.year}" %>
106 :title => "#{month_name(month_f.month)} #{month_f.year}" %>
107 </div>
107 </div>
108 <%
108 <%
109 left = left + width + 1
109 left = left + width + 1
110 month_f = month_f >> 1
110 month_f = month_f >> 1
111 %>
111 %>
112 <% end %>
112 <% end %>
113
113
114 <%
114 <%
115 #
115 #
116 # Weeks headers
116 # Weeks headers
117 #
117 #
118 if show_weeks
118 %>
119 <% if show_weeks %>
120 <%
119 left = 0
121 left = 0
120 height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
122 height = (show_days ? header_heigth - 1 : header_heigth - 1 + g_height)
121 if @gantt.date_from.cwday == 1
123 %>
124 <% if @gantt.date_from.cwday == 1 %>
125 <%
122 # @date_from is monday
126 # @date_from is monday
123 week_f = @gantt.date_from
127 week_f = @gantt.date_from
124 else
128 %>
129 <% else %>
130 <%
125 # find next monday after @date_from
131 # find next monday after @date_from
126 week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
132 week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
127 width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
133 width = (7 - @gantt.date_from.cwday + 1) * zoom - 1
128 %>
134 %>
129 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;"
135 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;"
130 class="gantt_hdr">&nbsp;</div>
136 class="gantt_hdr">&nbsp;</div>
131 <%
137 <% left = left + width + 1 %>
132 left = left + width + 1
138 <% end %>
133 end %>
139 <% while week_f <= @gantt.date_to %>
134 <%
140 <% width = ((week_f + 6 <= @gantt.date_to) ? 7 * zoom - 1 : (@gantt.date_to - week_f + 1) * zoom - 1).to_i %>
135 while week_f <= @gantt.date_to
141 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
136 width = ((week_f + 6 <= @gantt.date_to) ? 7 * zoom - 1 : (@gantt.date_to - week_f + 1) * zoom - 1).to_i
142 <small><%= week_f.cweek if width >= 16 %></small>
137 %>
143 </div>
138 <div style="left:<%= left %>px;top:19px;width:<%= width %>px;height:<%= height %>px;" class="gantt_hdr">
139 <small><%= week_f.cweek if width >= 16 %></small>
140 </div>
141 <%
144 <%
142 left = left + width + 1
145 left = left + width + 1
143 week_f = week_f + 7
146 week_f = week_f + 7
144 end
147 %>
145 end %>
148 <% end %>
149 <% end %>
146
150
147 <%
151 <%
148 #
152 #
149 # Days headers
153 # Days headers
150 #
154 #
151 if show_days
155 if show_days
152 left = 0
156 left = 0
153 height = g_height + header_heigth - 1
157 height = g_height + header_heigth - 1
154 wday = @gantt.date_from.cwday
158 wday = @gantt.date_from.cwday
155 (@gantt.date_to - @gantt.date_from + 1).to_i.times do
159 (@gantt.date_to - @gantt.date_from + 1).to_i.times do
156 width = zoom - 1
160 width = zoom - 1
157 %>
161 %>
158 <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>"
162 <div style="left:<%= left %>px;top:37px;width:<%= width %>px;height:<%= height %>px;font-size:0.7em;<%= "background:#f1f1f1;" if wday > 5 %>"
159 class="gantt_hdr">
163 class="gantt_hdr">
160 <%= day_letter(wday) %>
164 <%= day_letter(wday) %>
161 </div>
165 </div>
162 <%
166 <%
163 left = left + width + 1
167 left = left + width + 1
164 wday = wday + 1
168 wday = wday + 1
165 wday = 1 if wday > 7
169 wday = 1 if wday > 7
166 end
170 end
167 end %>
171 end %>
168
172
169 <%= @gantt.lines.html_safe %>
173 <%= @gantt.lines.html_safe %>
170
174
171 <%
175 <%
172 #
176 #
173 # Today red line (excluded from cache)
177 # Today red line (excluded from cache)
174 #
178 #
175 %>
179 %>
176 <% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
180 <% if Date.today >= @gantt.date_from and Date.today <= @gantt.date_to %>
177 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
181 <div style="position: absolute;height:<%= g_height %>px;top:<%= headers_height + 1 %>px;left:<%= (((Date.today - @gantt.date_from + 1) * zoom).floor() - 1).to_i %>px;width:10px;border-left: 1px dashed red;">&nbsp;</div>
178 <% end %>
182 <% end %>
179
183
180 </div>
184 </div>
181 </td>
185 </td>
182 </tr>
186 </tr>
183 </table>
187 </table>
184
188
185 <table style="width:100%">
189 <table style="width:100%">
186 <tr>
190 <tr>
187 <td align="left"><%= link_to_content_update("\xc2\xab " + l(:label_previous), params.merge(@gantt.params_previous)) %></td>
191 <td align="left"><%= link_to_content_update("\xc2\xab " + l(:label_previous), params.merge(@gantt.params_previous)) %></td>
188 <td align="right"><%= link_to_content_update(l(:label_next) + " \xc2\xbb", params.merge(@gantt.params_next)) %></td>
192 <td align="right"><%= link_to_content_update(l(:label_next) + " \xc2\xbb", params.merge(@gantt.params_next)) %></td>
189 </tr>
193 </tr>
190 </table>
194 </table>
191
195
192 <% other_formats_links do |f| %>
196 <% other_formats_links do |f| %>
193 <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
197 <%= f.link_to 'PDF', :url => params.merge(@gantt.params) %>
194 <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
198 <%= f.link_to('PNG', :url => params.merge(@gantt.params)) if @gantt.respond_to?('to_image') %>
195 <% end %>
199 <% end %>
196 <% end # query.valid? %>
200 <% end # query.valid? %>
197
201
198 <% content_for :sidebar do %>
202 <% content_for :sidebar do %>
199 <%= render :partial => 'issues/sidebar' %>
203 <%= render :partial => 'issues/sidebar' %>
200 <% end %>
204 <% end %>
201
205
202 <% html_title(l(:label_gantt)) -%>
206 <% html_title(l(:label_gantt)) -%>
General Comments 0
You need to be logged in to leave comments. Login now