query_start_of_week.patch - Redmine

           sql = relative_date_clause(db_table, db_field, 1, 1, is_custom_filter)
         when "w"
           # = this week
           first_day_of_week = l(:general_first_day_of_week).to_i
           first_day_of_week = Redmine::Helpers::Calendar.first_wday
           day_of_week = User.current.today.cwday
           days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
           sql = relative_date_clause(db_table, db_field, - days_ago, - days_ago + 6, is_custom_filter)
         when "lw"
           # = last week
           first_day_of_week = l(:general_first_day_of_week).to_i
           first_day_of_week = Redmine::Helpers::Calendar.first_wday
           day_of_week = User.current.today.cwday
           days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
           sql = relative_date_clause(db_table, db_field, - days_ago - 7, - days_ago - 1, is_custom_filter)
         when "l2w"
           # = last 2 weeks
           first_day_of_week = l(:general_first_day_of_week).to_i
           first_day_of_week = Redmine::Helpers::Calendar.first_wday
           day_of_week = User.current.today.cwday
           days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
           sql = relative_date_clause(db_table, db_field, - days_ago - 14, - days_ago - 1, is_custom_filter)
         when "nw"
           # = next week
           first_day_of_week = l(:general_first_day_of_week).to_i
           first_day_of_week = Redmine::Helpers::Calendar.first_wday
           day_of_week = User.current.today.cwday
           from = -(day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week) + 7
           sql = relative_date_clause(db_table, db_field, from, from + 6, is_custom_filter)

           # Return the first day of week
           # 1 = Monday ... 7 = Sunday
           def first_wday
           def self.first_wday
             case Setting.start_of_week.to_i
             when 1
               @first_dow ||= (1 - 1)%7 + 1
+    -

           # Return the first day of week
           # 1 = Monday ... 7 = Sunday
           # taking into account the Setting.start_of_week preference
           def self.first_wday
             case Setting.start_of_week.to_i
             when 1
               @first_dow ||= (1 - 1)%7 + 1
             when 6
               @first_dow ||= (6 - 1)%7 + 1
             when 7
               @first_dow ||= (7 - 1)%7 + 1
             else
               @first_dow ||= (l(:general_first_day_of_week).to_i - 1)%7 + 1
             end
             wday = Setting.start_of_week.to_i
             wday = l(:general_first_day_of_week).to_i unless [1, 6, 7].include? wday
             (wday - 1) % 7 + 1
           end
           def first_wday
             @first_dow ||= Calendar.first_wday
           end
           def last_wday

Project

General

Profile

Redmine

Patch #33554 » query_start_of_week.patch