fix break calculation issue (#66)

KatjaGlassConsulting · Jan 18, 2025 · c36e47f · c36e47f
1 parent 79aa2e5
commit c36e47f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.1.4
+
+- fix: Break issue calculations had not been correct, when time entries had been in misorder, e.g. entered later times before earlier times, this is now fixed.
+
 ## 2.1.3
 
 - fix: Return value had not been provided - using working hours had previously thrown an error

diff --git a/Controller/WeekReportController.php b/Controller/WeekReportController.php
@@ -386,6 +386,7 @@ private function getTimesheets(?User $selectedUser, DateTime $start, DateTime $e
         $dateRange->setEnd($end);
         $timesheetQuery->setDateRange($dateRange);
         $timesheetQuery->setOrderBy('date');
+        $timesheetQuery->setOrderBy('begin');
         $timesheetQuery->setOrder(BaseQuery::ORDER_ASC);
 
         $timesheets = $this->timesheetRepository->getTimesheetsForQuery($timesheetQuery);