dinislage/redmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added fragment caching for calendar and gantt views

Browse Source 
git-svn-id: http://redmine.rubyforge.org/svn/trunk@515 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2007-05-06 16:40:33 +00:00
parent 7eb6471559
commit b748455d96
6 changed files with 85 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/views/projects/calendar.rhtml
+3 -1
View File
@@ -1,3 +1,4 @@
<% cache(:year => @year, :month => @month, :tracker_ids => @selected_tracker_ids, :subprojects => params[:with_subprojects], :lang => current_language) do %>
<h2><%= l(:label_calendar) %></h2>
<% form_tag do %>
@@ -87,4 +88,5 @@ end %>
<%= image_tag 'arrow_from.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />
<%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
<%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />
<%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />
<% end %>
app/views/projects/gantt.rhtml
+38 -33
View File
@@ -1,3 +1,28 @@
<% zoom = 1
@zoom.times { zoom = zoom * 2 }
subject_width = 330
header_heigth = 18
headers_height = header_heigth
show_weeks = false
show_days = false
if @zoom >1
show_weeks = true
headers_height = 2*header_heigth
if @zoom > 2
show_days = true
headers_height = 3*header_heigth
end
end
g_width = (@date_to - @date_from + 1)*zoom
g_height = [(20 * @events.length + 6)+150, 206].max
t_height = g_height + headers_height
%>
<% cache(:year => @year_from, :month => @month_from, :months => @months, :zoom => @zoom, :tracker_ids => @selected_tracker_ids, :subprojects => params[:with_subprojects], :lang => current_language) do %>
<div class="contextual">
<%= l(:label_export_to) %>
<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :output => 'pdf'}, :class => 'icon icon-pdf' %>
@@ -47,30 +72,6 @@
</table>
<% end %>
<% zoom = 1
@zoom.times { zoom = zoom * 2 }
subject_width = 330
header_heigth = 18
headers_height = header_heigth
show_weeks = false
show_days = false
if @zoom >1
show_weeks = true
headers_height = 2*header_heigth
if @zoom > 2
show_days = true
headers_height = 3*header_heigth
end
end
g_width = (@date_to - @date_from + 1)*zoom
g_height = [(20 * @events.length + 6)+150, 206].max
t_height = g_height + headers_height
%>
<table width="100%" style="border:0; border-collapse: collapse;">
<tr>
<td style="width:<%= subject_width %>px;">
@@ -171,14 +172,6 @@ if show_days
end
end %>
<%
#
# Today red line
#
if Date.today >= @date_from and Date.today <= @date_to %>
<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>
<% end %>
<%
#
# Tasks
@@ -226,6 +219,18 @@ top = headers_height + 10
<% end %>
<% top = top + 20
end %>
<% end # cache
%>
<%
#
# Today red line (excluded from cache)
#
if Date.today >= @date_from and Date.today <= @date_to %>
<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>
<% end %>
</div>
</td>
</tr>
@@ -236,4 +241,4 @@ end %>
<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>
<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>
</tr>
</table>
</table>