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

Added tooltips. Fixed style issues with delete dialogs. Edited bookings index style.

Browse Source
This commit is contained in:
Lukas Halbritter
2019-02-08 13:56:11 +01:00
parent bf0c97db25
commit 5d472dc33b
8 changed files with 164 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/bookings/delete.blade.php
+38 -26
View File
@@ -3,41 +3,53 @@
@section('title', 'Buchung löschen') @section('title', 'Buchung löschen')
@section('subnav') @section('subnav')
<a href='{{ url()->previous() }}'>Zurück</a> <a href='{{ url()->previous() }}' class='btn btn-outline-secondary'>Zurück</a>
@endsection @endsection
@section('content') @section('content')
<h2>@yield('title')</h2> <h2>@yield('title')</h2>
<form action='/bookings/{{ $booking->id }}' method='post'> <form action='/bookings/{{ $booking->id }}' method='post' class='mt-4 text-center'>
{{ method_field('delete') }} {{ method_field('delete') }}
{{ csrf_field() }} {{ csrf_field() }}
<p>Soll folgende Buchung und alle ihre Teilbuchungen wirklich gelöscht <div class='alert alert-danger'>
werden?</p> <p>
Soll folgende Buchung und alle ihre Teilbuchungen wirklich
gelöscht werden?
</p>
<table border='1'> <table class='table'>
<tr>
<th>Datum</th>
<th>Positionen</th>
<th>Person / Firma</th>
<th>Betrag</th>
</tr>
<tr>
<td>{{ $booking->date }}</td>
<td>{{ $booking->reference }}</td>
<td>{{ $booking->person_or_company }}</td>
<td align='right'>{{ formatAmount($booking->signedAmount(), true, true) }}</td>
</tr>
@foreach($booking->subBookings as $subBooking)
<tr> <tr>
<td></td> <th>Datum</th>
<td>{{ $subBooking->reference }}</td> <th>Positionen</th>
<td></td> <th>Person / Firma</th>
<td align='right'>{{ formatAmount($subBooking->signedAmount(), true, true) }}</td> <th>Betrag</th>
</tr> </tr>
@endforeach <tr>
</table> <td>{{ formatDate($booking->date) }}</td>
<td>{{ $booking->reference }}</td>
<td>{{ $booking->person_or_company }}</td>
<td align='right'>
{{
formatAmount($booking->signedAmount(), true, true)
}}
</td>
</tr>
@foreach($booking->subBookings as $subBooking)
<tr>
<td></td>
<td>{{ $subBooking->reference }}</td>
<td></td>
<td align='right'>
{{
formatAmount($subBooking->signedAmount(), true, true)
}}
</td>
</tr>
@endforeach
</table>
<button type="submit" id="submit">Ja</button> <button class='btn btn-primary' type="submit" id="submit">Ja</button>
<a href="{{ url()->previous() }}" class="btn btn-outline-secondary">Nein</a>
</div>
</form> </form>
@endsection @endsection
resources/views/bookings/index.blade.php
+43 -35
View File
@@ -21,8 +21,8 @@
{{ $year + 1 }} <i class="fas fa-chevron-right"></i> {{ $year + 1 }} <i class="fas fa-chevron-right"></i>
</a> </a>
</div> </div>
<table class='table table-striped table-bordered'> <table class='table table-bordered table-hover'>
<tr> <tr class='table-secondary'>
<th>Datum</th> <th>Datum</th>
<th>Positionen</th> <th>Positionen</th>
<th>Person / Firma</th> <th>Person / Firma</th>
@@ -30,7 +30,7 @@
<th>Eingang (H)</th> <th>Eingang (H)</th>
<th>Konto</th> <th>Konto</th>
<th>Projekt</th> <th>Projekt</th>
<th></th> <th>Aktionen</th>
</tr> </tr>
@for ($month = 1; $month <= 12; $month++) @for ($month = 1; $month <= 12; $month++)
@if (( @if ((
@@ -42,15 +42,15 @@
or $firstDate['Y'] == $year or $firstDate['Y'] == $year
and $firstDate['m'] <= $month and $firstDate['m'] <= $month
)) ))
<tr style='color: red; font-weight: bold'> <tr class='table-danger'>
<td>{{ startOfMonth($year, $month) }}</td> <th>{{ startOfMonth($year, $month) }}</th>
<td>Saldo</td> <th>Saldo</th>
<td></td> <th></th>
<td></td> <th></th>
<td>{!! formatAmount($sums[$month - 1]['balance']) !!}</td> <th>{!! formatAmount($sums[$month - 1]['balance']) !!}</th>
<td></td> <th></th>
<td></td> <th></th>
<td></td> <th></th>
</tr> </tr>
@endif @endif
@if (isset($bookings[$month])) @if (isset($bookings[$month]))
@@ -81,10 +81,18 @@
</td> </td>
<td> <td>
<div class='btn-group' role='group' aria-label='Basic example'> <div class='btn-group' role='group' aria-label='Basic example'>
<a href='/bookings/{{ $booking->id }}/edit' class='btn btn-success'> <a href='/bookings/{{ $booking->id }}/edit'
class='btn btn-success'
data-toggle='tooltip'
data-placement='bottom'
title='Bearbeiten'>
<i class='fas fa-edit'></i> <i class='fas fa-edit'></i>
</a> </a>
<a href='/bookings/{{ $booking->id }}/delete' class='btn btn-danger'> <a href='/bookings/{{ $booking->id }}/delete'
class='btn btn-danger'
data-toggle='tooltip'
data-placement='bottom'
title='Löschen'>
<i class="fas fa-trash"></i> <i class="fas fa-trash"></i>
</a> </a>
</div> </div>
@@ -92,7 +100,7 @@
</tr> </tr>
@if (!$booking->isSimple()) @if (!$booking->isSimple())
@foreach ($booking->subBookings as $subBooking) @foreach ($booking->subBookings as $subBooking)
<tr> <tr class='table-secondary'>
<td></td> <td></td>
<td>{{ $subBooking->reference }}</td> <td>{{ $subBooking->reference }}</td>
<td></td> <td></td>
@@ -129,29 +137,29 @@
or $firstDate['Y'] == $year or $firstDate['Y'] == $year
and $firstDate['m'] <= $month and $firstDate['m'] <= $month
)) ))
<tr style='color: #000080; font-weight: bold'> <tr class='table-primary'>
<td> <th>
{{ endOfMonth($year, $month) }} {{ endOfMonth($year, $month) }}
</td> </th>
<td>Monatsabschluss</td> <th>Monatsabschluss</th>
<td></td> <th></th>
<td>{!! formatAmount($sums[$month]['expeditures']) !!}</td> <th>{!! formatAmount($sums[$month]['expeditures']) !!}</th>
<td>{!! formatAmount($sums[$month]['incomes']) !!}</td> <th>{!! formatAmount($sums[$month]['incomes']) !!}</th>
<td></td> <th></th>
<td></td> <th></th>
<td></td> <th></th>
</tr> </tr>
<tr style='color: red; font-weight: bold'> <tr class='table-danger'>
<td> <th>
{{ endOfMonth($year, $month) }} {{ endOfMonth($year, $month) }}
</td> </th>
<td>Saldo</td> <th>Saldo</th>
<td></td> <th></th>
<td>{!! formatAmount($sums[$month]['balance']) !!}</td> <th>{!! formatAmount($sums[$month]['balance']) !!}</th>
<td></td> <th></th>
<td></td> <th></th>
<td></td> <th></th>
<td></td> <th></th>
</tr> </tr>
<tr> <tr>
@for ($i = 0; $i < 8; $i++) @for ($i = 0; $i < 8; $i++)
resources/views/layout/forms/person.blade.php
+19 -3
View File
@@ -2,7 +2,7 @@
@section('subnav') @section('subnav')
<li class="nav-item"> <li class="nav-item">
<a href="{{ url()->previous() }}" class="btn btn-outline-primary">Zurück</a> <a href="{{ url()->previous() }}" class="btn btn-outline-secondary">Zurück</a>
</li> </li>
@endsection @endsection
@@ -129,8 +129,24 @@
{{-- Create empty input field for a new member state record. --}} {{-- Create empty input field for a new member state record. --}}
@if (!$person->isMember()) @if (!$person->isMember())
<tr> <tr>
<td>{{ Form::date('memberState[0][joining_date]') }}</td> <td>
<td>{{ Form::date('memberState[0][leaving_date]') }}</td> {{
Form::date(
'memberState[0][joining_date]',
null,
['class' => 'form-control']
)
}}
</td>
<td>
{{
Form::date(
'memberState[0][leaving_date]',
null,
['class' => 'form-control']
)
}}
</td>
</tr> </tr>
@endif @endif
</table> </table>
resources/views/layout/forms/projects.blade.php
+1 -1
View File
@@ -1,7 +1,7 @@
@extends('layout.master') @extends('layout.master')
@section('subnav') @section('subnav')
<a href='{{ url()->previous() }}' class='btn btn-outline-primary'>Zurück</a> <a href='{{ url()->previous() }}' class='btn btn-outline-secondary'>Zurück</a>
@endsection @endsection
@section('content') @section('content')
resources/views/people/delete.blade.php
+3 -2
View File
@@ -4,7 +4,7 @@
@section('subnav') @section('subnav')
<li class="nav-item"> <li class="nav-item">
<a href="{{ url()->previous() }}" class="btn btn-outline-primary">Zurück</a> <a href="{{ url()->previous() }}" class="btn btn-outline-secondary">Zurück</a>
</li> </li>
@endsection @endsection
@@ -15,7 +15,8 @@
@if ($person->isEven()) @if ($person->isEven())
<div class="alert alert-danger"> <div class="alert alert-danger">
<p>Soll <b>{{ $person->fullName() }}</b> wirklich gelöscht werden?</p> <p>Soll <b>{{ $person->fullName() }}</b> wirklich gelöscht werden?</p>
<button type="submit" id="submit">Ja</button> <button class='btn btn-primary' type="submit" id="submit">Ja</button>
<a href="{{ url()->previous() }}" class="btn btn-outline-secondary">Nein</a>
</div> </div>
@else @else
<div class="alert alert-warning"> <div class="alert alert-warning">
resources/views/personTargets/delete.blade.php
+21 -18
View File
@@ -3,32 +3,35 @@
@section('title', 'Zahlungsverflichtung löschen') @section('title', 'Zahlungsverflichtung löschen')
@section('subnav') @section('subnav')
<a href='{{ url()->previous() }}'>Zurück</a> <a href='{{ url()->previous() }}' class='btn btn-outline-secondary'>Zurück</a>
@endsection @endsection
@section('content') @section('content')
<h2>@yield('title')</h2> <h2>@yield('title')</h2>
<form action='/targets/{{ $personTarget->id }}' method='post'> <form action='/targets/{{ $personTarget->id }}' method='post' class='mt-4 text-center'>
{{ method_field('delete') }} {{ method_field('delete') }}
{{ csrf_field() }} {{ csrf_field() }}
<p>Soll folgende Zahlungsverpflichtung wirklich gelöscht werden?</p> <div class='alert alert-danger'>
<p>Soll folgende Zahlungsverpflichtung wirklich gelöscht werden?</p>
<table border='1'> <table class='table'>
<tr> <tr>
<th>Datum</th> <th>Datum</th>
<th>Position</th> <th>Position</th>
<th>Person / Firma</th> <th>Person / Firma</th>
<th>Betrag</th> <th>Betrag</th>
</tr> </tr>
<tr> <tr>
<td>{{ formatDate($personTarget->date) }}</td> <td>{{ formatDate($personTarget->date) }}</td>
<td>{{ $personTarget->reference }}</td> <td>{{ $personTarget->reference }}</td>
<td>{{ $personTarget->person->fullName() }}</td> <td>{{ $personTarget->person->fullName() }}</td>
<td>{{ $personTarget->signedAmount() }}</td> <td>{{ $personTarget->signedAmount() }}</td>
</tr> </tr>
</table> </table>
<button type="submit" id="submit">Ja</button> <button class='btn btn-primary' type="submit" id="submit">Ja</button>
<a href="{{ url()->previous() }}" class="btn btn-outline-secondary">Nein</a>
</div>
</form> </form>
@endsection @endsection
resources/views/personTargets/index.blade.php
+29 -5
View File
@@ -17,7 +17,7 @@
<th>Soll</th> <th>Soll</th>
<th>Ist</th> <th>Ist</th>
<th>Differenz</th> <th>Differenz</th>
<th>Aktion</th> <th>Aktionen</th>
</tr> </tr>
<tr> <tr>
<th></th> <th></th>
@@ -38,8 +38,20 @@
<td>{!! formatAmount($personTarget->difference()) !!}</td> <td>{!! formatAmount($personTarget->difference()) !!}</td>
<td> <td>
<div class="btn-group" role="group" aria-label="Basic example"> <div class="btn-group" role="group" aria-label="Basic example">
<a href='/targets/{{ $personTarget->id }}/edit' class="btn btn-success"><i class="fas fa-edit"></i></a> <a href='/targets/{{ $personTarget->id }}/edit'
<a href='/targets/{{ $personTarget->id }}/delete' class="btn btn-danger"><i class="fas fa-trash"></i></a> class='btn btn-success'
data-toggle='tooltip'
data-placement='bottom'
title='Bearbeiten'>
<i class="fas fa-edit"></i>
</a>
<a href='/targets/{{ $personTarget->id }}/delete'
class='btn btn-danger'
data-toggle='tooltip'
data-placement='bottom'
title='Löschen'>
<i class="fas fa-trash"></i>
</a>
</div> </div>
</td> </td>
</tr> </tr>
@@ -75,8 +87,20 @@
<td>{!! formatAmount($personTarget->difference()) !!}</td> <td>{!! formatAmount($personTarget->difference()) !!}</td>
<td> <td>
<div class="btn-group" role="group" aria-label="Basic example"> <div class="btn-group" role="group" aria-label="Basic example">
<a href='/targets/{{ $personTarget->id }}/edit' class="btn btn-success"><i class="fas fa-edit"></i></a> <a href='/targets/{{ $personTarget->id }}/edit'
<a href='/targets/{{ $personTarget->id }}/delete' class="btn btn-danger"><i class="fas fa-trash"></i></a> class='btn btn-success'
data-toggle='tooltip'
data-placement='bottom'
title='Bearbeiten'>
<i class="fas fa-edit"></i>
</a>
<a href='/targets/{{ $personTarget->id }}/delete'
class='btn btn-danger'
data-toggle='tooltip'
data-placement='bottom'
title='Löschen'>
<i class="fas fa-trash"></i>
</a>
</div> </div>
</td> </td>
</tr> </tr>
resources/views/projects/delete.blade.php
+10 -5
View File
@@ -3,16 +3,21 @@
@section('title', 'Projekt löschen') @section('title', 'Projekt löschen')
@section('subnav') @section('subnav')
<a href='{{ url()->previous() }}'>Zurück</a> <a href='{{ url()->previous() }}' class='btn btn-outline-secondary'>Zurück</a>
@endsection @endsection
@section('content') @section('content')
<form action='/projects/{{ $project->id }}' method='post'> <form action='/projects/{{ $project->id }}' method='post' class='mt-4 text-center'>
{{ method_field('delete') }} {{ method_field('delete') }}
{{ csrf_field() }} {{ csrf_field() }}
<p>Soll das Projekt "<b>{{ $project->name }}</b>" wirklich gelöscht <div class='alert alert-danger'>
werden?</p> <p>
<button type="submit" id="submit">Ja</button> Soll das Projekt <b>{{ $project->name }}</b> wirklich
gelöscht werden?
</p>
<button class='btn btn-primary' type="submit" id="submit">Ja</button>
<a href="{{ url()->previous() }}" class="btn btn-outline-secondary">Nein</a>
</div>
</form> </form>
@endsection @endsection