diff --git a/SRC/app/AssoListeAJeu.php b/SRC/app/AssoListeAJeu.php new file mode 100644 index 0000000..888e7c8 --- /dev/null +++ b/SRC/app/AssoListeAJeu.php @@ -0,0 +1,10 @@ +droits = (Input::get('isadmin'))?1:0; $user->city = Input::get('city'); $user->lastname = Input::get('lastname'); - $user->image = "pictures/user_picture/default.png"; + $user->image = "pictures/user_picture/default.jpg"; $user->save(); return redirect('/admin')->with('message_add', 'User ajouté avec succès'); diff --git a/SRC/app/Http/Controllers/ReferentController.php b/SRC/app/Http/Controllers/ReferentController.php index b44e8b4..058e7e1 100755 --- a/SRC/app/Http/Controllers/ReferentController.php +++ b/SRC/app/Http/Controllers/ReferentController.php @@ -3,6 +3,9 @@ use App\User; use Input; use Request; +use App\ListeOeuvre; +use App\AssoListeAOeuvre; + class ReferentController extends Controller { @@ -26,11 +29,16 @@ class ReferentController extends Controller { { $me = User::current(); $user = User::all(); - return view('referent', ['nameRoute' => 'Référent', 'me' => $me]); + + // List Oeuvre of one user + $sessions = ListeOeuvre::currentUser()->get(); + echo $sessions[0]->oeuvres()->get(); + + //return view('referent', ['nameRoute' => 'Référent', 'me' => $me, 'sessions' => $sessions]); } /** - * updateUser an user in database. + * updateUser an user informations in database. * * */ @@ -53,6 +61,44 @@ class ReferentController extends Controller { $user->save(); return redirect('/referent')->with('message_update', 'Referent mis à jour avec succès'); - } + } + + /** + * create a new session + * + */ + public function addSession() + { + // TODO + $ListeOeuvre = new ListeOeuvre; + $ListeOeuvre->idusers = 2; + $ListeOeuvre->nom = "Linux"; + $ListeOeuvre->etat = 1; + $ListeOeuvre->save(); + + $assolistaoeuvre = new AssoListeAOeuvre; + $assolistaoeuvre->liste_oeuvre_id = 1; + $assolistaoeuvre->oeuvre_id = 1; + $assolistaoeuvre->save(); + + $assolistaoeuvre2 = new AssoListeAOeuvre; + $assolistaoeuvre2->liste_oeuvre_id = 1; + $assolistaoeuvre2->oeuvre_id = 2; + $assolistaoeuvre2->save(); + } + + + /** + * get all user sessions + * + */ + private function getSessions() + { + // TODO + } + + + + } diff --git a/SRC/app/Http/routes.php b/SRC/app/Http/routes.php index effc392..d14cd14 100755 --- a/SRC/app/Http/routes.php +++ b/SRC/app/Http/routes.php @@ -36,6 +36,8 @@ Route::group(['middleware' => 'auth'], function () Route::get('referent', 'ReferentController@index'); Route::get('logout', 'LoginController@logout'); Route::post('update', 'ReferentController@update'); + + Route::post('addSession', 'ReferentController@addSession'); }); Route::group(['middleware' => 'admin'], function () diff --git a/SRC/app/Jeu.php b/SRC/app/Jeu.php new file mode 100644 index 0000000..e365a2b --- /dev/null +++ b/SRC/app/Jeu.php @@ -0,0 +1,10 @@ +belongsToMany('App\Oeuvre', 'assolisteaoeuvre'); + } + + public function jeux() + { + return $this->belongsToMany('App\Jeu', 'assolisteajeu'); + } + + public function scopeCurrentUser($query) + { + $idUser = Auth::user()->id; + return $query->where('idusers', $idUser); + } +} diff --git a/SRC/app/Oeuvre.php b/SRC/app/Oeuvre.php new file mode 100644 index 0000000..ac09b01 --- /dev/null +++ b/SRC/app/Oeuvre.php @@ -0,0 +1,10 @@ +email; - return $query->where('email', $email)->first(); + $idUser = Auth::user()->id; + return $query->where('id', $idUser)->first(); } public function scopeReferents($query) diff --git a/SRC/init/table.sql b/SRC/init/table.sql index fab9dd5..27a9788 100644 --- a/SRC/init/table.sql +++ b/SRC/init/table.sql @@ -106,23 +106,22 @@ CREATE TABLE oeuvre ( ); CREATE TABLE assodesignationaoeuvre ( - idoeuvre INT NOT NULL, - iddesignation INT NOT NULL, - PRIMARY KEY (iddesignation,idoeuvre), - FOREIGN KEY (iddesignation) REFERENCES designation(iddesignation), - FOREIGN KEY (idoeuvre) REFERENCES oeuvre(idoeuvre) + oeuvre_id INT NOT NULL, + designation_id INT NOT NULL, + PRIMARY KEY (designation_id,oeuvre_id), + FOREIGN KEY (designation_id) REFERENCES designation(iddesignation), + FOREIGN KEY (oeuvre_id) REFERENCES oeuvre(idoeuvre) ); CREATE TABLE assoauteuraoeuvre ( - idoeuvre INT NOT NULL, - idauteur INT NOT NULL, - PRIMARY KEY (idauteur,idoeuvre), - FOREIGN KEY (idauteur) REFERENCES auteur(idauteur), - FOREIGN KEY (idoeuvre) REFERENCES oeuvre(idoeuvre) + oeuvre_id INT NOT NULL, + auteur_id INT NOT NULL, + PRIMARY KEY (auteur_id,oeuvre_id), + FOREIGN KEY (auteur_id) REFERENCES auteur(idauteur), + FOREIGN KEY (oeuvre_id) REFERENCES oeuvre(idoeuvre) ); - CREATE TABLE listeoeuvre ( idlisteoeuvre INT NOT NULL AUTO_INCREMENT, idusers INT NOT NULL, @@ -135,23 +134,21 @@ CREATE TABLE listeoeuvre ( ); CREATE TABLE assolisteaoeuvre ( - idlisteoeuvre INT NOT NULL, - idoeuvre INT NOT NULL, - PRIMARY KEY (idlisteoeuvre,idoeuvre), - FOREIGN KEY (idlisteoeuvre) REFERENCES listeoeuvre(idlisteoeuvre), - FOREIGN KEY (idoeuvre) REFERENCES oeuvre(idoeuvre) + liste_oeuvre_id INT NOT NULL, + oeuvre_id INT NOT NULL, + PRIMARY KEY (liste_oeuvre_id,oeuvre_id), + FOREIGN KEY (liste_oeuvre_id) REFERENCES listeoeuvre(idlisteoeuvre), + FOREIGN KEY (oeuvre_id) REFERENCES oeuvre(idoeuvre) ); CREATE TABLE assolisteajeu ( - idlisteoeuvre INT NOT NULL, - idjeu INT NOT NULL, - PRIMARY KEY (idlisteoeuvre,idjeu), - FOREIGN KEY (idlisteoeuvre) REFERENCES listeoeuvre(idlisteoeuvre), - FOREIGN KEY (idjeu) REFERENCES jeu(idjeu) + liste_oeuvre_id INT NOT NULL, + jeu_id INT NOT NULL, + PRIMARY KEY (liste_oeuvre_id,jeu_id), + FOREIGN KEY (liste_oeuvre_id) REFERENCES listeoeuvre(idlisteoeuvre), + FOREIGN KEY (jeu_id) REFERENCES jeu(idjeu) ); - - CREATE TABLE description ( iddescription INT NOT NULL AUTO_INCREMENT, idoeuvre INT NOT NULL, diff --git a/SRC/public/css/app.css b/SRC/public/css/app.css index a1efff6..7c9e104 100755 --- a/SRC/public/css/app.css +++ b/SRC/public/css/app.css @@ -3,6 +3,8 @@ html { font-family: sans-serif; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; + height: 100%; + width: 100% } body { margin: 0; @@ -5349,13 +5351,13 @@ a.list-group-item-danger.active:focus { padding-bottom: 75%; } .well { - min-height: 20px; + min-height: 10px; padding: 19px; margin-bottom: 20px; background-color: #015402; color : white; font-weight: bold; - font-size: 25px; + font-size: 15px; border: 5px solid #7F2403; border-radius: 4px; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05); @@ -5365,10 +5367,10 @@ a.list-group-item-danger.active:focus { border-color: rgba(0, 0, 0, 0.15); } .well-lg { - padding: 24px; + padding: 15px; margin: 5%; - margin-left : 25%; - margin-right: 25%; + margin-left : 40%; + margin-right: 40%; border-radius: 6px; } @@ -6263,4 +6265,6 @@ body, label, .checkbox label { font-weight: 300; -} \ No newline at end of file +} + +html, body, a, a:hover { cursor:url('http://www.snazzyspace.com/cursorsfolder/mickey-big-pointer.png'), auto !important; } diff --git a/SRC/resources/views/admin.blade.php b/SRC/resources/views/admin.blade.php index 536cc65..a691134 100755 --- a/SRC/resources/views/admin.blade.php +++ b/SRC/resources/views/admin.blade.php @@ -2,8 +2,19 @@ @section('content') -{{ Session::get('message_add') }} -{{ Session::get('message_delete') }} +
+ @if (session('message_add')) +
+ {{ Session::get('message_add') }} +
+ @endif + + @if (session('message_delete')) +
+ {{ Session::get('message_delete') }} +
+ @endif +

diff --git a/SRC/resources/views/home.blade.php b/SRC/resources/views/home.blade.php index d311dbf..b9d92f1 100755 --- a/SRC/resources/views/home.blade.php +++ b/SRC/resources/views/home.blade.php @@ -38,8 +38,8 @@
@endif
- {{ $ref -> name }}-Nom -
{{$ref -> firstname}}, {{$ref -> lastname}}
+ {{ $ref -> name }}-Nom +
{{$ref -> firstname}}, {{$ref -> lastname}}
@endforeach @@ -55,12 +55,8 @@ - - @endsection diff --git a/SRC/resources/views/referent.blade.php b/SRC/resources/views/referent.blade.php index 1433150..c9c4e9f 100755 --- a/SRC/resources/views/referent.blade.php +++ b/SRC/resources/views/referent.blade.php @@ -18,26 +18,12 @@

Mes sessions: + @foreach ($sessions as $session) - - - - - - - - - - - - - - - - - + + @endforeach
FalbalaSupprimer
bibloSupprimer
TralalaSupprimer
RedminSupprimer
Vive arch linux{{$session->nom}} Supprimer