feat: start of week

e-zz · Mar 16, 2024 · d48900e · d48900e
1 parent 904ec34
commit d48900e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/Agenda3/components/calendar/Calendar.tsx b/src/Agenda3/components/calendar/Calendar.tsx
@@ -41,6 +41,7 @@ const Calendar = ({ onCalendarTitleChange }: CalendarProps, ref) => {
   const { updateEntity } = useAgendaEntities()
   const tasksWithStart = useAtomValue(tasksWithStartAtom)
   const settings = useAtomValue(settingsAtom)
+  const startingDay = settings.general?.startOfWeek
   const groupType = settings.selectedFilters?.length ? 'filter' : 'page'
   const showTasks = tasksWithStart?.filter((task) =>
     settings.viewOptions?.hideCompleted ? task.status === 'todo' : true,
@@ -182,7 +183,7 @@ const Calendar = ({ onCalendarTitleChange }: CalendarProps, ref) => {
         weekNumbers
         weekNumberContent={({ num, date }) => <WeekNumber weekNumber={num} date={date} />}
         defaultTimedEventDuration="00:30"
-        firstDay={1}
+        firstDay={Number(startingDay)}
         fixedWeekCount={false}
         ref={calendarRef}
         height="100%"

diff --git a/src/Agenda3/components/modals/SettingsModal/GeneralSettingsForm.tsx b/src/Agenda3/components/modals/SettingsModal/GeneralSettingsForm.tsx
@@ -44,6 +44,24 @@ const GeneralSettingsForm = () => {
             ]}
           />
         </div>
+        <div className="mt-4">
+          <div className="text-gray-500">Start of Week</div>
+          <Select
+            placeholder="Select Start of Week"
+            className="w-[300px]"
+            value={settings.general?.startOfWeek}
+            onChange={(e) => onChange('general.startOfWeek', e)}
+            options={[
+              { label: 'Sun', value: '0' },
+              { label: 'Mon', value: '1' },
+              { label: 'Tue', value: '2' },
+              { label: 'Wed', value: '3' },
+              { label: 'Thu', value: '4' },
+              { label: 'Fri', value: '5' },
+              { label: 'Sat', value: '6' },
+            ]}
+          />
+        </div>
       </div>
     </>
   )

diff --git a/src/Agenda3/models/settings.ts b/src/Agenda3/models/settings.ts
@@ -6,6 +6,7 @@ export type Settings = {
   general?: {
     useJournalDayAsSchedule?: boolean
     language?: Language
+    startOfWeek?: string
   }
   ics?: {
     repo?: string