Added tooltips. Fixed style issues with delete dialogs. Edited bookings index style.
This commit is contained in:
Lukas Halbritter
@@ -3,41 +3,53 @@
|
||||
@section('title', 'Buchung löschen')
|
||||
|
||||
@section('subnav')
|
||||
<a href='{{ url()->previous() }}'>Zurück</a>
|
||||
<a href='{{ url()->previous() }}' class='btn btn-outline-secondary'>Zurück</a>
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<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') }}
|
||||
{{ csrf_field() }}
|
||||
<p>Soll folgende Buchung und alle ihre Teilbuchungen wirklich gelöscht
|
||||
werden?</p>
|
||||
<div class='alert alert-danger'>
|
||||
<p>
|
||||
Soll folgende Buchung und alle ihre Teilbuchungen wirklich
|
||||
gelöscht werden?
|
||||
</p>
|
||||
|
||||
<table border='1'>
|
||||
<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)
|
||||
<table class='table'>
|
||||
<tr>
|
||||
<td></td>
|
||||
<td>{{ $subBooking->reference }}</td>
|
||||
<td></td>
|
||||
<td align='right'>{{ formatAmount($subBooking->signedAmount(), true, true) }}</td>
|
||||
<th>Datum</th>
|
||||
<th>Positionen</th>
|
||||
<th>Person / Firma</th>
|
||||
<th>Betrag</th>
|
||||
</tr>
|
||||
@endforeach
|
||||
</table>
|
||||
<tr>
|
||||
<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>
|
||||
@endsection
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@
|
||||
{{ $year + 1 }} <i class="fas fa-chevron-right"></i>
|
||||
</a>
|
||||
</div>
|
||||
<table class='table table-striped table-bordered'>
|
||||
<tr>
|
||||
<table class='table table-bordered table-hover'>
|
||||
<tr class='table-secondary'>
|
||||
<th>Datum</th>
|
||||
<th>Positionen</th>
|
||||
<th>Person / Firma</th>
|
||||
@@ -30,7 +30,7 @@
|
||||
<th>Eingang (H)</th>
|
||||
<th>Konto</th>
|
||||
<th>Projekt</th>
|
||||
<th></th>
|
||||
<th>Aktionen</th>
|
||||
</tr>
|
||||
@for ($month = 1; $month <= 12; $month++)
|
||||
@if ((
|
||||
@@ -42,15 +42,15 @@
|
||||
or $firstDate['Y'] == $year
|
||||
and $firstDate['m'] <= $month
|
||||
))
|
||||
<tr style='color: red; font-weight: bold'>
|
||||
<td>{{ startOfMonth($year, $month) }}</td>
|
||||
<td>Saldo</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>{!! formatAmount($sums[$month - 1]['balance']) !!}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<tr class='table-danger'>
|
||||
<th>{{ startOfMonth($year, $month) }}</th>
|
||||
<th>Saldo</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th>{!! formatAmount($sums[$month - 1]['balance']) !!}</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
@endif
|
||||
@if (isset($bookings[$month]))
|
||||
@@ -81,10 +81,18 @@
|
||||
</td>
|
||||
<td>
|
||||
<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>
|
||||
</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>
|
||||
</a>
|
||||
</div>
|
||||
@@ -92,7 +100,7 @@
|
||||
</tr>
|
||||
@if (!$booking->isSimple())
|
||||
@foreach ($booking->subBookings as $subBooking)
|
||||
<tr>
|
||||
<tr class='table-secondary'>
|
||||
<td></td>
|
||||
<td>{{ $subBooking->reference }}</td>
|
||||
<td></td>
|
||||
@@ -129,29 +137,29 @@
|
||||
or $firstDate['Y'] == $year
|
||||
and $firstDate['m'] <= $month
|
||||
))
|
||||
<tr style='color: #000080; font-weight: bold'>
|
||||
<td>
|
||||
<tr class='table-primary'>
|
||||
<th>
|
||||
{{ endOfMonth($year, $month) }}
|
||||
</td>
|
||||
<td>Monatsabschluss</td>
|
||||
<td></td>
|
||||
<td>{!! formatAmount($sums[$month]['expeditures']) !!}</td>
|
||||
<td>{!! formatAmount($sums[$month]['incomes']) !!}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</th>
|
||||
<th>Monatsabschluss</th>
|
||||
<th></th>
|
||||
<th>{!! formatAmount($sums[$month]['expeditures']) !!}</th>
|
||||
<th>{!! formatAmount($sums[$month]['incomes']) !!}</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
<tr style='color: red; font-weight: bold'>
|
||||
<td>
|
||||
<tr class='table-danger'>
|
||||
<th>
|
||||
{{ endOfMonth($year, $month) }}
|
||||
</td>
|
||||
<td>Saldo</td>
|
||||
<td></td>
|
||||
<td>{!! formatAmount($sums[$month]['balance']) !!}</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</th>
|
||||
<th>Saldo</th>
|
||||
<th></th>
|
||||
<th>{!! formatAmount($sums[$month]['balance']) !!}</th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
<th></th>
|
||||
</tr>
|
||||
<tr>
|
||||
@for ($i = 0; $i < 8; $i++)
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
@section('subnav')
|
||||
<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>
|
||||
@endsection
|
||||
|
||||
@@ -129,8 +129,24 @@
|
||||
{{-- Create empty input field for a new member state record. --}}
|
||||
@if (!$person->isMember())
|
||||
<tr>
|
||||
<td>{{ Form::date('memberState[0][joining_date]') }}</td>
|
||||
<td>{{ Form::date('memberState[0][leaving_date]') }}</td>
|
||||
<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>
|
||||
@endif
|
||||
</table>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@extends('layout.master')
|
||||
|
||||
@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
|
||||
|
||||
@section('content')
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
@section('subnav')
|
||||
<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>
|
||||
@endsection
|
||||
|
||||
@@ -15,7 +15,8 @@
|
||||
@if ($person->isEven())
|
||||
<div class="alert alert-danger">
|
||||
<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>
|
||||
@else
|
||||
<div class="alert alert-warning">
|
||||
|
||||
@@ -3,32 +3,35 @@
|
||||
@section('title', 'Zahlungsverflichtung löschen')
|
||||
|
||||
@section('subnav')
|
||||
<a href='{{ url()->previous() }}'>Zurück</a>
|
||||
<a href='{{ url()->previous() }}' class='btn btn-outline-secondary'>Zurück</a>
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<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') }}
|
||||
{{ 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'>
|
||||
<tr>
|
||||
<th>Datum</th>
|
||||
<th>Position</th>
|
||||
<th>Person / Firma</th>
|
||||
<th>Betrag</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ formatDate($personTarget->date) }}</td>
|
||||
<td>{{ $personTarget->reference }}</td>
|
||||
<td>{{ $personTarget->person->fullName() }}</td>
|
||||
<td>{{ $personTarget->signedAmount() }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<table class='table'>
|
||||
<tr>
|
||||
<th>Datum</th>
|
||||
<th>Position</th>
|
||||
<th>Person / Firma</th>
|
||||
<th>Betrag</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>{{ formatDate($personTarget->date) }}</td>
|
||||
<td>{{ $personTarget->reference }}</td>
|
||||
<td>{{ $personTarget->person->fullName() }}</td>
|
||||
<td>{{ $personTarget->signedAmount() }}</td>
|
||||
</tr>
|
||||
</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>
|
||||
@endsection
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<th>Soll</th>
|
||||
<th>Ist</th>
|
||||
<th>Differenz</th>
|
||||
<th>Aktion</th>
|
||||
<th>Aktionen</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th></th>
|
||||
@@ -38,8 +38,20 @@
|
||||
<td>{!! formatAmount($personTarget->difference()) !!}</td>
|
||||
<td>
|
||||
<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 }}/delete' class="btn btn-danger"><i class="fas fa-trash"></i></a>
|
||||
<a href='/targets/{{ $personTarget->id }}/edit'
|
||||
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>
|
||||
</td>
|
||||
</tr>
|
||||
@@ -75,8 +87,20 @@
|
||||
<td>{!! formatAmount($personTarget->difference()) !!}</td>
|
||||
<td>
|
||||
<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 }}/delete' class="btn btn-danger"><i class="fas fa-trash"></i></a>
|
||||
<a href='/targets/{{ $personTarget->id }}/edit'
|
||||
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>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -3,16 +3,21 @@
|
||||
@section('title', 'Projekt löschen')
|
||||
|
||||
@section('subnav')
|
||||
<a href='{{ url()->previous() }}'>Zurück</a>
|
||||
<a href='{{ url()->previous() }}' class='btn btn-outline-secondary'>Zurück</a>
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<form action='/projects/{{ $project->id }}' method='post'>
|
||||
<form action='/projects/{{ $project->id }}' method='post' class='mt-4 text-center'>
|
||||
{{ method_field('delete') }}
|
||||
{{ csrf_field() }}
|
||||
<p>Soll das Projekt "<b>{{ $project->name }}</b>" wirklich gelöscht
|
||||
werden?</p>
|
||||
<button type="submit" id="submit">Ja</button>
|
||||
<div class='alert alert-danger'>
|
||||
<p>
|
||||
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>
|
||||
@endsection
|
||||
|
||||
|
||||
Reference in New Issue
Block a user