diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml index dc52e2c72..8530328b0 100644 --- a/.idea/leantime-oss.iml +++ b/.idea/leantime-oss.iml @@ -4,6 +4,8 @@ + + @@ -101,6 +103,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/php.xml b/.idea/php.xml index 77b5878f0..b59f6585c 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -160,6 +160,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml index e352a0ed1..cb4fc8cde 100644 --- a/.idea/phpspec.xml +++ b/.idea/phpspec.xml @@ -32,6 +32,9 @@ + + \ No newline at end of file diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml index eec2c0189..1f89c4b6a 100644 --- a/.idea/phpunit.xml +++ b/.idea/phpunit.xml @@ -3,8 +3,8 @@ diff --git a/app/Domain/Timesheets/Controllers/ShowMyList.php b/app/Domain/Timesheets/Controllers/ShowMyList.php index 7cbfda7d6..141af2757 100644 --- 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 index c91b791e0..50de130fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "leantime", - "version": "3.1.2", + "version": "3.1.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "leantime", - "version": "3.1.2", + "version": "3.1.3", "license": "AGPL-3.0", "dependencies": { "@assuradeurengilde/fontawesome-iconpicker": "^3.2.3",