Make start of the week customizable for the profile page

dutow · dutow · commit ea87db6fc323 · 2026-01-23T19:13:42.000+01:00
This is a hidden parameter for now, but if somebody wants a different
view that doesn't start with Monday, it is possible.
diff --git a/app/controllers/concerns/profile_activity.rb b/app/controllers/concerns/profile_activity.rb
@@ -21,6 +21,7 @@ def person_ids_for_query
   end
 
   def load_activity_data(scope: nil, year: nil)
+    @week_start_day = parse_week_start_day
     @activity_filters = parse_activity_filters
     effective_scope = scope || default_recent_scope
     @activity_entries = build_activity_entries(scope: effective_scope, filters: @activity_filters)
@@ -29,6 +30,7 @@ def load_activity_data(scope: nil, year: nil)
     @contribution_years = contribution_years
     @contribution_year = year || select_contribution_year(@contribution_years)
     @contribution_weeks, @contribution_month_spans = build_contribution_weeks(@contribution_year, filters: @activity_filters)
+    @weekday_labels = WeekCalculation.weekday_labels(@week_start_day)
   end
 
   def default_recent_scope
@@ -179,28 +181,29 @@ def build_contribution_weeks(year, filters: nil)
     return [[], []] if ids.blank?
 
     year = year.to_i
-    start_date = Date.commercial(year, 1, 1)
-    end_date = Date.commercial(year, Date.new(year, 12, 28).cweek, 7)
+    wday_start = @week_start_day || WeekCalculation::DEFAULT_WEEK_START
+    start_date, end_date = WeekCalculation.year_weeks_range(year, wday_start)
 
     counts = build_filtered_contribution_counts(start_date, end_date, filters)
 
     total_days = (end_date - start_date).to_i + 1
     days = (0...total_days).map do |idx|
-      date = start_date + idx.days
+      date = start_date + idx
       count = counts[date] || 0
       { date: date, count: count, level: contribution_level(count) }
     end
 
     weeks_data = days.each_slice(7).map do |week_days|
       first_day = week_days.first[:date]
-      { days: week_days, year: first_day.cwyear, week: first_day.cweek, count: week_days.sum { |d| d[:count] } }
+      week_num = WeekCalculation.week_number(first_day, year, wday_start)
+      { days: week_days, year: year, week: week_num, count: week_days.sum { |d| d[:count] } }
     end
 
     weeks_data.each do |week|
       next if week[:days].length == 7
       missing = 7 - week[:days].length
       missing.times do |idx|
-        date = week[:days].last[:date] + (idx + 1).days
+        date = week[:days].last[:date] + (idx + 1)
         week[:days] << { date: date, count: 0, level: 0 }
       end
     end
@@ -305,6 +308,10 @@ def parse_activity_filters
     params[:filters].select { |f| ALL_ACTIVITY_FILTERS.include?(f) }
   end
 
+  def parse_week_start_day
+    WeekCalculation.parse_week_start(params[:week_start])
+  end
+
   def parse_activity_date
     Date.iso8601(params[:date])
   rescue ArgumentError
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
@@ -38,8 +38,9 @@ def monthly_activity
   def weekly_activity
     year = params[:year].to_i
     week = params[:week].to_i
-    start_date = Date.commercial(year, week, 1)
-    end_date = start_date + 6.days
+    wday_start = WeekCalculation.parse_week_start(params[:week_start])
+    start_date = WeekCalculation.week_start_date(year, week, wday_start)
+    end_date = start_date + 6
     @profile_email = profile_email
     @activity_period = { type: :week, year: year, week: week, start_date: start_date, end_date: end_date }
     load_activity_data(scope: messages_scope_for_range(start_date, end_date), year: year)
diff --git a/app/controllers/teams_profile_controller.rb b/app/controllers/teams_profile_controller.rb
@@ -34,8 +34,9 @@ def monthly_activity
   def weekly_activity
     year = params[:year].to_i
     week = params[:week].to_i
-    start_date = Date.commercial(year, week, 1)
-    end_date = start_date + 6.days
+    wday_start = WeekCalculation.parse_week_start(params[:week_start])
+    start_date = WeekCalculation.week_start_date(year, week, wday_start)
+    end_date = start_date + 6
     @activity_period = { type: :week, year: year, week: week, start_date: start_date, end_date: end_date }
     load_activity_data(scope: messages_scope_for_range(start_date, end_date), year: year)
     render :activity
diff --git a/app/helpers/profile_helper.rb b/app/helpers/profile_helper.rb
@@ -14,23 +14,25 @@ def profile_filter_url(profile_routes, activity_period)
     end
   end
 
-  def person_profile_routes(email)
+  def person_profile_routes(email, week_start: nil)
+    ws = week_start ? { week_start: week_start } : {}
     {
-      default: person_path(email),
-      daily: ->(date) { person_activity_path(email, date) },
-      weekly: ->(year, week) { person_weekly_activity_path(email, year, week) },
-      monthly: ->(year, month) { person_monthly_activity_path(email, year, month) },
-      contributions: ->(year) { person_contributions_path(email, year: year) }
+      default: person_path(email, **ws),
+      daily: ->(date) { person_activity_path(email, date, **ws) },
+      weekly: ->(year, week) { person_weekly_activity_path(email, year, week, **ws) },
+      monthly: ->(year, month) { person_monthly_activity_path(email, year, month, **ws) },
+      contributions: ->(year) { person_contributions_path(email, year: year, **ws) }
     }
   end
 
-  def team_profile_routes(name)
+  def team_profile_routes(name, week_start: nil)
+    ws = week_start ? { week_start: week_start } : {}
     {
-      default: team_profile_path(name),
-      daily: ->(date) { team_activity_path(name, date) },
-      weekly: ->(year, week) { team_weekly_activity_path(name, year, week) },
-      monthly: ->(year, month) { team_monthly_activity_path(name, year, month) },
-      contributions: ->(year) { team_contributions_path(name, year: year) }
+      default: team_profile_path(name, **ws),
+      daily: ->(date) { team_activity_path(name, date, **ws) },
+      weekly: ->(year, week) { team_weekly_activity_path(name, year, week, **ws) },
+      monthly: ->(year, month) { team_monthly_activity_path(name, year, month, **ws) },
+      contributions: ->(year) { team_contributions_path(name, year: year, **ws) }
     }
   end
 end
diff --git a/app/views/people/_activity_filters.html.slim b/app/views/people/_activity_filters.html.slim
@@ -1 +1 @@
-= render "shared/profile/activity_filters", activity_filters: @activity_filters, activity_period: @activity_period, profile_routes: person_profile_routes(@profile_email), turbo_frame: "person-activity"
+= render "shared/profile/activity_filters", activity_filters: @activity_filters, activity_period: @activity_period, profile_routes: person_profile_routes(@profile_email, week_start: WeekCalculation.week_start_param(@week_start_day)), week_start_param: WeekCalculation.week_start_param(@week_start_day), turbo_frame: "person-activity"
diff --git a/app/views/people/_contributions.html.slim b/app/views/people/_contributions.html.slim
@@ -1 +1 @@
-= render "shared/profile/contributions", title: "Activity", contribution_years: @contribution_years, contribution_year: @contribution_year, contribution_weeks: @contribution_weeks, contribution_month_spans: @contribution_month_spans, profile_routes: person_profile_routes(@profile_email), turbo_frame: "person-activity"
+= render "shared/profile/contributions", title: "Activity", contribution_years: @contribution_years, contribution_year: @contribution_year, contribution_weeks: @contribution_weeks, contribution_month_spans: @contribution_month_spans, weekday_labels: @weekday_labels, profile_routes: person_profile_routes(@profile_email, week_start: WeekCalculation.week_start_param(@week_start_day)), turbo_frame: "person-activity"
diff --git a/app/views/shared/profile/_activity_filters.html.slim b/app/views/shared/profile/_activity_filters.html.slim
@@ -2,6 +2,8 @@
 
 .activity-filters data-controller="activity-filter"
   = form_with url: profile_filter_url(profile_routes, activity_period), method: :get, data: { turbo_frame: turbo_frame, activity_filter_target: "form" } do |f|
+    - if local_assigns[:week_start_param].present?
+      = hidden_field_tag :week_start, week_start_param
     span.filter-label Filter:
     label.filter-checkbox
       = check_box_tag "filters[]", "started_thread", filter_types.include?("started_thread"), data: { action: "change->activity-filter#submit" }
diff --git a/app/views/shared/profile/_contributions.html.slim b/app/views/shared/profile/_contributions.html.slim
@@ -22,7 +22,7 @@ div data-controller="contrib-calendar" data-contrib-calendar-filter-selector-val
             - else
               span.contrib-week-empty = week[:week]
     tbody
-      - weekday_labels = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
+      - weekday_labels ||= ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"]
       - 7.times do |row|
         tr
           th.contrib-label = weekday_labels[row]
diff --git a/app/views/teams_profile/_activity_filters.html.slim b/app/views/teams_profile/_activity_filters.html.slim
@@ -1 +1 @@
-= render "shared/profile/activity_filters", activity_filters: @activity_filters, activity_period: @activity_period, profile_routes: team_profile_routes(@team.name), turbo_frame: "team-activity"
+= render "shared/profile/activity_filters", activity_filters: @activity_filters, activity_period: @activity_period, profile_routes: team_profile_routes(@team.name, week_start: WeekCalculation.week_start_param(@week_start_day)), week_start_param: WeekCalculation.week_start_param(@week_start_day), turbo_frame: "team-activity"
diff --git a/app/views/teams_profile/_contributions.html.slim b/app/views/teams_profile/_contributions.html.slim
@@ -1 +1 @@
-= render "shared/profile/contributions", title: "Team Activity", contribution_years: @contribution_years, contribution_year: @contribution_year, contribution_weeks: @contribution_weeks, contribution_month_spans: @contribution_month_spans, profile_routes: team_profile_routes(@team.name), turbo_frame: "team-activity"
+= render "shared/profile/contributions", title: "Team Activity", contribution_years: @contribution_years, contribution_year: @contribution_year, contribution_weeks: @contribution_weeks, contribution_month_spans: @contribution_month_spans, weekday_labels: @weekday_labels, profile_routes: team_profile_routes(@team.name, week_start: WeekCalculation.week_start_param(@week_start_day)), turbo_frame: "team-activity"
diff --git a/lib/week_calculation.rb b/lib/week_calculation.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module WeekCalculation
+  WEEKDAY_NAMES = %w[Sun Mon Tue Wed Thu Fri Sat].freeze
+  DEFAULT_WEEK_START = 1 # Monday (matches Date#wday: 0=Sun, 1=Mon, ..., 6=Sat)
+
+  DAY_NAMES = {
+    "sunday" => 0, "sun" => 0,
+    "monday" => 1, "mon" => 1,
+    "tuesday" => 2, "tue" => 2,
+    "wednesday" => 3, "wed" => 3,
+    "thursday" => 4, "thu" => 4,
+    "friday" => 5, "fri" => 5,
+    "saturday" => 6, "sat" => 6
+  }.freeze
+
+  # Parse a week_start parameter string to a wday integer (0-6).
+  # Returns DEFAULT_WEEK_START for blank/unrecognized values.
+  def self.parse_week_start(param)
+    return DEFAULT_WEEK_START if param.blank?
+    DAY_NAMES[param.to_s.downcase] || DEFAULT_WEEK_START
+  end
+
+  # Returns the param string for a wday integer, or nil if it's the default.
+  def self.week_start_param(wday_start)
+    return nil if wday_start == DEFAULT_WEEK_START
+    WEEKDAY_NAMES[wday_start]&.downcase
+  end
+
+  # Returns the start (first day) of the week containing the given date.
+  def self.week_start_for(date, wday_start = DEFAULT_WEEK_START)
+    offset = (date.wday - wday_start) % 7
+    date - offset
+  end
+
+  # Returns [start_date, end_date] covering all full weeks that overlap the given year.
+  def self.year_weeks_range(year, wday_start = DEFAULT_WEEK_START)
+    jan1 = Date.new(year, 1, 1)
+    dec31 = Date.new(year, 12, 31)
+    start_date = week_start_for(jan1, wday_start)
+    end_date = week_start_for(dec31, wday_start) + 6
+    [start_date, end_date]
+  end
+
+  # Returns the 1-based week number for a date within a year's week grid.
+  def self.week_number(date, year, wday_start = DEFAULT_WEEK_START)
+    year_start = year_weeks_range(year, wday_start).first
+    ((date - year_start).to_i / 7) + 1
+  end
+
+  # Returns the start date for a given year and week number.
+  def self.week_start_date(year, week, wday_start = DEFAULT_WEEK_START)
+    year_start = year_weeks_range(year, wday_start).first
+    year_start + (week - 1) * 7
+  end
+
+  # Returns weekday label strings in display order starting from wday_start.
+  def self.weekday_labels(wday_start = DEFAULT_WEEK_START)
+    7.times.map { |i| WEEKDAY_NAMES[(wday_start + i) % 7] }
+  end
+end

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-= render "shared/profile/activity_filters", activity_filters: @activity_filters, activity_period: @activity_period, profile_routes: person_profile_routes(@profile_email), turbo_frame: "person-activity"`
	`1`	`+= render "shared/profile/activity_filters", activity_filters: @activity_filters, activity_period: @activity_period, profile_routes: person_profile_routes(@profile_email, week_start: WeekCalculation.week_start_param(@week_start_day)), week_start_param: WeekCalculation.week_start_param(@week_start_day), turbo_frame: "person-activity"`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-= render "shared/profile/contributions", title: "Activity", contribution_years: @contribution_years, contribution_year: @contribution_year, contribution_weeks: @contribution_weeks, contribution_month_spans: @contribution_month_spans, profile_routes: person_profile_routes(@profile_email), turbo_frame: "person-activity"`
	`1`	`+= render "shared/profile/contributions", title: "Activity", contribution_years: @contribution_years, contribution_year: @contribution_year, contribution_weeks: @contribution_weeks, contribution_month_spans: @contribution_month_spans, weekday_labels: @weekday_labels, profile_routes: person_profile_routes(@profile_email, week_start: WeekCalculation.week_start_param(@week_start_day)), turbo_frame: "person-activity"`