From c77d35bd14bb218bc677217793825a18a616c54c Mon Sep 17 00:00:00 2001 From: TheGamecraft Date: Mon, 20 Aug 2018 15:30:08 -0400 Subject: [PATCH] ALPHA 3.0.1i --- app/Http/Controllers/CalendarController.php | 36 +++++--- app/Http/Controllers/LogController.php | 87 +++++++++++++++++++ bootstrap/app.php | 0 .../admin/calendar/calendar_display.blade.php | 28 ++++-- resources/views/admin/log/display.blade.php | 81 +++++++++++++++++ resources/views/layouts/admin/head.blade.php | 1 + .../views/layouts/admin/sidebar.blade.php | 4 +- routes/api.php | 1 + routes/web.php | 2 + .../Foundation/Auth/AuthenticatesUsers.php | 4 +- 10 files changed, 220 insertions(+), 24 deletions(-) create mode 100644 app/Http/Controllers/LogController.php mode change 100644 => 100755 bootstrap/app.php create mode 100644 resources/views/admin/log/display.blade.php diff --git a/app/Http/Controllers/CalendarController.php b/app/Http/Controllers/CalendarController.php index 1e482c47..7d9e4b5c 100644 --- a/app/Http/Controllers/CalendarController.php +++ b/app/Http/Controllers/CalendarController.php @@ -19,7 +19,7 @@ class CalendarController extends Controller */ public function __construct() { - $this->middleware('auth', ['except' => ['generate','load']]); + $this->middleware('auth', ['except' => ['generate','load','delete']]); } /** @@ -217,11 +217,11 @@ class CalendarController extends Controller - + - + @@ -231,11 +231,11 @@ class CalendarController extends Controller
'.User::find($date->data['n1_p1_instructor'])->fullname().''.User::find($date->data['n1_p1_instructor'])->fullname().' '.$isdone_n1_p1.'
'.$date->data['n1_p1_ocom'].' - '.$date->data['n1_p1_name'].''.$date->data['n1_p1_ocom'].' - '.$date->data['n1_p1_name'].' '.Local::find($date->data['n1_p1_local'])->name.'
- + - + @@ -248,11 +248,11 @@ class CalendarController extends Controller
'.User::find($date->data['n1_p2_instructor'])->fullname().''.User::find($date->data['n1_p2_instructor'])->fullname().' '.$isdone_n1_p2.'
'.$date->data['n1_p2_ocom'].' - '.$date->data['n1_p2_name'].''.$date->data['n1_p2_ocom'].' - '.$date->data['n1_p2_name'].' '.Local::find($date->data['n1_p2_local'])->name.'
- + - + @@ -262,11 +262,11 @@ class CalendarController extends Controller
'.User::find($date->data['n2_p1_instructor'])->fullname().''.User::find($date->data['n2_p1_instructor'])->fullname().' '.$isdone_n2_p1.'
'.$date->data['n2_p1_ocom'].' - '.$date->data['n2_p1_name'].''.$date->data['n2_p1_ocom'].' - '.$date->data['n2_p1_name'].' '.Local::find($date->data['n2_p1_local'])->name.'
- + - + @@ -279,11 +279,11 @@ class CalendarController extends Controller
'.User::find($date->data['n2_p2_instructor'])->fullname().''.User::find($date->data['n2_p2_instructor'])->fullname().' '.$isdone_n2_p2.'
'.$date->data['n2_p2_ocom'].' - '.$date->data['n2_p2_name'].''.$date->data['n2_p2_ocom'].' - '.$date->data['n2_p2_name'].' '.Local::find($date->data['n2_p2_local'])->name.'
- + - + @@ -293,11 +293,11 @@ class CalendarController extends Controller
'.User::find($date->data['n3_p1_instructor'])->fullname().''.User::find($date->data['n3_p1_instructor'])->fullname().' '.$isdone_n3_p1.'
'.$date->data['n3_p1_ocom'].' - '.$date->data['n3_p1_name'].''.$date->data['n3_p1_ocom'].' - '.$date->data['n3_p1_name'].' '.Local::find($date->data['n3_p1_local'])->name.'
- + - + @@ -307,6 +307,7 @@ class CalendarController extends Controller
'.User::find($date->data['n3_p2_instructor'])->fullname().''.User::find($date->data['n3_p2_instructor'])->fullname().' '.$isdone_n3_p2.'
'.$date->data['n3_p2_ocom'].' - '.$date->data['n3_p2_name'].''.$date->data['n3_p2_ocom'].' - '.$date->data['n3_p2_name'].' '.Local::find($date->data['n3_p2_local'])->name.'
'; } + echo '

'; } echo ''.trans('calendar.add_to_schedule').'
'; @@ -468,4 +469,13 @@ class CalendarController extends Controller dd($check); } + public function delete() + { + $id = request('id'); + + $schedule = Schedule::find($id); + + $schedule->delete(); + } + } diff --git a/app/Http/Controllers/LogController.php b/app/Http/Controllers/LogController.php new file mode 100644 index 00000000..1acafa5e --- /dev/null +++ b/app/Http/Controllers/LogController.php @@ -0,0 +1,87 @@ +sortByDesc('created_at')->take(500); + + return view('admin.log.display' ,['log' => $logs]); + } + + /** + * Show the form for creating a new resource. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + // + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function store(Request $request) + { + // + } + + /** + * Display the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function show($id) + { + // + } + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function edit($id) + { + // + } + + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $id) + { + // + } + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function destroy($id) + { + // + } +} diff --git a/bootstrap/app.php b/bootstrap/app.php old mode 100644 new mode 100755 diff --git a/resources/views/admin/calendar/calendar_display.blade.php b/resources/views/admin/calendar/calendar_display.blade.php index 2ce50c3d..15762e83 100644 --- a/resources/views/admin/calendar/calendar_display.blade.php +++ b/resources/views/admin/calendar/calendar_display.blade.php @@ -70,24 +70,38 @@
@endsection \ No newline at end of file diff --git a/resources/views/admin/log/display.blade.php b/resources/views/admin/log/display.blade.php new file mode 100644 index 00000000..19808e8f --- /dev/null +++ b/resources/views/admin/log/display.blade.php @@ -0,0 +1,81 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Activitées des utilisateurs + +
+
+ +
+ + + + + + + + + + @foreach ($log as $item) + + + + + + @endforeach + + +
Horodatage UtilisateurAction
{{$item->created_at}}{{\App\User::find($item->user_id)->fullname()}}{{$item->action}}
+
+
+
+@endsection + +@section('breadcrumb') +
+
+
+
+

{{ trans('admin/dashboard.page_title')}}

+
+
+
+
+
+
+
    +
  1. {{ trans('admin/dashboard.breadcrumb')}}
    2. +
+
+
+
+
+@endsection + +@section('custom_scripts') + + + + + + + + + + + + + +@endsection diff --git a/resources/views/layouts/admin/head.blade.php b/resources/views/layouts/admin/head.blade.php index f9a79265..f5b19579 100644 --- a/resources/views/layouts/admin/head.blade.php +++ b/resources/views/layouts/admin/head.blade.php @@ -21,6 +21,7 @@ + diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index 2766c4b1..528c72b3 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -55,14 +55,14 @@
    • diff --git a/routes/api.php b/routes/api.php index 76283cc2..e8bda374 100644 --- a/routes/api.php +++ b/routes/api.php @@ -20,3 +20,4 @@ Route::middleware('auth:api')->get('/user', function (Request $request) { /* Calendar Route */ Route::post('/calendar/generate', 'CalendarController@generate'); Route::post('/calendar/loadDay', 'CalendarController@load'); +Route::post('/calendar/delete', 'CalendarController@delete'); diff --git a/routes/web.php b/routes/web.php index 57554cf4..561397a3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -31,6 +31,8 @@ Route::get('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@edit']); Route::post('/admin/calendar/add', 'CalendarController@store'); Route::patch('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@patch']); +Route::get('/admin/log' , 'LogController@index'); + /* Other Route */ Route::get('/test', function () { diff --git a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php index a9254b82..9ee0fd00 100644 --- a/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php +++ b/vendor/laravel/framework/src/Illuminate/Foundation/Auth/AuthenticatesUsers.php @@ -104,7 +104,7 @@ trait AuthenticatesUsers $this->clearLoginAttempts($request); - Log::saveLog("c'est connecté"); + Log::saveLog('Connexion'); return $this->authenticated($request, $this->guard()->user()) ?: redirect()->intended($this->redirectPath()); @@ -155,7 +155,7 @@ trait AuthenticatesUsers */ public function logout(Request $request) { - Log::saveLog("C'est déconnecté"); + Log::saveLog("Déconnexion"); $this->guard()->logout();