enhanced ui and layout

This commit is contained in:
vagrant
2018-10-14 14:59:48 +00:00
parent b669cab4a7
commit e8c5ffe502
16 changed files with 376 additions and 259 deletions
+21 -19
View File
@@ -5,14 +5,16 @@
@endsection
@section('subnav')
<a href='/people'>Zurück</a>
<a href='/people/{{ $person->id }}/edit'>Bearbeiten</a>
<li class="nav-item">
<a href='/people' class="btn btn-outline-secondary">Zurück</a>
<a href='/people/{{ $person->id }}/edit' class="btn btn-outline-primary">Bearbeiten</a>
</li>
@endsection
@section('content')
<h2>@yield('title')</h2>
<h2>Stammdaten</h2>
<table border='1'>
<table class='table table-bordered table-striped'>
<tr>
<td>ID</td>
<td>{{ $person->id }}</td>
@@ -58,7 +60,7 @@
<td>{{ formatDate($person->date_of_birth) }}</td>
</tr>
</table>
@if ($person->title != 'Firma')
<h2>Mitgliederdaten</h2>
@if ($person->wasMember())
@@ -67,7 +69,7 @@
<th>Eintrittsdatum</th>
<th>Austrittsdatum</th>
</tr>
@foreach ($person->memberStates as $memberState)
<tr>
<td>{{ formatDate($memberState->joining_date) }}</td>
@@ -75,20 +77,20 @@
</tr>
@endforeach
</table>
@if ($person->isMember())
<p>{{ $person->fullName() }} ist aktives Mitglied.</p>
@endif
<p>Gesamtmitgliedszeit: {{ formatAmount($person->activeTime(),
false, true) }} Jahre.</p>
@else
<p>{{ $person->fullName() }} war nie Mitglied.</p>
@endif
@endif
<h2>Konto<h2>
<table border='1'>
<table class='table table-bordered table-striped'>
<tr>
<th>&nbsp;</th>
<th>Datum</th>
@@ -98,22 +100,22 @@
<th>Differenz</th>
</tr>
@foreach ($person->targets as $target)
<tr>
<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>
<tr class="table-secondary">
<td></td>
<th>{{ formatDate($target->date) }}</th>
<th>{{ $target->reference }}</th>
<th align='right'>{!! formatAmount($target->signedAmount()) !!}</th>
<th align='right'>{!! formatAmount($target->actualsSum()) !!}</th>
<th align='right'>{!! formatAmount($target->difference()) !!}</th>
<tr>
@foreach ($target->actuals as $actual)
<tr>
<td></>
<td></td>
<td>{{ formatDate($actual->date()) }}</td>
<td>{{ $actual->reference }}</td>
<td></td>
<td align='right'>{!! formatAmount($actual->signedAmount()) !!}</td>
<td></td>
<td align='right'>{!! formatAmount($actual->signedAmount()) !!}</td>
<td></td>
</tr>
@endforeach
@endforeach