##// END OF EJS Templates
jro_apps » redmine
RSS
Display the correct ISO week number on the project calendar....
Eric Davis -
r3676:41ff1b9cb264
parent child
Show More
Side by Side Unified
Context file:
r3676:41ff1b9cb264 Loading diff...:
Show file before | Show file after | Hide comments
@@ -6,7 +6,7
6 <tr>
6 <tr>
7 <% day = calendar.startdt
7 <% day = calendar.startdt
8 while day <= calendar.enddt %>
8 while day <= calendar.enddt %>
9 <%= "<td class='week-number' title='#{ l(:label_week) }'>#{day.cweek}</td>" if day.cwday == calendar.first_wday %>
9 <%= "<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>" if day.cwday == calendar.first_wday %>
10 <td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
10 <td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
11 <p class="day-num"><%= day.day %></p>
11 <p class="day-num"><%= day.day %></p>
12 <% calendar.events_on(day).each do |i| %>
12 <% calendar.events_on(day).each do |i| %>
Show file before | Show file after | Hide comments
@@ -17,4 +17,48 class CalendarsControllerTest < ActionController::TestCase
17 assert_not_nil assigns(:calendar)
17 assert_not_nil assigns(:calendar)
18 end
18 end
19
19
20 def test_week_number_calculation
21 Setting.start_of_week = 7
22
23 get :show, :month => '1', :year => '2010'
24 assert_response :success
25
26 assert_tag :tag => 'tr',
27 :descendant => {:tag => 'td',
28 :attributes => {:class => 'week-number'}, :content => '53'},
29 :descendant => {:tag => 'td',
30 :attributes => {:class => 'odd'}, :content => '27'},
31 :descendant => {:tag => 'td',
32 :attributes => {:class => 'even'}, :content => '2'}
33
34 assert_tag :tag => 'tr',
35 :descendant => {:tag => 'td',
36 :attributes => {:class => 'week-number'}, :content => '1'},
37 :descendant => {:tag => 'td',
38 :attributes => {:class => 'odd'}, :content => '3'},
39 :descendant => {:tag => 'td',
40 :attributes => {:class => 'even'}, :content => '9'}
41
42
43 Setting.start_of_week = 1
44 get :show, :month => '1', :year => '2010'
45 assert_response :success
46
47 assert_tag :tag => 'tr',
48 :descendant => {:tag => 'td',
49 :attributes => {:class => 'week-number'}, :content => '53'},
50 :descendant => {:tag => 'td',
51 :attributes => {:class => 'even'}, :content => '28'},
52 :descendant => {:tag => 'td',
53 :attributes => {:class => 'even'}, :content => '3'}
54
55 assert_tag :tag => 'tr',
56 :descendant => {:tag => 'td',
57 :attributes => {:class => 'week-number'}, :content => '1'},
58 :descendant => {:tag => 'td',
59 :attributes => {:class => 'even'}, :content => '4'},
60 :descendant => {:tag => 'td',
61 :attributes => {:class => 'even'}, :content => '10'}
62
63 end
20 end
64 end
General Comments 0
You need to be logged in to leave comments. Login now