diff --git a/pfosten/app/Http/Controllers/UsersController.php b/pfosten/app/Http/Controllers/UsersController.php index dd59033c..2efa8f23 100755 --- a/pfosten/app/Http/Controllers/UsersController.php +++ b/pfosten/app/Http/Controllers/UsersController.php @@ -191,6 +191,27 @@ class UsersController extends Controller return view('users.index', compact('users','active_user_count','total_user_count', 'firstTippableRound')); } + + + + public function index_deleted() { + $a=new TimeLogger("UserController::index_deleted()"); + Log::info($a->getStartMessage()); + //error_log($a->getStartMessage()); + + if (Auth::guest()) { return redirect("/"); } + if (!Auth::user()->admin) { return redirect("/"); } + + $users = User::whereNotNull('deleted')->orderBy('deleted','DESC')->get(); + + $currentSeason=Season::getCurrent(); + if (!$currentSeason) { return redirect('/'); } + + return view('users.index_deleted', compact('users')); + } + + + /* public function showUsers() { $users = DB::table('users')->orderBy('lastname')->get(); @@ -597,6 +618,13 @@ class UsersController extends Controller return redirect("/users"); } + public function restore($user_id) { + if (!Auth::user()->admin) redirect("/users"); + $user=User::where('id','=',$user_id)->first(); + $user->deleted = null; + $user->save(); + return redirect("/users"); + } public function money_ranking() { diff --git a/pfosten/resources/views/users/index.blade.php b/pfosten/resources/views/users/index.blade.php index 98946a0b..2ace16db 100644 --- a/pfosten/resources/views/users/index.blade.php +++ b/pfosten/resources/views/users/index.blade.php @@ -29,7 +29,7 @@ @endforeach - + Gelöschte Spieler

 

diff --git a/pfosten/resources/views/users/index_deleted.blade.php b/pfosten/resources/views/users/index_deleted.blade.php new file mode 100644 index 00000000..47dff382 --- /dev/null +++ b/pfosten/resources/views/users/index_deleted.blade.php @@ -0,0 +1,36 @@ +@extends('layouts.layout') + +@section('content') +
+ +
gelöschte Spieler
+ +
+ + + + + + + + + + + @foreach($users as $user) + + + + + + + + @endforeach + +
Name E-Mail Adresse StatusDatumAktion
 {{ $user->name }} {{ $user->email }}  Gelöscht   {{$user->deleted}}  Wiederherstellen
+ +

 

+ +
+ +
+@endsection \ No newline at end of file diff --git a/pfosten/routes/web.php b/pfosten/routes/web.php index 9a422614..a109f805 100644 --- a/pfosten/routes/web.php +++ b/pfosten/routes/web.php @@ -41,6 +41,7 @@ Route::get('/games/edit/{game_id}', 'GamesController@edit'); Route::post('/games/store', 'GamesController@store'); Route::get('/users','UsersController@index'); +Route::get('/users_deleted','UsersController@index_deleted'); Route::get('/users/edit/{user_id}','UsersController@edit'); Route::post('/users/store','UsersController@store'); Route::get('/users/ranking/roundid_{round_id}','UsersController@ranking'); @@ -53,17 +54,15 @@ Route::get('/users/delete/{user_id}','UsersController@delete'); Route::get('/users/payout','UsersController@money_ranking'); Route::get('/users/payout_with_iban','UsersController@money_ranking_with_iban'); Route::get('/users/payout/{user_id}','UsersController@money_ranking_detail'); +Route::get('/users/restore/{user_id}','UsersController@restore'); Route::get('/tipps','TippsController@index'); Route::get('/tipps/joker_impossible','TippsController@joker_impossible'); Route::post('/tipps/store','TippsController@store'); Route::get('/tipps/edit/{tipp_id}','TippsController@edit'); - - -// New routes start Route::get('/tipps/edit4/{round_id}','TippsController@edit4'); Route::post('/tipps/store4','TippsController@store4'); -// New routes end + Route::get('/email','UsersController@mailtest');