Browse Source

gantt: simplify week day logic of view

git-svn-id: http://svn.redmine.org/redmine/trunk@19795 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Toshi MARUYAMA 4 years ago
parent
commit
8d04032cae
1 changed files with 3 additions and 6 deletions
  1. 3
    6
      app/views/gantts/show.html.erb

+ 3
- 6
app/views/gantts/show.html.erb View File

@@ -326,9 +326,8 @@
left = 0
height = g_height + header_height - 1
top = (show_day_num ? 55 : 37)
wday = @gantt.date_from.cwday
%>
<% (@gantt.date_to - @gantt.date_from + 1).to_i.times do %>
<% (@gantt.date_from..@gantt.date_to).each do |g_date| %>
<%
width = zoom - 1
style = ""
@@ -338,15 +337,13 @@
style += "height: #{height}px;"
style += "font-size:0.7em;"
clss = "gantt_hdr"
clss << " nwday" if @gantt.non_working_week_days.include?(wday)
clss << " nwday" if @gantt.non_working_week_days.include?(g_date.cwday)
%>
<%= content_tag(:div, :style => style, :class => clss) do %>
<%= day_letter(wday) %>
<%= day_letter(g_date.cwday) %>
<% end %>
<%
left = left + width + 1
wday = wday + 1
wday = 1 if wday > 7
%>
<% end %>
<% end %>

Loading…
Cancel
Save