diff --git a/resources/js/packages/ui/src/Tag/TagCreateModal.vue b/resources/js/packages/ui/src/Tag/TagCreateModal.vue index 4bee91ca..b63e05e1 100644 --- a/resources/js/packages/ui/src/Tag/TagCreateModal.vue +++ b/resources/js/packages/ui/src/Tag/TagCreateModal.vue @@ -21,6 +21,7 @@ async function submit() { const newTag = props.createTag(tag.value.name); if (newTag !== undefined) { show.value = false; + tag.value.name = ''; } } diff --git a/resources/views/reports/time-entry-index/pdf.blade.php b/resources/views/reports/time-entry-index/pdf.blade.php index 9463604b..aea12af6 100644 --- a/resources/views/reports/time-entry-index/pdf.blade.php +++ b/resources/views/reports/time-entry-index/pdf.blade.php @@ -106,7 +106,7 @@ color: #18181b; } - table td, table th{ + table td, table th { font-size: 12px; } @@ -127,64 +127,77 @@ -
-

Detailed Report

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

-
+
+

Detailed Report

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

-
-
-
-
Duration
-
{{ $interval->format(CarbonInterval::seconds($aggregatedData['seconds'])) }}
-
-
-
Total cost
-
{{ Money::of(BigDecimal::ofUnscaledValue($aggregatedData['cost'], 2)->__toString(), $currency)->formatTo('en_US') }}
-
- +
+
+
+
+
Duration
+
{{ $interval->format(CarbonInterval::seconds($aggregatedData['seconds'])) }}
+
+
+
Total cost
+
{{ Money::of(BigDecimal::ofUnscaledValue($aggregatedData['cost'], 2)->__toString(), $currency)->formatTo('en_US') }}
-
- - + + +
+
+ + + + + + + + + + + + @foreach($timeEntries as $timeEntry) - - - - - - - - - + + + + + + - - - @foreach($timeEntries as $timeEntry) - - - - - - - - - - - - @endforeach - -
Time EntryUserTimeDurationBillableTags
DescriptionTaskProjectClientUserTimeDurationBillableTags + {{ $timeEntry->description === '' ? '-' : $timeEntry->description }}
+ @if($timeEntry->task?->name) + Task: {{ $timeEntry->task?->name ?? '-' }}
+ @endif + @if($timeEntry->project?->name) + Project: {{ $timeEntry->project?->name }}
+ @endif + @if($timeEntry->client?->name) + + Client: + {{ $timeEntry->client?->name }}
+ @endif + 		{{ $timeEntry->user->name }} + @if($timeEntry->start->format('Y-m-d') === $timeEntry->end->format('Y-m-d')) + {{ $timeEntry->start->format('Y-m-d') }} + @else + {{ $timeEntry->start->format('Y-m-d') }} -
{{ $timeEntry->end->format('Y-m-d') }} + @endif +
+ {{ $timeEntry->start->format('H:i:s') }} - {{ $timeEntry->end->format('H:i:s') }} + 		+ {{ $interval->format($timeEntry->getDuration()) }} + {{ $timeEntry->billable ? 'Yes' : 'No' }}{{ count($timeEntry->tagsRelation) === 0 ? '-' : $timeEntry->tagsRelation->implode('name', ', ') }}
{{ $timeEntry->description === '' ? '-' : $timeEntry->description }}{{ $timeEntry->task?->name ?? '-' }}{{ $timeEntry->project?->name ?? '-' }}{{ $timeEntry->client?->name ?? '-' }}{{ $timeEntry->user->name }} - {{ $timeEntry->start->format('Y-m-d H:i:s') }} -
{{ $timeEntry->end->format('Y-m-d H:i:s') }} - 		- {{ $interval->format($timeEntry->getDuration()) }} - {{ $timeEntry->billable ? 'Yes' : 'No' }}{{ count($timeEntry->tagsRelation) === 0 ? '-' : $timeEntry->tagsRelation->implode('name', ', ') }}
-
+ @endforeach + +
+