v3.0.7a

app/Http/Controllers/FilesController.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class FilesController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return view('admin.files.index');
+    }
+
+    /**
+     * 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)
+    {
+        //
+    }
+}

app/Http/Controllers/MessageController.php

@@ -78,22 +78,8 @@ class MessageController extends Controller
      */
     public function show($id)
     {   
-        $this_msg = Message::find($id);
+        \Auth::User()->seenMessage($id);
-
+        return view('admin.message.show', ['message' => Message::find($id)]);    
-        if(isset($this_msg->data['as_seen']))
-        {
-            if (!strpos($this_msg->data['as_seen'],"-".\Auth::user()->id."-")) {
-            $data = [
-                'as_seen' => $this_msg->data['as_seen']."-".\Auth::user()->id."-",
-                'parameter' => $this_msg->data['parameter']
-            ];
-            
-            $this_msg->data = $data;
-
-            $this_msg->save();
-            }
-        }
-        return view('admin.message.show', ['message' => $this_msg]);    
     }
 
     /**

app/User.php

@@ -236,4 +236,27 @@ class User extends Authenticatable
         }
         return $nbClasse;
     }
+
+    public function seenMessage($id)
+    {
+        $this_msg = Message::find($id);
+
+        if(isset($this_msg->data['as_seen']))
+        {
+            $as_seen = explode("-",$this_msg->data['as_seen']);
+            if (array_search(strval($this->id),$as_seen) === false) {
+                array_push($as_seen,$this->id);
+            }
+            $as_seen = array_filter($as_seen);
+            $as_seen_str = implode('-',$as_seen);
+            $data = [
+                'as_seen' => $as_seen_str,
+                'parameter' => $this_msg->data['parameter']
+            ];
+            
+            $this_msg->data = $data;
+
+            $this_msg->save();
+        }
+    }
 }

public/assets/admin/assets/scss/style.css

@@ -2253,6 +2253,7 @@ header .form-inline {
   vertical-align: middle !important;
   border: solid 1px #d9d9d9 !important;
   padding: 0px !important;
+  background-color: white;
 }
 .calendar-date{
   float: left;

resources/views/admin/dashboard.blade.php

@@ -73,7 +73,7 @@
                 </div>
                 @endif
             @foreach ($futureEvent as $event)
-                <div class="col-md-6 col-sm-12"><i class="fa fa-star" aria-hidden="true" style="color:gold"></i> {{$event->data['event_name']}}</div>
+                <div class="col-md-6 col-sm-12"><i class="fa fa-star" aria-hidden="true" style="color:gold"></i> {{$event->data['event_name']}}<div class="float-right">{{$event->data['event_begin_time']}}</div></div>
             @endforeach
             </div>
             <br>
@@ -116,7 +116,7 @@
             @endforeach
             </div>
             <br>
-            <a href="/admin/admin/message" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
+            <a href="/admin/message" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
         </div>
     </div>
 </div>

resources/views/admin/files/index.blade.php

@@ -0,0 +1,153 @@
+@extends('layouts.admin.main')
+
+@section('content')
+<div class="col-md-12">
+    <div class="card">
+        <div class="card-header">
+            <strong class="card-title">Fichiers <a href="#"><i class="fa fa-question-circle" aria-hidden="true"></i>
+            </a></strong>
+        </div>
+        <div class="card-body">
+            <div class="content table-responsive table-full-width">
+                <p>Les fichiers si dessous sont disponible autant dans l'espace administration que dans l'espace cadet cadre.
+                <table class="table">
+                    <thead>
+                        <tr><th style="width:85%;">Nom</th>
+                        <th></th>
+                    </tr></thead>
+                    <tbody>
+                        <tr>
+                            <td><strong>Ordre d'opération</strong><hr></td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <td>Mini Ordre Operation Projet Soirée Journée Vierge</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1sqkeUp-djZDjltitGvjR0efMQgyB_sos">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Mini Ordre Operation Vierge</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1RjSSwK9NIVUFbHKlu0hbkK5IeTnAFWq9">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td><strong>Tenues</strong><hr></td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <td>Liste des tenues</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1JUXaPQhHGJffE7CTnB1BAkqwM8g9t8ef">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td><strong>Énoncé de fonction</strong><hr></td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <td>Cadet commandant</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1DdI9eOptKarpApsUdO-6gkDFYtD6DHi8">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Cadet commandant adjoint</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1jDuKQzY3Dam0J9mSGDWiv2I1agDYacRm">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Chef entrainement</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=12p8rGhSZloPFurD--RZO9KQVoRmXAEnE">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Instructeur sénior</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=13fNufhR2hYhKgeiHUo0W_V-vF_W8SPkC">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Instructeur</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1Y1gEsNP7mz2SmJPwxi7YUfpxgioJKvR0">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Assistant Instructeur</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1BxKj0J20QZ5hVQ1womwS8GUWvuq-VsJy">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Commandant de section</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1jOmyNFZ2rSOwCFjcoABx6VFcvEMKCf73">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Commandant de la garde</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=18T3rQQ-RN551meOGGPD8Ni2wbpvKNfYz">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Commandant adjoint de section</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1A5NkPhSJ5E-bIPiLRwa7VAOXQrrHIzn6">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Commandant adjoint de garde</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1ncphhTpBm9uhq0isGFNzDs_-TRPrxfKw">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Cadet cadre de la logistique</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1PcmlegtAqmdX2ufGQMubkNxfkrCcSIge">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Cadet cadre de l'administration</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1haEG9jSabp10VtI7EV2OyLctn9-63T8G">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Commandant adjoint de section</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1A5NkPhSJ5E-bIPiLRwa7VAOXQrrHIzn6">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td><strong>Divers</strong><hr></td>
+                            <td></td>
+                        </tr>
+                        <tr>
+                            <td>Information NECPC</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1KG0IoPxpqctqqVwCfM0WyKq4y6RDBtUJ">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Évaluation pratique sur la coordination d’un ordre d’opération sur le terrain</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1AAPB7IdpIw8UGJwIoTNQZ3cg9ODfWrAp">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>RENCONTRE PRÉILIMINAIRE D’INSTRUCTION</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=16lT4YzNjGWd2SFmgSbmj1LcPG9cDkkyo">Télécharger</a></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </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>Fichiers</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">Fichiers</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>
+
+@endsection

resources/views/ecc/list.blade.php

@@ -20,7 +20,7 @@
                 <div class="row">
                     <div class="text-center">
                         <div class="col-sm-6" style="padding:3rem;">
-                            <p>Liste nominative des cadets<br><br><div class="row"><div class="col-md-6 col-sm-12"><a href="#" target="_blank" class="btn btn-block btn-info">Télécharger</a></div></div></p>
+                            <p>Liste nominative des cadets<br><br><div class="row"><div class="col-md-6 col-sm-12"><a href="https://drive.google.com/open?id=1gEknIEu17Gkfp50ja8cJWvxWLJ2R0KEQ" target="_blank" class="btn btn-block btn-info">Télécharger</a></div></div></p>
                         </div>
                     </div>
                 </div>

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

@@ -23,6 +23,9 @@
                       <li><i class="menu-icon fa fa-times"></i><a href="/admin/message">Supprimer un message</a></li>
                   </ul>
               </li>
+              <li>
+                <a href="/admin/files"> <i class="menu-icon fa fa-file"></i>Fichiers </a>
+                </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-map"></i>{{ trans('admin/sidebar.blueprint')}}</a>
                   <ul class="sub-menu children dropdown-menu">

routes/web.php

@@ -92,6 +92,8 @@ Route::middleware(['auth','admin'])->group(function () {
         Route::get('/admin/profil/edit/avatar/{id}' , 'UserController@editUserAvatar');
         Route::get('/admin/profil/{id?}' , 'UserController@showUserProfil');
 
+        /** Files */
+        Route::get('/admin/files','FilesController@index');
 });
 
 Route::middleware(['auth','staff'])->group(function () {