Project

General

Profile

Defect #5329 » time_report.rb.2.patch

no tabs - Filou Centrinov, 2013-02-22 02:23

View differences:

lib/redmine/helpers/time_report.rb (working copy)
63 63
            when 'month'
64 64
              row['month'] = "#{row['tyear']}-#{row['tmonth']}"
65 65
            when 'week'
66
              row['week'] = "#{row['tyear']}-#{row['tweek']}"
66
              row['week'] = "#{row['spent_on'].cwyear}-#{row['tweek']}"
67 67
            when 'day'
68 68
              row['day'] = "#{row['spent_on']}"
69 69
            end
......
90 90
              @periods << "#{date_from.year}-#{date_from.month}"
91 91
              date_from = (date_from + 1.month).at_beginning_of_month
92 92
            when 'week'
93
              @periods << "#{date_from.year}-#{date_from.to_date.cweek}"
93
              @periods << "#{date_from.to_date.cwyear}-#{date_from.to_date.cweek}"
94 94
              date_from = (date_from + 7.day).at_beginning_of_week
95 95
            when 'day'
96 96
              @periods << "#{date_from.to_date}"
(4-4/4)