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

enhanced ui and layout

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/people/delete.blade.php
+12 -7
View File
@@ -3,20 +3,25 @@
@section('title', 'Person löschen')
@section('subnav')
<a href='{{ url()->previous() }}'>Zurück</a>
<li class="nav-item">
<a href="{{ url()->previous() }}" class="btn btn-outline-primary">Zurück</a>
</li>
@endsection
@section('content')
<form action='/people/{{ $person->id }}' method='post'>
<form action='/people/{{ $person->id }}' method='post' class="mt-4 text-center">
{{ method_field('delete') }}
{{ csrf_field() }}
@if ($person->isEven())
<p>Soll <b>{{ $person->fullName() }}</b> wirklich gelöscht werden?</p>
<button type="submit" id="submit">Ja</button>
<div class="alert alert-danger">
<p>Soll <b>{{ $person->fullName() }}</b> wirklich gelöscht werden?</p>
<button type="submit" id="submit">Ja</button>
</div>
@else
<p><b>{{ $person->fullName() }}</b> kann nicht gelöscht werden, da es noch
offene Forderungen oder Verbindlichkeiten gibt.</p>
<div class="alert alert-warning">
<b>{{ $person->fullName() }}</b> kann nicht gelöscht werden, da es noch
offene Forderungen oder Verbindlichkeiten gibt.
</div>
@endif
</form>
@endsection
resources/views/people/index.blade.php
+25 -19
View File
@@ -3,28 +3,32 @@
@section('title', 'Personen')
@section('subnav')
<a href='/people/create'>Neue Person</a>
<li class="nav-item ml-auto">
<a href='/people/create' class="btn btn-outline-success">Neue Person</a>
</li>
@endsection
@section('content')
<h2>@yield('title')</h2>
<table border='1'>
<tr>
<th>ID</th>
<th>Titel</th>
<th>Name / Firma</th>
<th>Vorname</th>
<th>Straße</th>
<th>PLZ</th>
<th>Ort</th>
<th>E-Mail</th>
<th>Handy</th>
<th>Telefon</th>
<th>Aktionen</th>
</tr>
<table id="datatable" class="table table-striped table-bordered table-hover">
<thead>
<tr>
<th scope="col">ID</th>
<th scope="col">Titel</th>
<th scope="col">Name / Firma</th>
<th scope="col">Vorname</th>
<th scope="col">Straße</th>
<th scope="col">PLZ</th>
<th scope="col">Ort</th>
<th scope="col">E-Mail</th>
<th scope="col">Handy</th>
<th scope="col">Telefon</th>
<th scope="col" data-orderable="false">Aktionen</th>
</tr>
</thead>
@foreach ($people as $person)
<tr>
<td>{{ $person->id }}</td>
<th scope="row">{{ $person->id }}</td>
<td>{{ $person->title }}</td>
<td>{{ $person->name_or_company }}</td>
<td>{{ $person->surname }}</td>
@@ -35,9 +39,11 @@
<td>{{ $person->mobile }}</td>
<td>{{ $person->phone }}</td>
<td>
<a href='/people/{{ $person->id }}'>Anzeigen</a><br />
<a href='/people/{{ $person->id }}/edit'>Bearbeiten</a><br />
<a href='/people/{{ $person->id }}/delete'>Löschen</a>
<div class="btn-group" role="group" aria-label="Basic example">
<a href='/people/{{ $person->id }}' class="btn btn-primary"><i class="fas fa-eye"></i></a>
<a href='/people/{{ $person->id }}/edit' class="btn btn-success"><i class="fas fa-edit"></i></a>
<a href='/people/{{ $person->id }}/delete' class="btn btn-danger"><i class="fas fa-trash"></i></a>
</div>
</td>
</tr>
@endforeach
resources/views/people/show.blade.php
+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