From 439888f0dbcfe3e47121f927f29c2b82792210bc Mon Sep 17 00:00:00 2001 From: Malibu Date: Thu, 26 Feb 2015 12:04:25 +0100 Subject: [PATCH] modified: SRC/app/Http/Controllers/ReferentController.php modified: SRC/public/js/ListeOeuvre.js modified: SRC/resources/views/referent.blade.php --- .../Http/Controllers/ReferentController.php | 5 ++++- SRC/public/js/ListeOeuvre.js | 21 +++++++++++++++++- SRC/resources/views/referent.blade.php | 22 +++++-------------- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/SRC/app/Http/Controllers/ReferentController.php b/SRC/app/Http/Controllers/ReferentController.php index 6a3afdd..082d19f 100755 --- a/SRC/app/Http/Controllers/ReferentController.php +++ b/SRC/app/Http/Controllers/ReferentController.php @@ -11,6 +11,7 @@ use App\Models\Domaine; use App\Models\Matiere; use App\Models\Technique; use App\Models\Oeuvre; +use App\Models\Jeu; use Response; @@ -36,6 +37,7 @@ class ReferentController extends Controller { { $me = User::current(); $user = User::all(); + $games = Jeu::all(); $dataSearch = []; $dataSearch['auteur'] = Auteur::orderBy('nom')->get(); @@ -45,7 +47,7 @@ class ReferentController extends Controller { $dataSearch['technique'] = Technique::orderBy('nom')->get(); $listeoeuvres = ListeOeuvre::currentUser()->get(); - return view('referent', ['nameRoute' => 'Référent', 'me' => $me, 'listeoeuvres' => $listeoeuvres, 'data' => $dataSearch]); + return view('referent', ['nameRoute' => 'Référent', 'me' => $me, 'listeoeuvres' => $listeoeuvres, 'data' => $dataSearch, 'games' => $games]); } /** @@ -129,6 +131,7 @@ class ReferentController extends Controller { $fin = (Input::get('fin'))?Input::get('fin'): ''; $res = Oeuvre::authorFilter($auteurs) + ->techniqueFilter($techniques) ->designationFilter($designations) ->domaineFilter($domaines) ->matiereFilter($matieres) diff --git a/SRC/public/js/ListeOeuvre.js b/SRC/public/js/ListeOeuvre.js index 8105af3..bd93805 100644 --- a/SRC/public/js/ListeOeuvre.js +++ b/SRC/public/js/ListeOeuvre.js @@ -1,6 +1,7 @@ //Selection d'une recherche d'oeuvre $('.listeoeuvre').click(function() { + $('#oeuvrePic').empty(); url = "/showListOeuvres/" + $(this).children('.idListeOeuvre').val(); $.get(url, function( data ) { @@ -127,7 +128,25 @@ $('#search_button, #previous, #next').click(function(event) { - +// Mettre à jour les jeux associés à la liste d'oeuvre +$('.checkbox').click(function(event) { + + var searchIDs = $("input#idGame").map(function(){ + return $(this).val(); + }).get(); + + var searchValues = $("input#checkbox").map(function(){ + return $(this).is(":checked"); + }).get(); + + r = []; + for (i = 0; i < searchIDs.length; i++) { + r[searchIDs[i]] = searchValues[i]; + } + + console.log(r); + +}); diff --git a/SRC/resources/views/referent.blade.php b/SRC/resources/views/referent.blade.php index cc9c1f0..29dc854 100755 --- a/SRC/resources/views/referent.blade.php +++ b/SRC/resources/views/referent.blade.php @@ -66,26 +66,16 @@
Mes jeux associés - + @foreach($games as $game)
+ - - - - -
+
+ @endforeach