Add configurable week start day preference

- Add WeekStartDayChoices model and week_start_day field to User
- Add week start day dropdown to preferences page with new week SVG icon
- Update statistics activity grid to respect week start day setting
- Update events calendar to respect week start day setting
- Dynamically render weekday labels in both statistics and calendar views

Co-authored-by: GitHub Copilot <noreply@github.com>

Author: daviddavis

src/app/statistics.py

@@ -8,10 +8,7 @@
 from dateutil.relativedelta import relativedelta
 from django.apps import apps
 from django.db import models
-from django.db.models import (
-    Prefetch,
-    Q,
-)
+from django.db.models import Prefetch, Q
 from django.utils import timezone
 
 from app import config
@@ -388,12 +385,47 @@ def time_line_sort_key(media):
     return timezone.localdate(media.start_date)
 
 
+def _build_month_labels(date_range, week_start_weekday):
+    """Build month labels and their corresponding week counts for the activity grid."""
+    months = []
+    weeks_per_month = []
+    current_month = date_range[0].strftime("%b")
+    week_count = 0
+
+    for current_date in date_range:
+        if current_date.weekday() == week_start_weekday:
+            month = current_date.strftime("%b")
+
+            if current_month != month:
+                if current_month is not None:
+                    if week_count > 1:
+                        months.append(current_month)
+                        weeks_per_month.append(week_count)
+                    else:
+                        months.append("")
+                        weeks_per_month.append(week_count)
+                current_month = month
+                week_count = 0
+
+            week_count += 1
+    # For the last month
+    if week_count > 1:
+        months.append(current_month)
+        weeks_per_month.append(week_count)
+
+    return months, weeks_per_month
+
+
 def get_activity_data(user, start_date, end_date):
     """Get daily activity counts for the last year."""
     if end_date is None:
         end_date = timezone.localtime()
 
-    start_date_aligned = get_aligned_monday(start_date)
+    week_start_sunday = getattr(user, "week_start_day", "monday") == "sunday"
+    start_date_aligned = get_aligned_week_start(
+        start_date,
+        week_start_sunday=week_start_sunday,
+    )
 
     combined_data = get_filtered_historical_data(start_date_aligned, end_date, user)
 
@@ -404,7 +436,10 @@ def get_activity_data(user, start_date, end_date):
             min(dates) if dates else timezone.localdate(),
             datetime.time.min,
         )
-        start_date_aligned = get_aligned_monday(start_date)
+        start_date_aligned = get_aligned_week_start(
+            start_date,
+            week_start_sunday=week_start_sunday,
+        )
 
     # Aggregate counts by date
     date_counts = {}
@@ -440,36 +475,19 @@ def get_activity_data(user, start_date, end_date):
     # Format data into calendar weeks
     calendar_weeks = [activity_data[i : i + 7] for i in range(0, len(activity_data), 7)]
 
-    # Generate months list with their Monday counts
-    months = []
-    mondays_per_month = []
-    current_month = date_range[0].strftime("%b")
-    monday_count = 0
+    # Generate months list with their week-start-day counts
+    # The first day of each week column corresponds to the user's chosen week start day
+    week_start_weekday = 6 if week_start_sunday else 0  # 0=Monday, 6=Sunday
+    months, weeks_per_month = _build_month_labels(date_range, week_start_weekday)
 
-    for current_date in date_range:
-        if current_date.weekday() == 0:  # Monday
-            month = current_date.strftime("%b")
-
-            if current_month != month:
-                if current_month is not None:
-                    if monday_count > 1:
-                        months.append(current_month)
-                        mondays_per_month.append(monday_count)
-                    else:
-                        months.append("")
-                        mondays_per_month.append(monday_count)
-                current_month = month
-                monday_count = 0
-
-            monday_count += 1
-    # For the last month
-    if monday_count > 1:
-        months.append(current_month)
-        mondays_per_month.append(monday_count)
+    # Weekday labels depend on week start day
+    days = list(calendar.day_abbr)
+    weekday_labels = [days[6], *days[0:6]] if week_start_sunday else days
 
     return {
         "calendar_weeks": calendar_weeks,
-        "months": list(zip(months, mondays_per_month, strict=False)),
+        "months": list(zip(months, weeks_per_month, strict=False)),
+        "weekday_labels": weekday_labels,
         "stats": {
             "most_active_day": most_active_day,
             "most_active_day_percentage": day_percentage,
@@ -479,12 +497,16 @@ def get_activity_data(user, start_date, end_date):
     }
 
 
-def get_aligned_monday(datetime_obj):
-    """Get the Monday of the week containing the given date."""
+def get_aligned_week_start(datetime_obj, *, week_start_sunday=False):
+    """Get the first day of the week containing the given date."""
     if datetime_obj is None:
         return None
 
-    days_to_subtract = datetime_obj.weekday()  # 0=Monday, 6=Sunday
+    if week_start_sunday:
+        # Sunday=weekday 6; if Sunday, subtract 0; else subtract (weekday+1)
+        days_to_subtract = (datetime_obj.weekday() + 1) % 7
+    else:
+        days_to_subtract = datetime_obj.weekday()  # 0=Monday, 6=Sunday
     return datetime_obj - datetime.timedelta(days=days_to_subtract)
 
 

src/events/views.py

@@ -60,9 +60,18 @@ def calendar(request):
     ) - timedelta(days=1)
 
     # Get calendar data
-    calendar_format = cal.monthcalendar(year, month)
+    first_weekday = 6 if request.user.week_start_day == "sunday" else 0
+    c = cal.Calendar(firstweekday=first_weekday)
+    calendar_format = c.monthdayscalendar(year, month)
     month_name = cal.month_name[month]
 
+    # Build weekday headers based on user preference
+    days = list(cal.day_abbr)
+    sunday = 6
+    weekday_headers = (
+        [days[sunday], *days[0:sunday]] if first_weekday == sunday else days
+    )
+
     # Get events and organize by day
     releases = Event.objects.get_user_events(request.user, first_day, last_day)
 
@@ -80,6 +89,7 @@ def calendar(request):
 
     context = {
         "calendar": calendar_format,
+        "weekday_headers": weekday_headers,
         "month": month,
         "month_name": month_name,
         "year": year,

src/templates/app/icons/week.svg

@@ -183,13 +183,13 @@ <h2 class="text-xl font-semibold mb-4 text-center">Activity History</h2>
           <div class="flex">
             <!-- Weekday labels -->
             <div class="flex flex-col justify-between pr-2 text-sm text-gray-400">
-              <div class="h-4 flex items-center">Mon</div>
-              <div class="h-4"></div>
-              <div class="h-4 flex items-center">Wed</div>
-              <div class="h-4"></div>
-              <div class="h-4 flex items-center">Fri</div>
-              <div class="h-4"></div>
-              <div class="h-4 flex items-center">Sun</div>
+              {% for label in activity_data.weekday_labels %}
+                {% if forloop.counter|divisibleby:2 %}
+                  <div class="h-4"></div>
+                {% else %}
+                  <div class="h-4 flex items-center">{{ label }}</div>
+                {% endif %}
+              {% endfor %}
             </div>
 
             <!-- Weeks grid -->

src/templates/app/statistics.html

@@ -2,13 +2,9 @@
 {% load events_tags %}
 
 <div class="grid grid-cols-7 gap-1 mb-2">
-  <div class="text-center text-sm font-medium text-gray-400 py-2">Mon</div>
-  <div class="text-center text-sm font-medium text-gray-400 py-2">Tue</div>
-  <div class="text-center text-sm font-medium text-gray-400 py-2">Wed</div>
-  <div class="text-center text-sm font-medium text-gray-400 py-2">Thu</div>
-  <div class="text-center text-sm font-medium text-gray-400 py-2">Fri</div>
-  <div class="text-center text-sm font-medium text-gray-400 py-2">Sat</div>
-  <div class="text-center text-sm font-medium text-gray-400 py-2">Sun</div>
+  {% for header in weekday_headers %}
+    <div class="text-center text-sm font-medium text-gray-400 py-2">{{ header }}</div>
+  {% endfor %}
 </div>
 
 <div class="grid grid-cols-7 gap-1">

src/templates/events/components/calendar_grid.html

@@ -169,6 +169,26 @@ <h2 class="text-xl font-semibold">Preferences</h2>
         </div>
       </div>
 
+      {# Week Start Day #}
+      <div class="mb-5">
+        <div class="flex items-center justify-between p-3 bg-[#39404b] rounded-md">
+          <div class="flex-1">
+            <div class="flex items-center text-gray-200 mb-1">
+              {% include "app/icons/week.svg" with classes="w-5 h-5 mr-2" %}
+              <span class="text-sm font-medium">Week Start Day</span>
+            </div>
+            <p class="text-xs text-gray-400 ml-7">Choose which day the week starts on for calendars and statistics.</p>
+          </div>
+          <select name="week_start_day"
+                  class="ml-4 p-2 bg-[#39404b] rounded-md text-white text-sm border border-gray-600 focus:outline-none focus:ring-2 focus:ring-indigo-400">
+            {% for choice in week_start_day_choices %}
+              <option value="{{ choice.0 }}"
+                      {% if user.week_start_day == choice.0 %}selected{% endif %}>{{ choice.1 }}</option>
+            {% endfor %}
+          </select>
+        </div>
+      </div>
+
       {# Watch Provider Region #}
       <div class="mb-5">
         <div class="flex items-center justify-between p-3 bg-[#39404b] rounded-md">

src/templates/users/preferences.html

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.13 on 2026-04-19 16:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0050_user_watch_provider_region'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='week_start_day',
+            field=models.CharField(choices=[('monday', 'Monday'), ('sunday', 'Sunday')], default='monday', help_text='First day of the week', max_length=10),
+        ),
+        migrations.AddConstraint(
+            model_name='user',
+            constraint=models.CheckConstraint(condition=models.Q(('week_start_day__in', ['monday', 'sunday'])), name='week_start_day_valid'),
+        ),
+    ]

src/users/migrations/0051_user_week_start_day.py

@@ -106,6 +106,13 @@ class TimeFormatChoices(models.TextChoices):
     HOUR_12 = "g:i A", "2:30 PM (12-hour)"
 
 
+class WeekStartDayChoices(models.TextChoices):
+    """Choices for week start day."""
+
+    MONDAY = "monday", "Monday"
+    SUNDAY = "sunday", "Sunday"
+
+
 class User(AbstractUser):
     """Custom user model."""
 
@@ -312,6 +319,13 @@ class User(AbstractUser):
         help_text="Preferred time display format",
     )
 
+    week_start_day = models.CharField(
+        max_length=10,
+        default=WeekStartDayChoices.MONDAY,
+        choices=WeekStartDayChoices,
+        help_text="First day of the week",
+    )
+
     # Progress bar
     progress_bar = models.BooleanField(
         default=True,
@@ -510,6 +524,10 @@ class Meta:
                 name="quick_watch_date_valid",
                 condition=models.Q(quick_watch_date__in=QuickWatchDateChoices.values),
             ),
+            models.CheckConstraint(
+                name="week_start_day_valid",
+                condition=models.Q(week_start_day__in=WeekStartDayChoices.values),
+            ),
         ]
 
     def update_preference(self, field_name, new_value):

src/users/models.py

@@ -15,7 +15,12 @@
 from app.models import Item, MediaTypes
 from app.providers import tmdb
 from users.forms import NotificationSettingsForm, PasswordChangeForm, UserUpdateForm
-from users.models import DateFormatChoices, QuickWatchDateChoices, TimeFormatChoices
+from users.models import (
+    DateFormatChoices,
+    QuickWatchDateChoices,
+    TimeFormatChoices,
+    WeekStartDayChoices,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -225,6 +230,7 @@ def preferences(request):
                 "quick_watch_date_choices": QuickWatchDateChoices.choices,
                 "date_format_choices": DateFormatChoices.choices,
                 "time_format_choices": TimeFormatChoices.choices,
+                "week_start_day_choices": WeekStartDayChoices.choices,
                 "watch_provider_choices": watch_provider_regions,
             },
         )
@@ -253,6 +259,9 @@ def preferences(request):
         "time_format",
         TimeFormatChoices.HOUR_24,
     )
+    week_start_day = request.POST.get("week_start_day")
+    if week_start_day in WeekStartDayChoices.values:
+        request.user.week_start_day = week_start_day
     media_types_checked = request.POST.getlist("media_types_checkboxes")
 
     provider_region = request.POST.get("watch_provider_region", "")