jro_apps/redmine Commit - r3676:41ff1b9cb264

Display the correct ISO week number on the project calendar....

Eric Davis -

r3676:41ff1b9cb264

parent child

Context file:

r3676:41ff1b9cb264

Collapse all files

app/views/common/_calendar.rhtml +1 -1

             <table class="cal">
             <thead>
             <tr><th scope="col" title="<%= l(:label_week) %>" class="week-number"></th><% 7.times do |i| %><th scope="col"><%= day_name( (calendar.first_wday+i)%7 ) %></th><% end %></tr>
             </thead>
             <tbody>
             <tr>
             <% day = calendar.startdt
             while day <= calendar.enddt %>
-            <%= "<td class='week-number' title='#{ l(:label_week) }'>#{day.cweek}</td>" if day.cwday == calendar.first_wday %>
+            <%= "<td class='week-number' title='#{ l(:label_week) }'>#{(day+(11-day.cwday)%7).cweek}</td>" if day.cwday == calendar.first_wday %>
             <td class="<%= day.month==calendar.month ? 'even' : 'odd' %><%= ' today' if Date.today == day %>">
             <p class="day-num"><%= day.day %></p>
             <% calendar.events_on(day).each do |i| %>
               <% if i.is_a? Issue %>
               <div class="<%= i.css_classes %> <%= 'starting' if day == i.start_date %> <%= 'ending' if day == i.due_date %> tooltip">
               <%= h("#{i.project} -") unless @project && @project == i.project %>
               <%= link_to_issue i, :truncate => 30 %>
               <span class="tip"><%= render_issue_tooltip i %></span>
               </div>
               <% else %>
               <span class="icon icon-package">
                 <%= h("#{i.project} -") unless @project && @project == i.project %>
                 <%= link_to_version i%>
               </span>
               <% end %>
             <% end %>
             </td>
             <%= '</tr><tr>' if day.cwday==calendar.last_wday and day!=calendar.enddt %>
             <% day = day + 1
             end %>
             </tr>
             </tbody>
             </table>

test/functional/calendars_controller_test.rb +44 0

@@ -1,20 +1,64
1	require 'test_helper'	1	require 'test_helper'
2		2
3	class CalendarsControllerTest < ActionController::TestCase	3	class CalendarsControllerTest < ActionController::TestCase
4	fixtures :all	4	fixtures :all
5		5
6	def test_calendar	6	def test_calendar
7	get :show, :project_id => 1	7	get :show, :project_id => 1
8	assert_response :success	8	assert_response :success
9	assert_template 'calendar'	9	assert_template 'calendar'
10	assert_not_nil assigns(:calendar)	10	assert_not_nil assigns(:calendar)
11	end	11	end
12		12
13	def test_cross_project_calendar	13	def test_cross_project_calendar
14	get :show	14	get :show
15	assert_response :success	15	assert_response :success
16	assert_template 'calendar'	16	assert_template 'calendar'
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

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages