feat(calendar): preserve navigated week on view switch + chevron parity

When the user navigates forward in week view and then switches to
"Tidsplan" (schedule) or "Dag" (day), currentDate previously reset to
today — losing their navigation context. Now it snaps to Monday of the
currently-viewed week instead, so day-view lands on that Monday and
schedule-view shows the same week.

Also fixes the chevron asymmetry: schedule view's chevron now advances
7 days per click (was 1 day), matching week view; day view stays at
1 day. Tooltips updated to match: only day view says "Previous/Next
day"; week and schedule both say "Previous/Next week".

Adds H1/H2/H3 Playwright tests in r/calendar-ui-enhancements covering
the three behaviours, plus getCalendarHeaderDateText helper. Renames
the now-misleading navigateScheduleByDays helper to navigateScheduleByWeeks
and updates the F1/F2 call sites in calendar-resize.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: renemadsen

eform-client/playwright/e2e/plugins/backend-configuration-pn/r/calendar-resize.spec.ts

@@ -442,11 +442,11 @@ test.describe.serial('Calendar event resize', () => {
       await createSimpleEvent(page, calendarPage, title, 6);
 
       await calendarPage.switchToScheduleView();
-      // Container resets currentDate to today on week→schedule swap
-      // (calendar-container.component.ts:436). The chevron in schedule
-      // view advances by 1 DAY per click, not 1 week — so we need 7
-      // clicks to land in the same week as the event (week +1).
-      await calendarPage.navigateScheduleByDays(7);
+      // After the view-switch fix, the schedule view preserves the
+      // navigated week (no longer snaps currentDate back to today) and
+      // the chevron advances 7 days per click. Advance one week to
+      // land in the same week as the event (week +1).
+      await calendarPage.navigateScheduleByWeeks(1);
 
       const row = calendarPage.findScheduleItem(title);
       await expect(row).toBeVisible();
@@ -469,9 +469,10 @@ test.describe.serial('Calendar event resize', () => {
       await createSimpleEvent(page, calendarPage, title, 6, 14);
 
       await calendarPage.switchToScheduleView();
-      // View swap resets the date to today; advance 7 days (1 chevron =
-      // 1 day in schedule view) to land in week +1 where the event lives.
-      await calendarPage.navigateScheduleByDays(7);
+      // Schedule view preserves the navigated week post-fix and the
+      // chevron advances 7 days per click. Advance one week to land
+      // in week +1 where the event lives.
+      await calendarPage.navigateScheduleByWeeks(1);
       await calendarPage.findScheduleItem(title).click();
       await page.locator('app-task-preview-modal').waitFor({ state: 'visible', timeout: 10000 });
 

eform-client/playwright/e2e/plugins/backend-configuration-pn/r/calendar-ui-enhancements.page.ts

@@ -285,6 +285,20 @@ export class CalendarUiEnhancementsPage {
     }
   }
 
+  /**
+   * Read the calendar-header's rendered date string (the `displayDate`
+   * getter output from calendar-header.component.ts). Format is locale-
+   * dependent and view-dependent:
+   *   - day / schedule: "{Weekday}, {D}. {Month} {YYYY}" (long form)
+   *   - week:           "{Month} {YYYY}"
+   * The text is rendered in `<span class="date-range">{{ displayDate }}</span>`
+   * inside `app-calendar-header`. Returns the trimmed visible text.
+   */
+  async getCalendarHeaderDateText(): Promise<string> {
+    const span = this.page.locator('app-calendar-header .date-range').first();
+    return ((await span.textContent()) ?? '').trim();
+  }
+
   // ----- Resize gesture ----------------------------------------------------
 
   /**
@@ -503,14 +517,12 @@ export class CalendarUiEnhancementsPage {
   }
 
   /**
-   * Advance the schedule (list) / day view by `days` days. The chevron
-   * step in non-week views is 1 day per click (see
-   * calendar-container.component.ts:421), so a 1-week advance needs 7
-   * clicks. Each click awaits the /tasks/week POST so navigation is
-   * deterministic.
+   * Click the chevron-right N times in schedule view; advances N weeks
+   * (post the view-switch fix that made schedule chevron step 7 days).
+   * Each click awaits the /tasks/week POST so navigation is deterministic.
    */
-  async navigateScheduleByDays(days: number): Promise<void> {
-    for (let i = 0; i < days; i++) {
+  async navigateScheduleByWeeks(weeks: number): Promise<void> {
+    for (let i = 0; i < weeks; i++) {
       await this.navigateToNextWeek();
     }
   }

eform-client/playwright/e2e/plugins/backend-configuration-pn/r/calendar-ui-enhancements.spec.ts

@@ -544,4 +544,100 @@ test.describe.serial('Calendar UI enhancements', () => {
       await calendarPage.assertHeaderStaysSticky('max');
     });
   });
+
+  // =======================================================================
+  // H. View-switch preserves the navigated week (regression for the
+  //    currentDate-reset removal). Switching from week → day or week →
+  //    schedule used to snap currentDate back to today; it now snaps to
+  //    Monday of the currently-viewed week. Schedule-view chevron also
+  //    advances 7 days per click (was 1).
+  // =======================================================================
+  test.describe('Calendar — view-switch preserves navigated week', () => {
+    // Test-side helpers (kept inline — test-only date math)
+    // Local-tz Monday of the current week. Mirrors getMondayOfWeek in
+    // calendar-container.component.ts so the tests reason in the same
+    // timezone as the running app.
+    function mondayOfThisWeekLocal(): Date {
+      const d = new Date();
+      d.setHours(0, 0, 0, 0);
+      const dow = d.getDay(); // 0=Sun … 6=Sat
+      const diff = dow === 0 ? -6 : 1 - dow;
+      d.setDate(d.getDate() + diff);
+      return d;
+    }
+    function addDays(d: Date, n: number): Date {
+      const out = new Date(d);
+      out.setDate(out.getDate() + n);
+      return out;
+    }
+    // Mirror calendar-header.component.ts displayDate format for day/schedule views.
+    // The Playwright runtime is da-DK (matches the dev environment).
+    function formatLongDate(d: Date, locale = 'da-DK'): string {
+      const formatted = d.toLocaleDateString(locale, {
+        weekday: 'long', day: 'numeric', month: 'long', year: 'numeric',
+      });
+      return formatted.charAt(0).toUpperCase() + formatted.slice(1);
+    }
+
+    test('H1: schedule view preserves the navigated week (not today)', async ({ page }) => {
+      const calendarPage = new CalendarUiEnhancementsPage(page);
+      await page.locator('app-calendar-week-grid').waitFor({ state: 'visible', timeout: 10000 });
+
+      // Navigate two weeks forward in week view
+      await calendarPage.navigateToNextWeek();
+      await calendarPage.navigateToNextWeek();
+
+      // Switch to schedule (Tidsplan)
+      await calendarPage.switchToScheduleView();
+
+      // Header should now show the Monday of (today's-week + 14d), in long format
+      const expected = formatLongDate(addDays(mondayOfThisWeekLocal(), 14));
+      const actual = await calendarPage.getCalendarHeaderDateText();
+      expect(actual).toBe(expected);
+    });
+
+    test('H2: day view lands on Monday of the navigated week', async ({ page }) => {
+      const calendarPage = new CalendarUiEnhancementsPage(page);
+      await page.locator('app-calendar-week-grid').waitFor({ state: 'visible', timeout: 10000 });
+
+      await calendarPage.navigateToNextWeek();
+      await calendarPage.navigateToNextWeek();
+
+      await calendarPage.switchToDayView();
+
+      const expectedMonday = addDays(mondayOfThisWeekLocal(), 14);
+      const expectedHeader = formatLongDate(expectedMonday);
+      const actualHeader = await calendarPage.getCalendarHeaderDateText();
+      expect(actualHeader).toBe(expectedHeader);
+
+      // The single day-grid column header should also show that Monday's date.
+      // Selector skips the time-axis column. The grid label format is
+      // "weekdayShort. dd/mm" (e.g. "man. 11/05"), so the dd/mm pair is a
+      // tighter anchor than the bare day number — a neighbour-week off-by-one
+      // would not collide.
+      const dayCol = page
+        .locator('app-calendar-week-grid .mat-mdc-header-cell:not(.mat-column-time-axis)')
+        .first();
+      const colText = (await dayCol.innerText()).trim();
+      const dd = String(expectedMonday.getDate()).padStart(2, '0');
+      const mm = String(expectedMonday.getMonth() + 1).padStart(2, '0');
+      expect(colText).toContain(`${dd}/${mm}`);
+    });
+
+    test('H3: schedule chevron advances one week per click', async ({ page }) => {
+      const calendarPage = new CalendarUiEnhancementsPage(page);
+      await page.locator('app-calendar-week-grid').waitFor({ state: 'visible', timeout: 10000 });
+
+      // Get into schedule view at this week's Monday (no navigation yet)
+      await calendarPage.switchToScheduleView();
+      const before = await calendarPage.getCalendarHeaderDateText();
+      expect(before).toBe(formatLongDate(mondayOfThisWeekLocal()));
+
+      // One chevron click should advance 7 days (NOT 1 day, post-fix)
+      await calendarPage.navigateToNextWeek();
+
+      const after = await calendarPage.getCalendarHeaderDateText();
+      expect(after).toBe(formatLongDate(addDays(mondayOfThisWeekLocal(), 7)));
+    });
+  });
 });

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/calendar/components/calendar-container/calendar-container.component.ts

@@ -417,8 +417,9 @@ export class CalendarContainerComponent implements OnInit, OnDestroy {
 
   onNavigate(direction: -1 | 1) {
     const d = new Date(this.currentDate);
-    // Week view shifts 7 days at a time; day and list views shift 1 day.
-    const step = this.viewMode === 'week' ? 7 : 1;
+    // Day view advances by one day; week and schedule (list) views both show a
+    // full week of data, so the chevron advances by one full week in those.
+    const step = this.viewMode === 'day' ? 1 : 7;
     d.setDate(d.getDate() + direction * step);
     this.stateService.updateCurrentDate(this.toLocalDateString(d));
     this.loadTasks();
@@ -430,11 +431,13 @@ export class CalendarContainerComponent implements OnInit, OnDestroy {
   }
 
   onViewModeChange(viewMode: 'week' | 'day' | 'schedule') {
-    // Switching into day or list view should always land on today, so users
-    // don't find themselves in a single-day view of some unrelated week.
-    // Week→week keeps the currently-viewed week.
+    // Switching out of week view: snap currentDate to Monday of the
+    // currently-viewed week so day-view lands on the first day of that
+    // week and schedule-view shows that same week — preserving the
+    // user's navigation context instead of jumping back to today.
     if (viewMode !== 'week' && this.viewMode === 'week') {
-      this.stateService.updateCurrentDate(this.toLocalDateString(new Date()));
+      const monday = this.getMondayOfWeek(new Date(this.currentDate));
+      this.stateService.updateCurrentDate(this.toLocalDateString(monday));
     }
     this.stateService.updateViewMode(viewMode);
     this.loadTasks();

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/calendar/components/calendar-header/calendar-header.component.ts

@@ -70,11 +70,11 @@ export class CalendarHeaderComponent implements OnInit {
   }
 
   get prevTooltipKey(): string {
-    return this.viewMode === 'week' ? 'Previous week' : 'Previous day';
+    return this.viewMode === 'day' ? 'Previous day' : 'Previous week';
   }
 
   get nextTooltipKey(): string {
-    return this.viewMode === 'week' ? 'Next week' : 'Next day';
+    return this.viewMode === 'day' ? 'Next day' : 'Next week';
   }
 
   private getMondayOfWeek(d: Date): Date {