[enhancement] Align initial filters to be the current week

Leantime · May 2, 2024 · fc6cf2f · fc6cf2f
1 parent ab40097
commit fc6cf2f
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 5 deletions.
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
diff --git a/app/Domain/Timesheets/Controllers/ShowMyList.php b/app/Domain/Timesheets/Controllers/ShowMyList.php
@@ -49,8 +49,8 @@ public function run(): Response
         // The front end javascript is hardcode to start the week on mondays, so we use that here too.
 
         //Get start of the week in current users timezone and then switch to UTC
-        $dateFrom = dtHelper()->userNow()->startOfMonth()->setToDbTimezone();
-        $dateTo = dtHelper()->userNow()->endOfMonth()->setToDbTimezone();
+        $dateFrom = dtHelper()->userNow()->startOfWeek(CarbonInterface::MONDAY)->setToDbTimezone();
+        $dateTo = dtHelper()->userNow()->endOfWeek()->setToDbTimezone();
 
         if (!empty($_POST['dateFrom'])) {
             $dateFrom = dtHelper()->parseUserDateTime($_POST['dateFrom'])->setToDbTimezone();

diff --git a/package-lock.json b/package-lock.json