ALPHA 3.0.1i

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
                         <table class="table float center" style="border:none; max-width:80%; margin:auto;">
                             <tbody>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.User::find($date->data['n1_p1_instructor'])->fullname().'</td>
+                                    <td style="border:none; width:80%">'.User::find($date->data['n1_p1_instructor'])->fullname().'</td>
                                     <td style="border:none;">'.$isdone_n1_p1.'</td>
                                 </tr>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.$date->data['n1_p1_ocom'].' - '.$date->data['n1_p1_name'].'</td>
+                                    <td style="border:none;width:80%">'.$date->data['n1_p1_ocom'].' - '.$date->data['n1_p1_name'].'</td>
                                     <td style="border:none;">'.Local::find($date->data['n1_p1_local'])->name.'</td>
                                 </tr>
                             </tbody>
@@ -231,11 +231,11 @@ class CalendarController extends Controller
                         <table class="table float center" style="border:none; max-width:80%; margin:auto;">
                             <tbody>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.User::find($date->data['n1_p2_instructor'])->fullname().'</td>
+                                    <td style="border:none;width:80%">'.User::find($date->data['n1_p2_instructor'])->fullname().'</td>
                                     <td style="border:none;">'.$isdone_n1_p2.'</td>
                                 </tr>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.$date->data['n1_p2_ocom'].' - '.$date->data['n1_p2_name'].'</td>
+                                    <td style="border:none;width:80%">'.$date->data['n1_p2_ocom'].' - '.$date->data['n1_p2_name'].'</td>
                                     <td style="border:none;">'.Local::find($date->data['n1_p2_local'])->name.'</td>
                                 </tr>
                             </tbody>
@@ -248,11 +248,11 @@ class CalendarController extends Controller
                         <table class="table float center" style="border:none; max-width:80%; margin:auto;">
                             <tbody>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.User::find($date->data['n2_p1_instructor'])->fullname().'</td>
+                                    <td style="border:none;width:80%">'.User::find($date->data['n2_p1_instructor'])->fullname().'</td>
                                     <td style="border:none;">'.$isdone_n2_p1.'</td>
                                 </tr>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.$date->data['n2_p1_ocom'].' - '.$date->data['n2_p1_name'].'</td>
+                                    <td style="border:none;width:80%">'.$date->data['n2_p1_ocom'].' - '.$date->data['n2_p1_name'].'</td>
                                     <td style="border:none;">'.Local::find($date->data['n2_p1_local'])->name.'</td>
                                 </tr>
                             </tbody>
@@ -262,11 +262,11 @@ class CalendarController extends Controller
                         <table class="table float center" style="border:none; max-width:80%; margin:auto;">
                             <tbody>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.User::find($date->data['n2_p2_instructor'])->fullname().'</td>
+                                    <td style="border:none;width:80%">'.User::find($date->data['n2_p2_instructor'])->fullname().'</td>
                                     <td style="border:none;">'.$isdone_n2_p2.'</td>
                                 </tr>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.$date->data['n2_p2_ocom'].' - '.$date->data['n2_p2_name'].'</td>
+                                    <td style="border:none;width:80%">'.$date->data['n2_p2_ocom'].' - '.$date->data['n2_p2_name'].'</td>
                                     <td style="border:none;">'.Local::find($date->data['n2_p2_local'])->name.'</td>
                                 </tr>
                             </tbody>
@@ -279,11 +279,11 @@ class CalendarController extends Controller
                         <table class="table float center" style="border:none; max-width:80%; margin:auto;">
                             <tbody>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.User::find($date->data['n3_p1_instructor'])->fullname().'</td>
+                                    <td style="border:none;width:80%">'.User::find($date->data['n3_p1_instructor'])->fullname().'</td>
                                     <td style="border:none;">'.$isdone_n3_p1.'</td>
                                 </tr>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.$date->data['n3_p1_ocom'].' - '.$date->data['n3_p1_name'].'</td>
+                                    <td style="border:none;width:80%">'.$date->data['n3_p1_ocom'].' - '.$date->data['n3_p1_name'].'</td>
                                     <td style="border:none;">'.Local::find($date->data['n3_p1_local'])->name.'</td>
                                 </tr>
                             </tbody>
@@ -293,11 +293,11 @@ class CalendarController extends Controller
                         <table class="table float center" style="border:none; max-width:80%; margin:auto;">
                             <tbody>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.User::find($date->data['n3_p2_instructor'])->fullname().'</td>
+                                    <td style="border:none;width:80%">'.User::find($date->data['n3_p2_instructor'])->fullname().'</td>
                                     <td style="border:none;">'.$isdone_n3_p2.'</td>
                                 </tr>
                                 <tr style="border:none;">
-                                    <td style="border:none;">'.$date->data['n3_p2_ocom'].' - '.$date->data['n3_p2_name'].'</td>
+                                    <td style="border:none;width:80%">'.$date->data['n3_p2_ocom'].' - '.$date->data['n3_p2_name'].'</td>
                                     <td style="border:none;">'.Local::find($date->data['n3_p2_local'])->name.'</td>
                                 </tr>
                             </tbody>
@@ -307,6 +307,7 @@ class CalendarController extends Controller
                 </tbody>
               </table>';
             }
+            echo '<br><hr><br>';
         }
 
         echo '<a href="/admin/calendar/add/'.$url.'" type="button" class="btn btn-primary btn-lg btn-block">'.trans('calendar.add_to_schedule').'</a></div><div class="modal-footer"><button type="button" class="btn btn-secondary" data-dismiss="modal">'.trans('pagination.close').'</button></div></div>';
@@ -468,4 +469,13 @@ class CalendarController extends Controller
         dd($check);
     }
 
+    public function delete()
+    {
+        $id = request('id');
+
+        $schedule = Schedule::find($id);
+
+        $schedule->delete();
+    }
+
 }

app/Http/Controllers/LogController.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Log;
+
+class LogController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $logs = Log::all()->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)
+    {
+        //
+    }
+}

resources/views/admin/calendar/calendar_display.blade.php

@@ -70,24 +70,38 @@
    <script src="/assets/js/calendar/calendar.js"></script>
    <div class="log"></div>
    <script>
-       function deleteEvent($id){
+       function deleteEvent(pid){
             swal({
-                title: 'Êtes vous sure ?',
+                title: 'Êtes vous certain ?',
                 text: "Vous ne pourrez annuler cette action",
                 type: 'warning',
                 showCancelButton: true,
                 confirmButtonColor: '#3085d6',
                 cancelButtonColor: '#d33',
-                confirmButtonText: 'Yes, delete it!'
+                confirmButtonText: 'Oui',
+                cancelButtonText: 'Non'
                 }).then((result) => {
                 if (result.value) {
+
+                    (function($) {
+                        $.post('/api/calendar/delete', { id: pid } , function(data) {
+                            console.log('Delete');
+                        });
+
+                        
+                    })(jQuery);
+
                     swal(
-                    'Deleted!',
+                    'Supprimé!',
-                    'Your file has been deleted.',
+                    "L'évenement a été supprimé",
                     'success'
-                    )
+                    ).then((result) => {
+                    if (result.value) {
+                        location.reload();
+                        }
+                    })
                 }
-            })
+                })
        }
     </script>
 @endsection

resources/views/admin/log/display.blade.php

@@ -0,0 +1,81 @@
+@extends('layouts.admin.main')
+
+@section('content')
+<div class="col-md-12">
+    <div class="card">
+        <div class="card-header">
+            <strong class="card-title">Activitées des utilisateurs <a href="#"><i class="fa fa-question-circle" aria-hidden="true"></i>
+            </a></strong>
+        </div>
+        <div class="card-body">
+            <button type="button" class="btn btn-primary btn-lg btn-block">Afficher toutes les activitées</button>
+            <hr>
+            <table id="log-data" class="table table-striped table-bordered">
+                <thead>
+                <tr>
+                    <th>Horodatage </th>
+                    <th>Utilisateur</th>
+                    <th>Action</th>
+                </tr>
+                </thead>
+                <tbody>
+                    @foreach ($log as $item)
+                        <tr>
+                            <td>{{$item->created_at}}</td>  
+                            <td>{{\App\User::find($item->user_id)->fullname()}}</td>
+                            <td>{{$item->action}}</td>
+                        </tr>
+                    @endforeach
+                
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
+@endsection
+
+@section('breadcrumb')
+    <div class="breadcrumbs">
+        <div class="col-sm-4">
+            <div class="page-header float-left">
+                <div class="page-title">
+                    <h1>{{ trans('admin/dashboard.page_title')}}</h1>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-8">
+            <div class="page-header float-right">
+                <div class="page-title">
+                    <ol class="breadcrumb text-right">
+                        <li class="active">{{ trans('admin/dashboard.breadcrumb')}}</li>
+                    </ol>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('custom_scripts')
+<script src="/assets/admin/assets/js/lib/data-table/datatables.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/dataTables.bootstrap.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/dataTables.buttons.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.bootstrap.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/jszip.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/pdfmake.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/vfs_fonts.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.html5.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.print.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.colVis.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/datatables-init.js"></script>
+
+<script type="text/javascript">
+    (function($) {
+        $(document).ready(function() {
+            $('#log-data').DataTable({
+                "order": [[ 0, "desc" ]],
+                "lengthMenu": [[25, 50, -1], [25, 50, "All"]],
+            });
+        } );
+    })(jQuery);
+</script>
+@endsection

resources/views/layouts/admin/head.blade.php

@@ -21,6 +21,7 @@
 <link rel="stylesheet" href="/assets/admin/assets/css/themify-icons.css">
 <link rel="stylesheet" href="/assets/admin/assets/css/flag-icon.min.css">
 <link rel="stylesheet" href="/assets/admin/assets/css/cs-skin-elastic.css">
+<link rel="stylesheet" href="https://cdn.datatables.net/1.10.18/css/dataTables.bootstrap4.min.css">
 <!-- <link rel="stylesheet" href="assets/css/bootstrap-select.less"> -->
 <link rel="stylesheet" href="/assets/admin/assets/scss/style.css">
 <link href="/assets/admin/assets/css/lib/vector-map/jqvmap.min.css" rel="stylesheet">

resources/views/layouts/admin/sidebar.blade.php

@@ -55,14 +55,14 @@
               <li class="menu-item-has-children dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-area-chart"></i>{{ trans('admin/sidebar.stats_title')}}</a>
                   <ul class="sub-menu children dropdown-menu">
-                      <li><i class="menu-icon fa fa-map-o"></i><a href="maps-gmap.html">Google Maps</a></li>
+                      <li><i class="menu-icon fa fa-map-o"></i><a href="/admin/log">Liste des activitées</a></li>
                       <li><i class="menu-icon fa fa-street-view"></i><a href="maps-vector.html">Vector Maps</a></li>
                   </ul>
               </li>
               <li class="menu-item-has-children dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-users"></i>{{ trans('admin/sidebar.users_title')}}</a>
                     <ul class="sub-menu children dropdown-menu">
-                        <li><i class="menu-icon fa fa-map-o"></i><a href="maps-gmap.html">Google Maps</a></li>
+                        <li><i class="menu-icon fa fa-map-o"></i><a href="/admin/log">Activitées des utilisateurs</a></li>
                         <li><i class="menu-icon fa fa-street-view"></i><a href="maps-vector.html">Vector Maps</a></li>
                     </ul>
                 </li>

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');

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 () {
 

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();