adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-17 04:32:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed timezone issue in PDF reports

Browse Source
This commit is contained in:
Constantin Graf
2025-04-02 12:55:43 +02:00
committed by Constantin Graf
parent bc9b104c3f
commit 4fb744db1d
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/Api/V1/TimeEntryController.php
View File

@@ -419,6 +419,7 @@ class TimeEntryController extends Controller
'currency' => $currency, 'currency' => $currency,
'group' => $group, 'group' => $group,
'subGroup' => $subGroup, 'subGroup' => $subGroup,
'timezone' => $timezone,
'start' => $request->getStart()->timezone($timezone), 'start' => $request->getStart()->timezone($timezone),
'end' => $request->getEnd()->timezone($timezone), 'end' => $request->getEnd()->timezone($timezone),
'debug' => $debug, 'debug' => $debug,

2
resources/views/reports/time-entry-aggregate/pdf.blade.php
View File

@@ -139,7 +139,7 @@
<div> <div>
<p style="font-size: 32px; font-weight: 600; margin-bottom: 5px;">Report</p> <p style="font-size: 32px; font-weight: 600; margin-bottom: 5px;">Report</p>
<div style="font-size: 16px; font-weight: 600; color: #71717a;"> <div style="font-size: 16px; font-weight: 600; color: #71717a;">
<span>{{ $start->format('d.m.Y') }} - {{ $end->format('d.m.Y') }}</span><br><br> <span>{{ $start->timezone($timezone)->format('d.m.Y') }} - {{ $end->timezone($timezone)->format('d.m.Y') }}</span><br><br>
</div> </div>
</div> </div>

10
resources/views/reports/time-entry-index/pdf.blade.php
View File

@@ -130,7 +130,7 @@
<div> <div>
<p style="font-size: 32px; font-weight: 600; margin-bottom: 5px;">Detailed Report</p> <p style="font-size: 32px; font-weight: 600; margin-bottom: 5px;">Detailed Report</p>
<div style="font-size: 16px; font-weight: 600; color: #71717a;"> <div style="font-size: 16px; font-weight: 600; color: #71717a;">
<span>{{ $start->format('d.m.Y') }} - {{ $end->format('d.m.Y') }}</span><br><br> <span>{{ $start->timezone($timezone)->format('d.m.Y') }} - {{ $end->timezone($timezone)->format('d.m.Y') }}</span><br><br>
</div> </div>
</div> </div>
<div class="table-wrapper"> <div class="table-wrapper">
@@ -179,13 +179,13 @@
</td> </td>
<td style="overflow-wrap: break-word; min-width: 75px;">{{ $timeEntry->user->name }}</td> <td style="overflow-wrap: break-word; min-width: 75px;">{{ $timeEntry->user->name }}</td>
<td style="overflow-wrap: break-word; min-width: 150px; text-align: center;"> <td style="overflow-wrap: break-word; min-width: 150px; text-align: center;">
@if($timeEntry->start->format('Y-m-d') === $timeEntry->end->format('Y-m-d')) @if($timeEntry->start->timezone($timezone)->format('Y-m-d') === $timeEntry->end->timezone($timezone)->format('Y-m-d'))
{{ $timeEntry->start->format('Y-m-d') }} {{ $timeEntry->start->timezone($timezone)->format('Y-m-d') }}
@else @else
{{ $timeEntry->start->format('Y-m-d') }} - <br> {{ $timeEntry->end->format('Y-m-d') }} {{ $timeEntry->start->timezone($timezone)->format('Y-m-d') }} - <br> {{ $timeEntry->end->timezone($timezone)->format('Y-m-d') }}
@endif @endif
<br> <br>
{{ $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') }}
</td> </td>
<td style="overflow-wrap: break-word; min-width: 75px;"> <td style="overflow-wrap: break-word; min-width: 75px;">
{{ $interval->format($timeEntry->getDuration()) }} {{ $interval->format($timeEntry->getDuration()) }}