diff --git a/.gitignore b/.gitignore index 75b6000..0705851 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,5 @@ yarn-error.log # Swap files *.swp + +.DS_Store diff --git a/app/Http/helpers.php b/app/Http/helpers.php index bac1e9f..c41f710 100644 --- a/app/Http/helpers.php +++ b/app/Http/helpers.php @@ -36,15 +36,15 @@ function formatAmount(float $amount, $cash = true, $text = false, $euro = ($cash) ? ' €' : ''; if (!$text) { $sign = ($amount < 0) ? '- ' : ''; - + $left = ''; $right = ''; $span = ''; - + if ($amount == 0) { - return $right . '- ' . $euro . $span; + return $right . '- ' . $euro . $span; } - + return $left . $sign . $span . $right . number_format(abs($amount), $decimals, ',', '.') . $euro . $span; } @@ -85,7 +85,7 @@ function formatDate($date, $format='d.m.Y') * * @param string $year * @param string $month - * @return string + * @return string */ function startOfMonth($year, $month, $format='d.m.Y') { @@ -99,7 +99,7 @@ function startOfMonth($year, $month, $format='d.m.Y') * * @param string $year * @param string $month - * @return string + * @return string */ function endOfMonth($year, $month, $format='d.m.Y') { return Carbon\Carbon::createFromDate($year, $month) diff --git a/app/helpers.php b/app/helpers.php new file mode 100644 index 0000000..dd8e64c --- /dev/null +++ b/app/helpers.php @@ -0,0 +1,12 @@ +Neue Buchung +
  • + Neue Buchung +
    • @endsection @section('content') -

    - {{ $year - 1 }} - 1. Januar {{ $year }} - 31. Dezember {{ $year }} - {{ $year + 1 }} -

    - +
    + + {{ $year - 1 }} + + 1. Januar {{ $year }} - 31. Dezember {{ $year }} + + {{ $year + 1 }} + +
    +
    diff --git a/resources/views/layout/footer.blade.php b/resources/views/layout/footer.blade.php index bffa38f..c82da6d 100644 --- a/resources/views/layout/footer.blade.php +++ b/resources/views/layout/footer.blade.php @@ -1 +1 @@ -

    This page took {{ number_format(microtime(true) - LARAVEL_START, 3) }} seconds to render.

    +

    This page took {{ number_format(microtime(true) - LARAVEL_START, 3) }} seconds to render.

    diff --git a/resources/views/layout/forms/person.blade.php b/resources/views/layout/forms/person.blade.php index d41eeb5..16cd6a2 100644 --- a/resources/views/layout/forms/person.blade.php +++ b/resources/views/layout/forms/person.blade.php @@ -1,7 +1,9 @@ @extends('layout.master') @section('subnav') - Zurück +
  • + Zurück +
    • @endsection @section('content') @@ -12,62 +14,81 @@ @endif {{ csrf_field() }}

    Stammdaten

    -
    ID
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{ Form::label('title', 'Anrede') }} + +
    + {{ Form::label('title', 'Anrede', ['class' => 'col-sm-2 col-form-label']) }} +
    @if (!is_null($person->id)) {{ Form::select('title', [ 'Herr' => 'Herr', 'Frau' => 'Frau', 'Firma' => 'Firma'], - $person->title) }} + $person->title, ['class' => 'form-control']) }} @else {{ Form::select('title', [ 'Herr' => 'Herr', 'Frau' => 'Frau', - 'Firma' => 'Firma']) }} + 'Firma' => 'Firma'] + , null, ['class' => 'form-control']) }} @endif -
    {{ Form::label('name_or_company', 'Name / Firma') }}{{ Form::text('name_or_company', $person->name_or_company) }}
    {{ Form::label('surname', 'Vorname') }}{{ Form::text('surname', $person->surname) }}
    {{ Form::label('street', 'Straße + Hausnummer') }}{{ Form::text('street', $person->street) }}
    {{ Form::label('postal_code', 'Postleitzahl') }}{{ Form::text('postal_code', $person->postal_code) }}
    {{ Form::label('city', 'Stadt') }}{{ Form::text('city', $person->city) }}
    {{ Form::label('email', 'E-Mail') }}{{ Form::text('email', $person->email) }}
    {{ Form::label('mobile', 'Handy') }}{{ Form::text('mobile', $person->mobile) }}
    {{ Form::label('phone', 'Telefon') }}{{ Form::text('phone', $person->phone) }}
    {{ Form::label('date_of_birth', 'Geburtsdatum') }}{{ Form::date('date_of_birth', $person->date_of_birth) }}
    - + + + +
    + {{ Form::label('name_or_company', 'Name / Firma', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::text('name_or_company', $person->name_or_company, ['class' => 'form-control']) }} +
    +
    + +
    + {{ Form::label('surname', 'Vorname', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::text('surname', $person->surname, ['class' => 'form-control']) }}
    +
    +
    + {{ Form::label('street', 'Straße + Hausnummer', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::text('street', $person->street, ['class' => 'form-control']) }} +
    +
    +
    + {{ Form::label('postal_code', 'Postleitzahl', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::text('postal_code', $person->postal_code, ['class' => 'form-control']) }} +
    +
    +
    + {{ Form::label('city', 'Stadt', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::text('city', $person->city, ['class' => 'form-control']) }} +
    +
    +
    + {{ Form::label('email', 'E-Mail', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::text('email', $person->email, ['class' => 'form-control']) }} +
    +
    +
    + {{ Form::label('mobile', 'Handy', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::text('mobile', $person->mobile, ['class' => 'form-control']) }} +
    +
    +
    + {{ Form::label('phone', 'Telefon', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::text('phone', $person->phone, ['class' => 'form-control']) }} +
    +
    +
    + {{ Form::label('date_of_birth', 'Geburtsdatum', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::date('date_of_birth', $person->date_of_birth, ['class' => 'form-control']) }} +
    +
    + @if ($person->title != 'Firma')

    Mitgliedsdaten

    @@ -95,7 +116,11 @@ @endif
    @endif - - + +
    +
    + +
    +
    @endsection diff --git a/resources/views/layout/forms/projects.blade.php b/resources/views/layout/forms/projects.blade.php index 1cb2953..880461e 100644 --- a/resources/views/layout/forms/projects.blade.php +++ b/resources/views/layout/forms/projects.blade.php @@ -11,27 +11,38 @@ {{ method_field('patch') }} @endif {{ csrf_field() }} - - - - - - - - - - - - - -
    {{ Form::label('name', 'Name') }}{{ Form::text('name', $project->name) }}
    {{ Form::label('start_date', 'Beginn') }}{{ Form::date('start_date', $project->start_date) }}
    {{ Form::label('end_date', 'Ende') }}{{ Form::date('end_date', $project->end_date) }}
    - - - +
    + @foreach ($errors->all() as $error) +
    {{ $error }}
    + @endforeach +
    + +
    + {{ Form::label('name', 'Name', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::text('name', $project->name, ['class' => 'form-control']) }} +
    +
    + +
    + {{ Form::label('start_date', 'Beginn', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::date('start_date', $project->start_date, ['class' => 'form-control']) }} +
    +
    + +
    + {{ Form::label('end_date', 'Ende', ['class' => 'col-sm-2 col-form-label']) }} +
    + {{ Form::date('end_date', $project->start_date, ['class' => 'form-control']) }} +
    +
    + +
    +
    + +
    +
    @endsection diff --git a/resources/views/layout/header.blade.php b/resources/views/layout/header.blade.php index c44fab6..e69de29 100644 --- a/resources/views/layout/header.blade.php +++ b/resources/views/layout/header.blade.php @@ -1,3 +0,0 @@ -

    - Pollux logo -

    diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index 28b4c44..b5a79a7 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -1,34 +1,48 @@ Pollux - @yield('title') + + + + - -