diff --git a/app/Http/Controllers/Api/V1/TimeEntryController.php b/app/Http/Controllers/Api/V1/TimeEntryController.php index cd3039cb..9bfd6025 100644 --- a/app/Http/Controllers/Api/V1/TimeEntryController.php +++ b/app/Http/Controllers/Api/V1/TimeEntryController.php @@ -419,6 +419,7 @@ class TimeEntryController extends Controller 'currency' => $currency, 'group' => $group, 'subGroup' => $subGroup, + 'timezone' => $timezone, 'start' => $request->getStart()->timezone($timezone), 'end' => $request->getEnd()->timezone($timezone), 'debug' => $debug, diff --git a/resources/views/reports/time-entry-aggregate/pdf.blade.php b/resources/views/reports/time-entry-aggregate/pdf.blade.php index 47c21905..01d4fcdb 100644 --- a/resources/views/reports/time-entry-aggregate/pdf.blade.php +++ b/resources/views/reports/time-entry-aggregate/pdf.blade.php @@ -139,7 +139,7 @@

Report

- {{ $start->format('d.m.Y') }} - {{ $end->format('d.m.Y') }}

+ {{ $start->timezone($timezone)->format('d.m.Y') }} - {{ $end->timezone($timezone)->format('d.m.Y') }}

diff --git a/resources/views/reports/time-entry-index/pdf.blade.php b/resources/views/reports/time-entry-index/pdf.blade.php index 62a05455..94e3f1f0 100644 --- a/resources/views/reports/time-entry-index/pdf.blade.php +++ b/resources/views/reports/time-entry-index/pdf.blade.php @@ -130,7 +130,7 @@

Detailed Report

- {{ $start->format('d.m.Y') }} - {{ $end->format('d.m.Y') }}

+ {{ $start->timezone($timezone)->format('d.m.Y') }} - {{ $end->timezone($timezone)->format('d.m.Y') }}

@@ -179,13 +179,13 @@ {{ $timeEntry->user->name }} - @if($timeEntry->start->format('Y-m-d') === $timeEntry->end->format('Y-m-d')) - {{ $timeEntry->start->format('Y-m-d') }} + @if($timeEntry->start->timezone($timezone)->format('Y-m-d') === $timeEntry->end->timezone($timezone)->format('Y-m-d')) + {{ $timeEntry->start->timezone($timezone)->format('Y-m-d') }} @else - {{ $timeEntry->start->format('Y-m-d') }} -
{{ $timeEntry->end->format('Y-m-d') }} + {{ $timeEntry->start->timezone($timezone)->format('Y-m-d') }} -
{{ $timeEntry->end->timezone($timezone)->format('Y-m-d') }} @endif
- {{ $timeEntry->start->format('H:i:s') }} - {{ $timeEntry->end->format('H:i:s') }} + {{ $timeEntry->start->timezone($timezone)->format('H:i:s') }} - {{ $timeEntry->end->timezone($timezone)->format('H:i:s') }} {{ $interval->format($timeEntry->getDuration()) }}