Fix #63: This/last week selection in Date picker now starts on monday

orthanc-server · Aug 28, 2024 · 3285522 · 3285522
1 parent 8833c01
commit 3285522
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/WebApplication/src/helpers/date-helpers.js b/WebApplication/src/helpers/date-helpers.js
@@ -3,8 +3,8 @@ import { parse, format, endOfMonth, endOfYear, startOfMonth, startOfYear, subMon
 document._datePickerPresetRanges = [
     { tLabel: 'date_picker.today', value: [new Date(), new Date()] },
     { tLabel: 'date_picker.yesterday', value: [subDays(new Date(), 1), subDays(new Date(), 1)] },
-    { tLabel: 'date_picker.this_week', value: [startOfWeek(new Date()), new Date()] },
-    { tLabel: 'date_picker.last_week', value: [startOfWeek(subDays(new Date(), 7)), endOfWeek(subDays(new Date(), 7))] },
+    { tLabel: 'date_picker.this_week', value: [startOfWeek(new Date(), { weekStartsOn: 1 }), new Date()] },
+    { tLabel: 'date_picker.last_week', value: [startOfWeek(subDays(new Date(), 7), { weekStartsOn: 1 }), endOfWeek(subDays(new Date(), 7), { weekStartsOn: 1 })] },
     { tLabel: 'date_picker.this_month', value: [startOfMonth(new Date()), endOfMonth(new Date())] },
     { tLabel: 'date_picker.last_month', value: [startOfMonth(subMonths(new Date(), 1)), endOfMonth(subMonths(new Date(), 1))] },
     { tLabel: 'date_picker.last_12_months', value: [subYears(new Date(), 1), new Date()] },

diff --git a/release-notes.md b/release-notes.md
@@ -4,6 +4,7 @@ Pending changes
 Fixes:
   - Fixed the "UiOptions.EnableApiView" that was not taken into account.  The API View button was always visible.
   - [Issue #65](https://github.com/orthanc-server/orthanc-explorer-2/issues/65) SeriesCount column is empty.
+  - [Issue #63](https://github.com/orthanc-server/orthanc-explorer-2/issues/63) This/last week selection in Date picker now starts on monday.
 
 
 1.6.0 (2024-08-02)