From d454710e87887c96127949b88ab3582dfa180e4e Mon Sep 17 00:00:00 2001 From: czup Date: Sat, 5 Oct 2019 22:29:46 +0200 Subject: [PATCH] Edytowanie strazakow --- .../Controllers/fireFightersController.php | 20 ++++- resources/views/fireFighters.blade.php | 73 ++++++++++++++++--- resources/views/fireFightersEdit.blade.php | 45 +++++++++++- resources/views/layout/app.blade.php | 1 + routes/web.php | 3 + 5 files changed, 126 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/fireFightersController.php b/app/Http/Controllers/fireFightersController.php index cf3ec97..7cdd8ed 100644 --- a/app/Http/Controllers/fireFightersController.php +++ b/app/Http/Controllers/fireFightersController.php @@ -14,8 +14,8 @@ class fireFightersController extends Controller public function create(){ if(auth()->user() != null && auth()->user()->fireStationID != null ){ -// $users = DB::table('Users')->where("fireStationID", auth()->user()->fireStationID); - $users = user::where("fireStationID", auth()->user()->fireStationID); +// $users = user::where("fireStationID", auth()->user()->fireStationID)->get(); + $users = DB::table('users')->where("fireStationID", '=', auth()->user()->fireStationID)->get(); return view("fireFighters", ["users" => $users]); } else{ return view('fireFighters'); @@ -32,6 +32,20 @@ class fireFightersController extends Controller } else return view("unit"); } + public function editForm($id){ + if(auth()->user() != null && auth()->user()->fireStationID != null ){ + $userFireStation = auth()->user()->fireStationID; + $fireFighterFireStation = DB::table('users')->where("id", $id)->value('fireStationID'); + if($userFireStation == $fireFighterFireStation) { + return view('fireFightersEdit'); + } else{ + return "Brak dostepu"; + } + }else{ + return view('unit'); + } + } + public function store(){ $this->validate(request(), [ @@ -73,8 +87,6 @@ class fireFightersController extends Controller return view('fireFighters'); } - public function editFireFighter(){ - } } diff --git a/resources/views/fireFighters.blade.php b/resources/views/fireFighters.blade.php index f64ae7b..c6d9af5 100644 --- a/resources/views/fireFighters.blade.php +++ b/resources/views/fireFighters.blade.php @@ -11,6 +11,49 @@ @stop + + + + + + + + + @section('center-area') @parent @if( auth()->check()) @@ -20,7 +63,8 @@ - + + @@ -28,16 +72,19 @@ - - @foreach($users as $user) - - - - - - - @endforeach - " + @foreach($users as $user) + + + + + + + + +{{-- --}} + + + @endforeach
Imie i nazwiskoImieNazwisko PESEL E-mail FunkcjaStatus
{{ $user->name }} surname???????????przykladowymail@domena.comZast. NaczelnikaDowódcaCzynny
{{ $user->name }}{{ $user->surname }}{{ $user->PESEL }}{{ $user->email }}Zast. NaczelnikaDowódca@if( $user->statusID == 0) Czynny @else Wyłączony @endifEdytuj
" @endif @@ -47,3 +94,7 @@ @stop + + + + diff --git a/resources/views/fireFightersEdit.blade.php b/resources/views/fireFightersEdit.blade.php index b3d9bbc..b6214fb 100644 --- a/resources/views/fireFightersEdit.blade.php +++ b/resources/views/fireFightersEdit.blade.php @@ -1 +1,44 @@ - +
  • Dodaj
    •  +
  • Edytuj
    • +
  • Wyklucz
    • +
  • Zawieś
    • +
  • Więcej
    • + +@stop + +@section('center-area') + @parent +
    + {{ csrf_field() }} +
    + + +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    + + +
    + +
    + @include('inc.formerrors') +
    +@stop diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php index 4f6e66e..30989e2 100644 --- a/resources/views/layout/app.blade.php +++ b/resources/views/layout/app.blade.php @@ -5,6 +5,7 @@ E-OSP + @if( auth()->check() ) diff --git a/routes/web.php b/routes/web.php index 2beecac..2ed96e3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -47,6 +47,8 @@ Route::get('/logout', 'SessionsController@destroy'); Route::get('/strazacy', 'fireFightersController@create'); Route::get('/strazacy/add', 'fireFightersController@addForm'); Route::post('/strazacy', 'fireFightersController@store'); +Route::get('/strazacy/edit/{id}', 'fireFightersController@editForm'); +//Route::post('/strazacy/edit', ''); Route::get('/jednostka', 'fireStationController@create'); Route::post('/jednostka', 'fireStationController@store'); @@ -54,6 +56,7 @@ Route::post('/jednostka', 'fireStationController@store'); Route::get('/jednostka/getcounties/{id}','DataController@getCounties'); Route::get('/jednostka/getcommunities/{id}','DataController@getCommunities'); + //Auth::routes(); // //Route::get('/home', 'HomeController@index')->name('home');