Update calendar with multi-select

2026-06-14 22:20:32 +02:00
parent 88afa17666
commit dead5e4897
14 changed files with 955 additions and 96 deletions
@@ -1,25 +1,53 @@
-import { ReactNode, useState } from 'react'
+import { ReactNode, useState, useEffect } from 'react'
 import { useWorkspace } from '@/context'
-import { usePlannedDays } from '@/hooks'
+import { usePlannedDays, useShowWeekNumbers, getLastLeaveType, setLastLeaveType } from '@/hooks'
 import type { PlannedLeaveDay } from '@/types'
 import { Layout } from '@/components/layout/Layout'
 import { LoadingSpinner } from '@/components/common/LoadingSpinner'
-import { CalendarDay } from '@/components/common/CalendarDay'
-import { CalendarEvent } from '@/components/common/CalendarEvent'
+import { CalendarWeek } from '@/components/common/CalendarWeek'
 import { PlannedDayModal } from '@/components/modals/PlannedDayModal'
+import { getColorForType } from '@/utils/leaveTypes'
+import { datesInRange } from '@/utils/dates'
 import './calendar.css'

 export function Calendar(): ReactNode {
-  const { isLoading: wsLoading, selectedChildId, workspace, personalDataUuid } = useWorkspace()
+  const { isLoading: wsLoading, selectedChildId, workspace, personalDataUuid, parentName } = useWorkspace()
  const { data: plannedDays, isLoading: pdLoading, add, update, remove } = usePlannedDays(selectedChildId ?? undefined)
+  const [showWeekNumbers] = useShowWeekNumbers()
  const [currentMonth, setCurrentMonth] = useState(new Date())
-  const [selectedDate, setSelectedDate] = useState<string | null>(null)
+  const [selectedDates, setSelectedDates] = useState<Set<string>>(new Set())
+  const [dragAnchor, setDragAnchor] = useState<string | null>(null)
+  const [dragCurrent, setDragCurrent] = useState<string | null>(null)
+  const [isDragging, setIsDragging] = useState(false)
  const [isModalOpen, setIsModalOpen] = useState(false)
+  const [isRangeMode, setIsRangeMode] = useState(false)
  const [isSaving, setIsSaving] = useState(false)
  const [modalError, setModalError] = useState<string | null>(null)

  const isLoading = wsLoading || pdLoading

+  useEffect(() => {
+    const handlePointerUp = () => {
+      if (isDragging && dragAnchor && dragCurrent) {
+        const dates = datesInRange(dragAnchor, dragCurrent)
+        setSelectedDates(new Set(dates))
+
+        if (dates.length === 1) {
+          setIsRangeMode(false)
+        } else {
+          setIsRangeMode(true)
+        }
+        setIsModalOpen(true)
+      }
+      setIsDragging(false)
+    }
+
+    if (isDragging) {
+      window.addEventListener('pointerup', handlePointerUp)
+      return () => window.removeEventListener('pointerup', handlePointerUp)
+    }
+  }, [isDragging, dragAnchor, dragCurrent])
+
  if (isLoading) {
    return <LoadingSpinner message="Loading calendar..." />
  }
@@ -54,16 +82,6 @@ export function Calendar(): ReactNode {
  }
  weeks.push(currentWeek)

-  const getEventsForDate = (date: string) => {
-    return (plannedDays ?? [])
-      .filter((pd: PlannedLeaveDay) => pd.date === date)
-      .map((pd: PlannedLeaveDay) => ({
-        type: pd.dayType,
-        color: getColorForType(pd.dayType),
-        title: pd.dayType,
-      }))
-  }
-
  const handlePrevMonth = () => {
    setCurrentMonth(new Date(year, month - 1, 1))
  }
@@ -72,9 +90,21 @@ export function Calendar(): ReactNode {
    setCurrentMonth(new Date(year, month + 1, 1))
  }

+  const handlePointerDown = (date: string) => {
+    setDragAnchor(date)
+    setDragCurrent(date)
+    setIsDragging(true)
+  }
+
+  const handlePointerEnter = (date: string) => {
+    if (isDragging) {
+      setDragCurrent(date)
+    }
+  }
+
  const handleDayClick = (date: string) => {
-    setSelectedDate(date)
-    setModalError(null)
+    setSelectedDates(new Set([date]))
+    setIsRangeMode(false)
    setIsModalOpen(true)
  }

@@ -87,51 +117,63 @@ export function Calendar(): ReactNode {
    parentId: string
    isDubbeldag: boolean
  }) => {
-    if (!selectedDate || !selectedChildId || !workspace?.id || !personalDataUuid) return
+    if (selectedDates.size === 0 || !selectedChildId || !workspace?.id || !personalDataUuid) return

    try {
      setIsSaving(true)
      setModalError(null)

-      const existingDay = getExistingDay(selectedDate)
+      setLastLeaveType(payload.dayType)

-      if (existingDay) {
-        await update(existingDay.id, {
-          day_type: payload.dayType,
-          is_dubbeldag: payload.isDubbeldag,
-        })
-      } else {
-        await add({
-          workspace_id: workspace.id,
-          child_id: selectedChildId,
-          parent_personal_data_uuid: personalDataUuid,
-          date: selectedDate,
-          day_type: payload.dayType,
-          is_dubbeldag: payload.isDubbeldag,
-        })
+      for (const date of selectedDates) {
+        const existingDay = (plannedDays ?? []).find(
+          (pd: PlannedLeaveDay) => pd.date === date && pd.parentPersonalDataUuid === personalDataUuid
+        )
+
+        if (existingDay) {
+          await update(existingDay.id, {
+            day_type: payload.dayType,
+            is_dubbeldag: payload.isDubbeldag,
+          })
+        } else {
+          await add({
+            workspace_id: workspace.id,
+            child_id: selectedChildId,
+            parent_personal_data_uuid: personalDataUuid,
+            date,
+            day_type: payload.dayType,
+            is_dubbeldag: payload.isDubbeldag,
+          })
+        }
      }

      setIsModalOpen(false)
+      setSelectedDates(new Set())
    } catch (err) {
-      setModalError(err instanceof Error ? err.message : 'Failed to save planned day')
+      setModalError(err instanceof Error ? err.message : 'Failed to save planned days')
    } finally {
      setIsSaving(false)
    }
  }

  const handleDeletePlannedDay = async () => {
-    if (!selectedDate) return
+    if (selectedDates.size !== 1) return

    try {
      setIsSaving(true)
      setModalError(null)

-      const existingDay = getExistingDay(selectedDate)
+      const dates = Array.from(selectedDates)
+      const date = dates[0]
+      if (!date) return
+
+      const existingDay = getExistingDay(date)
      if (existingDay) {
        await remove(existingDay.id)
      }

      setIsModalOpen(false)
+      setSelectedDates(new Set())
    } catch (err) {
      setModalError(err instanceof Error ? err.message : 'Failed to delete planned day')
    } finally {
@@ -139,6 +181,9 @@ export function Calendar(): ReactNode {
    }
  }

+  const defaultLeaveType = getLastLeaveType() ?? 'vacation'
+  const firstSelectedDate = Array.from(selectedDates).sort()[0]
+
  return (
    <Layout>
      <div data-testid="calendar" className="calendar">
@@ -154,59 +199,75 @@ export function Calendar(): ReactNode {
          </button>
        </div>

-        <div className="calendar__grid">
+        <div className={`calendar__grid${showWeekNumbers ? ' calendar__grid--with-week-numbers' : ''}`}>
+          {showWeekNumbers && <div className="calendar__week-number-header" />}
          {['Mån', 'Tis', 'Ons', 'Tor', 'Fre', 'Lör', 'Sön'].map((day) => (
            <div key={day} className="calendar__weekday">
              {day}
            </div>
          ))}

-          {weeks.map((week, weekIdx) =>
-            week.map((date, dayIdx) => {
-              const events = getEventsForDate(date)
-              const isCurrentMonth = new Date(date).getMonth() === month
-              const isToday = date === getTodayString()
-              return (
-                <CalendarDay
-                  key={`${weekIdx}-${dayIdx}`}
-                  date={date}
-                  events={events}
-                  isCurrentMonth={isCurrentMonth}
-                  isToday={isToday}
-                  onClick={isCurrentMonth ? () => handleDayClick(date) : undefined}
-                />
-              )
-            })
-          )}
+          {weeks.map((week, weekIdx) => {
+            const firstDate = week[0]
+            const weekMonth = firstDate ? new Date(firstDate + 'T00:00:00Z').getMonth() : month
+            return (
+              <CalendarWeek
+                key={weekIdx}
+                weekDates={week}
+                plannedDays={plannedDays ?? []}
+                selectedDates={selectedDates}
+                parentName={parentName ?? 'Du'}
+                personalDataUuid={personalDataUuid ?? ''}
+                isCurrentMonth={weekMonth === month}
+                showWeekNumbers={showWeekNumbers}
+                onDayClick={handleDayClick}
+                onPointerDown={handlePointerDown}
+                onPointerEnter={handlePointerEnter}
+              />
+            )
+          })}
        </div>

        <div className="calendar__legend">
          <h3>Legend</h3>
          <div className="calendar__legend-items">
            <div className="calendar__legend-item">
-              <CalendarEvent leaveType="Vacation" color={getColorForType('vacation')} />
+              <span className="calendar__legend-swatch" style={{ backgroundColor: getColorForType('vacation') }} />
+              <span>Vacation</span>
            </div>
            <div className="calendar__legend-item">
-              <CalendarEvent leaveType="Sick" color={getColorForType('sjukpenning')} />
+              <span className="calendar__legend-swatch" style={{ backgroundColor: getColorForType('sjukpenning') }} />
+              <span>Sick Leave</span>
            </div>
            <div className="calendar__legend-item">
-              <CalendarEvent leaveType="Parental" color={getColorForType('lagsta')} />
+              <span className="calendar__legend-swatch" style={{ backgroundColor: getColorForType('lagsta') }} />
+              <span>Parental</span>
+            </div>
+            <div className="calendar__legend-item">
+              <span className="calendar__legend-swatch calendar__legend-swatch--dubbeldag">2×</span>
+              <span>Double day</span>
            </div>
          </div>
        </div>

-        {selectedDate && (
+        {firstSelectedDate && (
          <PlannedDayModal
-            date={selectedDate}
+            date={firstSelectedDate}
            isOpen={isModalOpen}
-            existingDay={getExistingDay(selectedDate) ?? null}
-            parents={[{ id: personalDataUuid ?? '', name: 'Current Parent' }]}
+            existingDay={isRangeMode ? null : getExistingDay(firstSelectedDate) ?? null}
+            parents={[{ id: personalDataUuid ?? '', name: parentName ?? 'Du' }]}
            selectedParentId={personalDataUuid ?? ''}
            onSave={handleSavePlannedDay}
-            onDelete={getExistingDay(selectedDate) ? handleDeletePlannedDay : undefined}
-            onClose={() => setIsModalOpen(false)}
+            onDelete={!isRangeMode && getExistingDay(firstSelectedDate) ? handleDeletePlannedDay : undefined}
+            onClose={() => {
+              setIsModalOpen(false)
+              setSelectedDates(new Set())
+            }}
            isSaving={isSaving}
            error={modalError}
+            isRangeMode={isRangeMode}
+            dayCount={selectedDates.size}
+            defaultDayType={defaultLeaveType}
          />
        )}
      </div>
@@ -220,16 +281,3 @@ function formatDate(date: Date): string {
  const day = String(date.getDate()).padStart(2, '0')
  return `${year}-${month}-${day}`
 }
-
-function getTodayString(): string {
-  return formatDate(new Date())
-}
-
-function getColorForType(type: string): string {
-  const colorMap: Record<string, string> = {
-    vacation: '#4CAF50',
-    sjukpenning: '#FF9800',
-    lagsta: '#2196F3',
-  }
-  return colorMap[type] ?? '#9E9E9E'
-}
@@ -1,6 +1,6 @@
 import { ReactNode, useState, useEffect } from 'react'
 import { useWorkspace } from '@/context'
-import { useVacationDays, useBreakPeriods } from '@/hooks'
+import { useVacationDays, useBreakPeriods, useShowWeekNumbers } from '@/hooks'
 import * as api from '@/services/api'
 import { Layout } from '@/components/layout/Layout'
 import { LoadingSpinner } from '@/components/common/LoadingSpinner'
@@ -16,6 +16,7 @@ export function Settings(): ReactNode {
  const { data: breakPeriods, isLoading: bpLoading, add: addBreakPeriod, remove: removeBreakPeriod } = useBreakPeriods(
    workspace?.id ?? null
  )
+  const [showWeekNumbers, setShowWeekNumbers] = useShowWeekNumbers()

  const [childBirthDate, setChildBirthDate] = useState('')
  const [parentData, setParentData] = useState({ salaryType: '', employmentStatus: '' })
@@ -284,6 +285,19 @@ export function Settings(): ReactNode {
          />
        </section>

+        <section className="settings-page__section">
+          <h2>Calendar</h2>
+          <label style={{ display: 'flex', alignItems: 'center', gap: '8px', cursor: 'pointer' }}>
+            <input
+              type="checkbox"
+              checked={showWeekNumbers}
+              onChange={(e) => setShowWeekNumbers(e.target.checked)}
+              data-testid="show-week-numbers-checkbox"
+            />
+            <span>Visa veckonummer</span>
+          </label>
+        </section>
+
        <section className="settings-page__section">
          <h2>Partner</h2>
          <p>Add a partner to plan parental leave together.</p>
@@ -114,6 +114,11 @@
  font-size: 12px;
 }

+.calendar-day--selected {
+  background-color: #e3f2fd;
+  border-color: #0066cc;
+}
+
 .calendar-day__events {
  display: flex;
  flex-wrap: wrap;
@@ -128,6 +133,71 @@
  flex-shrink: 0;
 }

+.calendar-week {
+  position: relative;
+}
+
+.calendar-week__day-cell {
+  display: flex;
+  flex-direction: column;
+  position: relative;
+}
+
+.calendar-week__days-grid {
+  display: contents;
+}
+
+.calendar-week__day-bars {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  padding: 0 2px;
+}
+
+.calendar-bar {
+  display: flex;
+  align-items: center;
+  padding: 4px 8px;
+  border-radius: 3px;
+  font-size: 12px;
+  color: #fff;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.calendar-event {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  width: 100%;
+  background: none !important;
+}
+
+.calendar-event__label {
+  font-size: 12px;
+  font-weight: 500;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: inherit;
+}
+
+.calendar-event__badge {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 18px;
+  height: 18px;
+  padding: 0 3px;
+  background-color: rgba(255, 255, 255, 0.3);
+  border-radius: 2px;
+  font-size: 10px;
+  font-weight: bold;
+  flex-shrink: 0;
+}
+
 .calendar__legend {
  padding: 16px;
  background-color: #f9f9f9;
@@ -144,7 +214,7 @@

 .calendar__legend-items {
  display: flex;
-  gap: 16px;
+  gap: 24px;
  flex-wrap: wrap;
 }

@@ -156,9 +226,51 @@
  color: #666;
 }

-.calendar__legend-item .calendar-event {
-  width: 12px !important;
-  height: 12px !important;
-  min-width: 12px;
+.calendar__legend-swatch {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 16px;
+  height: 16px;
+  border-radius: 2px;
  flex-shrink: 0;
+  font-size: 11px;
+  font-weight: bold;
+  color: #fff;
+}
+
+.calendar__legend-swatch--dubbeldag {
+  background-color: rgba(0, 0, 0, 0.2);
+  border: 1px solid #999;
+  color: #333;
+}
+
+.calendar__grid--with-week-numbers {
+  grid-template-columns: 50px repeat(7, 1fr);
+}
+
+.calendar__week-number-header {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 12px 8px;
+  font-weight: 600;
+  font-size: 12px;
+  color: #999;
+}
+
+.calendar__week-number {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 8px;
+  font-weight: 600;
+  font-size: 11px;
+  color: #999;
+  border-right: 1px solid #e0e0e0;
+  background-color: #fafafa;
+}
+
+.calendar__week-number-text {
+  display: block;
 }