From 880652df04c782e0da1927c899a0b76573809ad3 Mon Sep 17 00:00:00 2001 From: Malibu Date: Wed, 4 Mar 2015 19:36:23 +0100 Subject: [PATCH] modified: SRC/app/Http/Controllers/ReferentController.php modified: SRC/app/Http/routes.php modified: SRC/public/js/ListeOeuvre.js modified: SRC/resources/views/referent.blade.php --- .../Http/Controllers/ReferentController.php | 32 ++++--------------- SRC/app/Http/routes.php | 1 + SRC/public/js/ListeOeuvre.js | 22 +++++++++++-- SRC/resources/views/referent.blade.php | 2 +- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/SRC/app/Http/Controllers/ReferentController.php b/SRC/app/Http/Controllers/ReferentController.php index 0dbdc9b..f8a32a3 100755 --- a/SRC/app/Http/Controllers/ReferentController.php +++ b/SRC/app/Http/Controllers/ReferentController.php @@ -168,33 +168,15 @@ class ReferentController extends Controller { $ListeOeuvre->jeux()->sync($table); } + public function getAssoGames($id) { + + $ListeOeuvre = ListeOeuvre::find($id); + return Response::json($ListeOeuvre->jeux()->get()->toArray()); + } + public function getImage($filename) { - // Append the filename to the path where our images are located - $path = Config::get('view.images') . $filename; - print($path); - - // Initialize an instance of Symfony's File class. - // This is a dependency of Laravel so it is readily available. - $file = new Symfony\Component\HttpFoundation\File\File($path); - - // Make a new response out of the contents of the file - // Set the response status code to 200 OK - $response = Response::make( - File::get($path), - 200 - ); - - // Modify our output's header. - // Set the content type to the mime of the file. - // In the case of a .jpeg this would be image/jpeg - $response->header( - 'Content-type', - $file->getMimeType() - ); - - // We return our image here. - return $response; + // TODO } } diff --git a/SRC/app/Http/routes.php b/SRC/app/Http/routes.php index ac46dfb..9461af3 100755 --- a/SRC/app/Http/routes.php +++ b/SRC/app/Http/routes.php @@ -45,6 +45,7 @@ Route::group(['middleware' => 'auth'], function () Route::post('search', 'ReferentController@search'); Route::post('addItemsToList', 'ReferentController@addItemsToList'); Route::post('updateAssoGames', 'ReferentController@updateAssoGames'); + Route::get('getAssoGames/{id}', 'ReferentController@getAssoGames'); Route::get('showPic/{file}', 'ReferentController@getImage'); }); diff --git a/SRC/public/js/ListeOeuvre.js b/SRC/public/js/ListeOeuvre.js index 1a090d8..8ffd051 100755 --- a/SRC/public/js/ListeOeuvre.js +++ b/SRC/public/js/ListeOeuvre.js @@ -22,8 +22,25 @@ $('.listeoeuvre').click(function(event) { $('.listeoeuvre').removeClass("active"); $(this).addClass("active"); $('#oeuvrePic').empty(); - url = "/showListOeuvres/" + $(this).children('.idListeOeuvre').val(); + // asso games + url = "/getAssoGames/" + $(this).children('.idListeOeuvre').val(); + var p = new XMLHttpRequest(); + p.open("GET", url, true); + p.onreadystatechange = function () { + if (p.readyState != 4 || p.status != 200) + return; + var data2 = JSON.parse(p.response); + $( ".checkboxGame" ).prop( "checked", false); + + for (el in data2) { + id = data2[el].id; + $('#checkbox' + id).prop( "checked", true ); + } + }; + p.send(); + + url = "/showListOeuvres/" + $(this).children('.idListeOeuvre').val(); var r = new XMLHttpRequest(); r.open("GET", url, true); r.onreadystatechange = function () { @@ -42,7 +59,6 @@ $('.listeoeuvre').click(function(event) { } }; r.send(); - }); @@ -152,7 +168,7 @@ $('.checkbox').click(function(event) { return $(this).val(); }).get(); - var searchValues = $("input#checkbox").map(function(){ + var searchValues = $(".checkboxGame").map(function(){ return $(this).is(":checked"); }).get(); diff --git a/SRC/resources/views/referent.blade.php b/SRC/resources/views/referent.blade.php index cd62b8c..195baa6 100755 --- a/SRC/resources/views/referent.blade.php +++ b/SRC/resources/views/referent.blade.php @@ -189,7 +189,7 @@