From 0a6a7f0ed7be045640f98cbb14a61588995670c1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 24 Feb 2013 12:18:29 +0000 Subject: Fixed that time entries report by week breaks on edge cases (#5329). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11471 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/helpers/time_report.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/redmine/helpers/time_report.rb b/lib/redmine/helpers/time_report.rb index 870452758..09093dc95 100644 --- a/lib/redmine/helpers/time_report.rb +++ b/lib/redmine/helpers/time_report.rb @@ -63,7 +63,7 @@ module Redmine when 'month' row['month'] = "#{row['tyear']}-#{row['tmonth']}" when 'week' - row['week'] = "#{row['tyear']}-#{row['tweek']}" + row['week'] = "#{row['spent_on'].cwyear}-#{row['tweek']}" when 'day' row['day'] = "#{row['spent_on']}" end @@ -90,7 +90,7 @@ module Redmine @periods << "#{date_from.year}-#{date_from.month}" date_from = (date_from + 1.month).at_beginning_of_month when 'week' - @periods << "#{date_from.year}-#{date_from.to_date.cweek}" + @periods << "#{date_from.to_date.cwyear}-#{date_from.to_date.cweek}" date_from = (date_from + 7.day).at_beginning_of_week when 'day' @periods << "#{date_from.to_date}" -- cgit v1.2.3