chrosey/dienstplan
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anpassungen layout

Browse Source
This commit is contained in:
TLRZ Seyfferth 2017-09-15 12:41:49 +02:00
parent e03fb43c27
commit 188e05658d
6 changed files with 138 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/Http/Controllers/VeranstaltungController.php
View File

@ -46,11 +46,11 @@ class VeranstaltungController extends Controller
$v = new Veranstaltung();
$v->name = $input['name'];
$v->gaeste = (int)$input['gaeste'];
$v->beginn = new \Carbon\Carbon($input['beginn']);
if ($input['ende']) {
$v->ende = new \Carbon\Carbon($input['ende']);
$v->beginn = new \Carbon\Carbon($input['beginn_datum']."T".$input['beginn_zeit']);
if ($input['ende_datum'] && $input['ende_zeit']) {
$v->ende = new \Carbon\Carbon($input['ende_datum']."T".$input['ende_zeit']);
}
$v->ort_id = $input['ort'];
$v->ort_id = (int)$input['ort'];
$v->hinweise = $input['hinweise'] ?: "";
if ($v->save()) {
@ -95,22 +95,22 @@ class VeranstaltungController extends Controller
*/
public function update(Request $request, Veranstaltung $veranstaltung)
{
if ($request->isMethod('put')) {
$i = $request->input();
$veranstaltung->gaeste = $i['gaeste'];
$veranstaltung->name = $i['name'];
$veranstaltung->hinweise = $i['hinweise'];
$veranstaltung->beginn = new \Carbon\Carbon($i['beginn']);
$veranstaltung->ende = $i['ende'] ? new \Carbon\Carbon($i['ende']) : null;
$veranstaltung->ort_id = $i['ort'];
if($veranstaltung->save()){
return redirect()->route('veranstaltung.show', [$veranstaltung]);
}
if (!$request->isMethod('put')) {
return response()->json($veranstaltung);
}
$i = $request->input();
$veranstaltung->gaeste = $i['gaeste'];
$veranstaltung->name = $i['name'];
if ($i['hinweise']){
$veranstaltung->hinweise = $i['hinweise'];
}
$veranstaltung->beginn = new \Carbon\Carbon($i['beginn']);
$veranstaltung->ende = $i['ende'] ? new \Carbon\Carbon($i['ende']) : null;
$veranstaltung->ort_id = $i['ort'];
if($veranstaltung->save()){
return redirect()->route('veranstaltung.show', [$veranstaltung]);
}
return response()->json($veranstaltung);
}
/**
@ -136,4 +136,5 @@ class VeranstaltungController extends Controller
}
return response()->json($eintragung);
}
}

6
resources/views/benutzer/index.blade.php
View File

@ -4,7 +4,7 @@
@section('content')
<a class="btn btn-link" href="{{ route('benutzer.create') }}">Benutzer hinzufügen</a>
<table class="table-hover table">
<table class="highlight">
<thead>
<tr>
<th class="text-center">Name</th>
@ -21,8 +21,8 @@
TODO
</td>
<td class="row">
<a class="btn btn-link my-0 py-0" href="{{ route('benutzer.edit', [$b]) }}">Bearbeiten</a>
<a class="btn btn-link my-0 py-0" data-toggle="modal" href="#confirmDeletionModal" data-token="{{csrf_token()}}" data-url="{{route('benutzer.destroy', $b)}}" data-identifier="{{$b->anzeigename}}">Löschen</button>
<a class="btn-link my-0 py-0" href="{{ route('benutzer.edit', [$b]) }}">Bearbeiten</a>
<a class="btn-link my-0 py-0" data-toggle="modal" href="#confirmDeletionModal" data-token="{{csrf_token()}}" data-url="{{route('benutzer.destroy', $b)}}" data-identifier="{{$b->anzeigename}}">Löschen</button>
</td>
</tr>
@endforeach

2
resources/views/home.blade.php
View File

@ -3,6 +3,6 @@
@section('content')
<div class="row">
<h2 class="display-2">Dashboard</h2>
<h2>Dashboard</h2>
</div>
@endsection

73
resources/views/veranstaltung/create.blade.php
View File

@ -4,33 +4,37 @@
@section('content')
<form method="POST" action="{{ route('veranstaltung.store') }}">
<div class="row">
<div class="form-group col-md-8">
<label class="col-form-label" for="name">Veranstaltungsname</label>
<input type="text" name="name" class="form-control" id="title" aria-describedby="nameHelp" placeholder="Veranstaltungsnamen eingeben" value="{{ $name or "" }}" required>
<div class="col s12 m8 input-field">
<label for="name">Veranstaltungsname</label>
<input type="text" name="name" id="title" aria-describedby="nameHelp" placeholder="Veranstaltungsnamen eingeben" value="{{ $name or "" }}" required>
<small id="nameHelp" class="form-text text-muted">Die Bezeichnung der Veranstaltung, welcher in der Übersicht angezeigt wird.</small>
</div>
<div class="form-group col-md-4">
<label class="col-form-label" for="gaeste">Anzahl der Gäste</label>
<input type="number" name="gaeste" class="form-control" id="gaeste" aria-describedby="gaesteHelp" placeholder="Gastanzahl eingeben" value="{{ $gaeste ?: 100 }}">
<div class="col s12 m4 input-field">
<label for="gaeste" class="active">Anzahl der Gäste</label>
<p class="range-field">
<input type="range" name="gaeste" id="gaeste" aria-describedby="gaesteHelp" placeholder="Gastanzahl eingeben" value="{{ $gaeste ?: 100 }}" min="0" max="2000">
</p>
<small id="gaesteHelp" class="form-text text-muted">Die ungefähre Anzahl an Gästen zur Veranstaltung</small>
</div>
</div>
<div class="row">
<div class="form-group col-md-6">
<label class="col-form-label" for="beginn">Veranstaltungsbeginn</label>
<input type="datetime-local" name="beginn" class="form-control" id="beginn" aria-describedby="beginnHelp" placeholder="Veranstaltungsbeginn eingeben" value="{{ \Carbon\Carbon::parse($beginn)->format('Y-m-d\TH:i:s') }}" required>
<div class="col s12 m6 input-field">
<label for="beginn_datum" class="active">Veranstaltungsbeginn</label>
<input type="text" name="beginn_datum" class="datepicker" id="beginn_datum" aria-describedby="beginnHelp" data-value="{{ \Carbon\Carbon::parse($beginn)->format('Y-m-d') }}" required>
<input type="text" name="beginn_zeit" class="timepicker" id="beginn_zeit" aria-describedby="beginnHelp" data-value="{{ \Carbon\Carbon::parse($beginn)->format('H:i:s') }}" required>
<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung beginnt.</small>
</div>
<div class="form-group col-md-6">
<label class="col-form-label" for="ende">Veranstaltungsende</label>
<input type="datetime-local" name="ende" class="form-control" id="ende" aria-describedby="endeHelp" placeholder="Veranstaltungende eingeben" value="{{ !empty($ende) ? $ende : "" }}">
<div class="col s12 m6 input-field">
<label for="ende_datum" class="active">Veranstaltungsende</label>
<input type="text" name="ende_datum" class="datepicker" id="ende_datum" aria-describedby="endeHelp" value="{{ !empty($ende) ? \Carbon\Carbon::parse($ende)->format('Y-m-d') : "" }}" >
<input type="text" name="ende_zeit" class="timepicker" id="ende_zeit" aria-describedby="endeHelp" value="{{ !empty($ende) ? \Carbon\Carbon::parse($ende)->format('H:i:s') : "" }}" >
<small id="beginnHelp" class="form-text text-muted">Der Zeitpunkt, an dem die Veranstaltung wahrscheinlich endet. (optional)</small>
</div>
</div>
<div class="row">
<div class="form-group col-md-12">
<label class="col-form-label" for="Hinweise">Hinweise</label>
<textarea class="form-control" name="hinweise" id="hinweise" aria-describedby="hinweiseHelp" rows="3">
<div class="col s12 m12 input-field">
<label for="Hinweise">Hinweise</label>
<textarea name="hinweise" id="hinweise" aria-describedby="hinweiseHelp" rows="3" data-length="200" class="materialize-textarea">
{{ $hinweise or ""}}
</textarea>
<small id="hinweiseHelp" class="form-text text-muted">Hinweise zur Veranstalung</small>
@ -38,13 +42,13 @@
</div>
<div class="row">
<div class="col m6 input-field">
<label for="ort">Ort</label>
{!! Form::select('ort', App\Ort::pluck('name','id'), null,[ 'id' => 'ort', 'aria-describedby' => "ortHelp"]) !!}
<label for="ort" class="active" >Ort</label>
{!! Form::select('ort', App\Ort::pluck('name','id'), null,[ 'id' => 'ort', 'aria-describedby' => "ortHelp", 'placeholder' => "Bitte einen Ort wählen"]) !!}
<small id="ortHelp" class="form-text text-muted">Ort der Veranstaltung</small>
</div>
</div>
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<button type="submit" class="btn btn-primary">Submit</button>
<button type="submit" class="btn waves-effect"><i class="material-icons right">send</i> Erstellen</button>
</form>
@endsection
@ -52,6 +56,39 @@
<script>
$(document).ready(function(){
$('select').material_select();
Materialize.updateTextFields();
});
$('.datepicker').pickadate({
selectYears: true,
today: "Heute",
clear: "leeren",
close: "OK",
closeOnSelect: true,
firstWeekday: 1,
hiddenName: true,
format: "d. mmmm, yyyy",
formatSubmit: "yyyy-m-d",
monthsFull: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
monthsShort: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
weekdaysFull: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
weekdaysShort: ["So","Mo","Di","Mi","Do","Fr","Sa"],
});
$('.timepicker').pickatime({
cleartext: "leeren",
format: "h:i",
formatSubmit: "HH:i:s",
interval: 5,
hiddenName: true,
default: 'now',
fromnow: 0,
twelvehour: false,
donetext: "OK",
canceltext: "Abbrechen",
autoclose: true
});
</script>
@endpush

24
resources/views/veranstaltung/index.blade.php
View File

@ -3,31 +3,31 @@
@section('content')
<table class="highlight">
<thead>
<thead class="centered">
<tr>
<th class="centered">Name</th>
<th class="centered">Datum</th>
<th class="centered">Zeit</th>
<th class="centered">Eingetragen</th>
<th>Name</th>
<th>Datum</th>
<th>Zeit</th>
<th>Eingetragen</th>
<th></th>
</tr>
</thead>
@foreach ($veranstaltungen as $v)
<tr >
<tr>
<td>{{ $v->name }}</td>
<td>{{ $v->beginn->format('d.m.Y') }}</td>
<td>{{ $v->beginn->format('H:i') }}</td>
<td class="centered">
<td class="center">
@if(!$v->ist_eingetragen)
<a class="btn-flat waves-effect waves-green" href="{{ route('veranstaltung.enter', [$v]) }}">Eintragen</a>
<a href="{{ route('veranstaltung.enter', [$v]) }}">Eintragen</a>
@else
<span class="green-text tooltipped" title="Du bist schon eingetragen"><i class="material-icons">check</i></span>
<span class="green-text tooltipped" data-tooltip="Du bist schon eingetragen"><i class="material-icons">check</i></span>
@endif
</td>
<td class="row">
<a class="btn-flat waves-effect" href="{{ route('veranstaltung.show', [$v]) }}">Details</a>
<a class="btn-flat waves-effect" href="{{ route('veranstaltung.edit', [$v]) }}">Bearbeiten</a>
<a class="btn-flat waves-effect wave-red red-text modal-trigger" href="#confirmDeletionModal" data-url="{{route('veranstaltung.destroy', $v)}}" data-identifier="{{$v->name}}"><i class="material-icons">delete</i></button>
<a class="tooltipped" data-tooltip="Details anzeigen" href="{{ route('veranstaltung.show', [$v]) }}"><i class="material-icons">open_in_browser</i></a>
<a class="tooltipped" data-tooltip="Veranstaltung bearbeiten" href="{{ route('veranstaltung.edit', [$v]) }}"><i class="material-icons">edit</i></a>
<a class="red-text modal-trigger tooltipped" data-tooltip="Veranstaltung löschen" href="#confirmDeletionModal" data-url="{{route('veranstaltung.destroy', $v)}}" data-identifier="{{$v->name}}"><i class="material-icons">delete</i></button>
</td>
</tr>
@endforeach

97
resources/views/veranstaltung/show.blade.php
View File

@ -2,54 +2,51 @@
@section('title', 'Neue Veranstaltung')
@section('content')
<h2>{{ $name }}</h2>
<hr/>
<dl class="row">
<dt class="col-md-2">
Datum
</dt>
<dd class="col-md-10">
{{ (new Carbon\Carbon($beginn))->formatLocalized("%A, %d. %B %Y")}}
</dd>
<dt class="col-md-2">
Uhrzeit
</dt>
<dd class="col-md-10">
{{ (new Carbon\Carbon($beginn))->format("H:i") }} -
{{ $ende ? (new Carbon\Carbon($ende))->format("H:i") : "Open End" }}
</dd>
<dt class="col-md-2">
Veranstaltungsort
</dt>
<dd class="col-md-10">
{{ App\Ort::find($ort_id)->name }}
</dd>
<dt class="col-md-2">
Gäste
</dt>
<dd class="col-md-10">
{{ $gaeste }}
</dd>
<dt class="col-md-2">
Hinweise
</dt>
<dd class="col-md-10">
{{ $hinweise }}
</dd>
<dt class="col-md-2">
Eintragungen
</dt>
<dd class="col-md-10">
<ul>
@forelse ($eintragungen as $eintragung)
<li> {{ $eintragung['user']['name'] }}
@empty
<p>Keine Eintragungen bisher</p>
@endforelse
</ul>
</dd>
</dl>
<hr/>
<a class="btn btn-link" href="{{ route('veranstaltung.edit', ['id' => $id]) }}">Bearbeiten</a>
<a class="btn btn-link" href="{{ route('veranstaltung.index') }}">Zurück zur Liste</a>
<div class="row">
<div class="card sticky-action">
<div class="card-image waves-effect waves-light waves-block">
<img class="activator" src="http://www.theater-erfurt.de/pictures/36-10112.jpg"></img>
<span class="card-title activator">{{ $name }}</span>
</div>
<div class="card-content">
<span class="card-title activator">{{ (new Carbon\Carbon($beginn))->formatLocalized("%a, %d. %B %Y") }}<i class="material-icons right">more_vert</i></span>
<br/>
<span>{{ App\Ort::find($ort_id)->name }}, {{ (new Carbon\Carbon($beginn))->format("H:i") }} - {{ $ende ? (new Carbon\Carbon($ende))->format("H:i") : "Open End" }} </span>
<br/>
<span>{{ $gaeste }} Gäste</span>
<div class="divider"></div>
<span>Hinweise: {{ $hinweise }}</span>
</div>
<div class="card-reveal">
<span class="card-title grey-text text-darken-4">Weitere Informationen<i class="material-icons right">close</i></span>
<ul class="tabs">
<li class="tab"><a href="#eintragungen">Eintragungen</a></li>
<li class="tab"><a href="#einteilungen">Einteilungen</a></li>
</ul>
<div id="eintragungen">
<ul>
@forelse ($eintragungen as $eintragung)
<li> {{ $eintragung['user']['name'] }} </li>
@empty
<p>Keine Eintragungen bisher</p>
@endforelse
</ul>
</div>
<div id="einteilungen">
<ul>
@forelse ($einteilungen as $einteilung)
<li> {{ $einteilung['user']['name'] }} </li>
@empty
<p>Keine Einteilungen bisher</p>
@endforelse
</ul>
</div>
</div>
<div class="card-action">
<a href="{{ route('veranstaltung.edit', ['id' => $id]) }}">Bearbeiten</a>
<a href="{{ route('veranstaltung.index') }}">Zurück zur Liste</a>
</div>
</div>
</div>
@endsection