From e80481f86076cadaa3835aba6b7c56328fd4f953 Mon Sep 17 00:00:00 2001
From: Lukas Halbritter <halbritl@informatik.uni-freiburg.de>
Date: Mon, 1 Oct 2018 17:20:19 +0200
Subject: [PATCH] The views bookings.index and people.show now use the
 formatDate and formatAmount helpers.

---
 resources/views/bookings/index.blade.php | 18 +++++++++---------
 resources/views/people/show.blade.php    | 21 +++++++++++----------
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/resources/views/bookings/index.blade.php b/resources/views/bookings/index.blade.php
index 39a05a2..9230bdc 100644
--- a/resources/views/bookings/index.blade.php
+++ b/resources/views/bookings/index.blade.php
@@ -33,7 +33,7 @@
                 <td>Saldo</td>
                 <td></td>
                 <td></td>
-                <td>{{ formatAmount($sums[$month - 1]['balance']) }}</td>
+                <td>{!! formatAmount($sums[$month - 1]['balance']) !!}</td>
                 <td></td>
                 <td></td>
             </tr>
@@ -45,17 +45,17 @@
                         @endif
                     </td>
                     <td>{{ $booking->id }}</td>
-                    <td>{{ $booking->date }}</td>
+                    <td>{{ formatDate($booking->date) }}</td>
                     <td>{{ $booking->reference }}</td>
                     <td>{{ $booking->person_or_company }}</td>
                     <td align='right'>
                         @if ($booking->signedAmount() < 0)
-                            {{ formatAmount($booking->signedAmount()) }}
+                            {!! formatAmount($booking->signedAmount()) !!}
                         @endif
                     </td>
                     <td align='right'>
                         @if ($booking->signedAmount() >= 0)
-                            {{ formatAmount($booking->signedAmount()) }}
+                            {!! formatAmount($booking->signedAmount()) !!}
                         @endif
                     </td>
                     <td>
@@ -80,12 +80,12 @@
                             <td></td>
                             <td align='right'>
                                 @if ($subBooking->signedAmount() < 0)
-                                    {{ formatAmount($subBooking->signedAmount()) }}
+                                    {!! formatAmount($subBooking->signedAmount()) !!}
                                 @endif
                             </td>
                             <td align='right'>
                                 @if ($subBooking->signedAmount() >= 0)
-                                    {{ formatAmount($subBooking->signedAmount()) }}
+                                    {!! formatAmount($subBooking->signedAmount()) !!}
                                 @endif
                             </td>
                             <td>
@@ -107,8 +107,8 @@
                 </td>
                 <td>Monatsabschluss</td>
                 <td></td>
-                <td>{{ formatAmount($sums[$month]['expeditures']) }}</td>
-                <td>{{ formatAmount($sums[$month]['incomes']) }}</td>
+                <td>{!! formatAmount($sums[$month]['expeditures']) !!}</td>
+                <td>{!! formatAmount($sums[$month]['incomes']) !!}</td>
                 <td></td>
                 <td></td>
             </tr>
@@ -120,7 +120,7 @@
                 </td>
                 <td>Saldo</td>
                 <td></td>
-                <td>{{ formatAmount($sums[$month]['balance']) }}</td>
+                <td>{!! formatAmount($sums[$month]['balance']) !!}</td>
                 <td></td>
                 <td></td>
                 <td></td>
diff --git a/resources/views/people/show.blade.php b/resources/views/people/show.blade.php
index d8024f1..abcd3ad 100644
--- a/resources/views/people/show.blade.php
+++ b/resources/views/people/show.blade.php
@@ -55,7 +55,7 @@
         </tr>
         <tr>
             <td>Geburtstag</td>
-            <td>{{ $person->date_of_birth }}</td>
+            <td>{{ formatDate($person->date_of_birth) }}</td>
         </tr>
     </table>
     
@@ -70,8 +70,8 @@
     
                 @foreach ($person->memberStates as $memberState)
                     <tr>
-                        <td>{{ $memberState->joining_date }}</td>
-                        <td>{{ $memberState->leaving_date }}</td>
+                        <td>{{ formatDate($memberState->joining_date) }}</td>
+                        <td>{{ formatDate($memberState->leaving_date) }}</td>
                     </tr>
                 @endforeach
             </table>
@@ -80,7 +80,8 @@
                 <p>{{ $person->fullName() }} ist aktives Mitglied.</p>
             @endif
     
-            <p>Gesamtmitgliedszeit: {{ formatAmount($person->activeTime()) }} Jahre.</p>
+            <p>Gesamtmitgliedszeit: {{ formatAmount($person->activeTime(),
+            false, true) }} Jahre.</p>
         @else
             <p>{{ $person->fullName() }} war nie Mitglied.</p>
         @endif
@@ -99,19 +100,19 @@
         @foreach ($person->targets as $target)
             <tr>
                 <td>></>
-                <td>{{ $target->date }}</td>
+                <td>{{ formatDate($target->date) }}</td>
                 <td>{{ $target->reference }}</td>
-                <td align='right'>{{ formatAmount($target->signedAmount()) }}</td>
-                <td align='right'>{{ formatAmount($target->actualsSum()) }}</td> 
-                <td align='right'>{{ formatAmount($target->difference()) }}</td> 
+                <td align='right'>{!! formatAmount($target->signedAmount()) !!}</td>
+                <td align='right'>{!! formatAmount($target->actualsSum()) !!}</td> 
+                <td align='right'>{!! formatAmount($target->difference()) !!}</td> 
             <tr>
             @foreach ($target->actuals as $actual)
                 <tr>
                     <td></>
-                    <td>{{ $actual->date() }}</td>
+                    <td>{{ formatDate($actual->date()) }}</td>
                     <td>{{ $actual->reference }}</td>
                     <td></td>
-                    <td align='right'>{{ formatAmount($actual->signedAmount()) }}</td> 
+                    <td align='right'>{!! formatAmount($actual->signedAmount()) !!}</td> 
                     <td></td> 
                 </tr>
             @endforeach