mchalbi/pollux
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

The views bookings.index and people.show now use the formatDate and formatAmount

Browse Source 
helpers.
This commit is contained in:
Lukas Halbritter
2018-10-01 17:20:19 +02:00
parent 1de0126663
commit e80481f860
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/bookings/index.blade.php
+9 -9
View File
@@ -33,7 +33,7 @@
<td>Saldo</td> <td>Saldo</td>
<td></td> <td></td>
<td></td> <td></td>
<td>{{ formatAmount($sums[$month - 1]['balance']) }}</td> <td>{!! formatAmount($sums[$month - 1]['balance']) !!}</td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
@@ -45,17 +45,17 @@
@endif @endif
</td> </td>
<td>{{ $booking->id }}</td> <td>{{ $booking->id }}</td>
<td>{{ $booking->date }}</td> <td>{{ formatDate($booking->date) }}</td>
<td>{{ $booking->reference }}</td> <td>{{ $booking->reference }}</td>
<td>{{ $booking->person_or_company }}</td> <td>{{ $booking->person_or_company }}</td>
<td align='right'> <td align='right'>
@if ($booking->signedAmount() < 0) @if ($booking->signedAmount() < 0)
{{ formatAmount($booking->signedAmount()) }} {!! formatAmount($booking->signedAmount()) !!}
@endif @endif
</td> </td>
<td align='right'> <td align='right'>
@if ($booking->signedAmount() >= 0) @if ($booking->signedAmount() >= 0)
{{ formatAmount($booking->signedAmount()) }} {!! formatAmount($booking->signedAmount()) !!}
@endif @endif
</td> </td>
<td> <td>
@@ -80,12 +80,12 @@
<td></td> <td></td>
<td align='right'> <td align='right'>
@if ($subBooking->signedAmount() < 0) @if ($subBooking->signedAmount() < 0)
{{ formatAmount($subBooking->signedAmount()) }} {!! formatAmount($subBooking->signedAmount()) !!}
@endif @endif
</td> </td>
<td align='right'> <td align='right'>
@if ($subBooking->signedAmount() >= 0) @if ($subBooking->signedAmount() >= 0)
{{ formatAmount($subBooking->signedAmount()) }} {!! formatAmount($subBooking->signedAmount()) !!}
@endif @endif
</td> </td>
<td> <td>
@@ -107,8 +107,8 @@
</td> </td>
<td>Monatsabschluss</td> <td>Monatsabschluss</td>
<td></td> <td></td>
<td>{{ formatAmount($sums[$month]['expeditures']) }}</td> <td>{!! formatAmount($sums[$month]['expeditures']) !!}</td>
<td>{{ formatAmount($sums[$month]['incomes']) }}</td> <td>{!! formatAmount($sums[$month]['incomes']) !!}</td>
<td></td> <td></td>
<td></td> <td></td>
</tr> </tr>
@@ -120,7 +120,7 @@
</td> </td>
<td>Saldo</td> <td>Saldo</td>
<td></td> <td></td>
<td>{{ formatAmount($sums[$month]['balance']) }}</td> <td>{!! formatAmount($sums[$month]['balance']) !!}</td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
resources/views/people/show.blade.php
+11 -10
View File
@@ -55,7 +55,7 @@
</tr> </tr>
<tr> <tr>
<td>Geburtstag</td> <td>Geburtstag</td>
<td>{{ $person->date_of_birth }}</td> <td>{{ formatDate($person->date_of_birth) }}</td>
</tr> </tr>
</table> </table>
@@ -70,8 +70,8 @@
@foreach ($person->memberStates as $memberState) @foreach ($person->memberStates as $memberState)
<tr> <tr>
<td>{{ $memberState->joining_date }}</td> <td>{{ formatDate($memberState->joining_date) }}</td>
<td>{{ $memberState->leaving_date }}</td> <td>{{ formatDate($memberState->leaving_date) }}</td>
</tr> </tr>
@endforeach @endforeach
</table> </table>
@@ -80,7 +80,8 @@
<p>{{ $person->fullName() }} ist aktives Mitglied.</p> <p>{{ $person->fullName() }} ist aktives Mitglied.</p>
@endif @endif
<p>Gesamtmitgliedszeit: {{ formatAmount($person->activeTime()) }} Jahre.</p> <p>Gesamtmitgliedszeit: {{ formatAmount($person->activeTime(),
false, true) }} Jahre.</p>
@else @else
<p>{{ $person->fullName() }} war nie Mitglied.</p> <p>{{ $person->fullName() }} war nie Mitglied.</p>
@endif @endif
@@ -99,19 +100,19 @@
@foreach ($person->targets as $target) @foreach ($person->targets as $target)
<tr> <tr>
<td>></> <td>></>
<td>{{ $target->date }}</td> <td>{{ formatDate($target->date) }}</td>
<td>{{ $target->reference }}</td> <td>{{ $target->reference }}</td>
<td align='right'>{{ formatAmount($target->signedAmount()) }}</td> <td align='right'>{!! formatAmount($target->signedAmount()) !!}</td>
<td align='right'>{{ formatAmount($target->actualsSum()) }}</td> <td align='right'>{!! formatAmount($target->actualsSum()) !!}</td>
<td align='right'>{{ formatAmount($target->difference()) }}</td> <td align='right'>{!! formatAmount($target->difference()) !!}</td>
<tr> <tr>
@foreach ($target->actuals as $actual) @foreach ($target->actuals as $actual)
<tr> <tr>
<td></> <td></>
<td>{{ $actual->date() }}</td> <td>{{ formatDate($actual->date()) }}</td>
<td>{{ $actual->reference }}</td> <td>{{ $actual->reference }}</td>
<td></td> <td></td>
<td align='right'>{{ formatAmount($actual->signedAmount()) }}</td> <td align='right'>{!! formatAmount($actual->signedAmount()) !!}</td>
<td></td> <td></td>
</tr> </tr>
@endforeach @endforeach