diff --git a/INITBASE/loader.py b/INITBASE/loader.py index 6052bf9..c16fb06 100755 --- a/INITBASE/loader.py +++ b/INITBASE/loader.py @@ -4,6 +4,7 @@ import MySQLdb as mdb import sys import re import httplib +import sys def exists(site, path): c = httplib.HTTPConnection(site) @@ -50,7 +51,7 @@ try : # Pour chaque oeuvre for o in root.iter('oeuvre'): - print ".", + sys.stdout.write('.') idtechnique = "NULL" idmatiere = "NULL" iddomaine= "NULL" diff --git a/SRC/app/Http/Controllers/GameController.php b/SRC/app/Http/Controllers/GameController.php index d1eb1a6..d3722a0 100755 --- a/SRC/app/Http/Controllers/GameController.php +++ b/SRC/app/Http/Controllers/GameController.php @@ -5,6 +5,7 @@ use App\Referent; use App\ConfigJeu; use App\Oeuvre; use Cookie; + class GameController extends Controller { /** @@ -23,8 +24,10 @@ class GameController extends Controller { * @return Response */ public function chooseDifMemo() { - $nbOr = Cookie::get('referent'); - return view('frontend/memo_level', ['nbOr' => $nbOr]); + return view('frontend/memo_level'); + } + public function chooseDifPuzzle() { + return view('frontend/puzzle_level'); } public function playMemo($niveau) { @@ -43,98 +46,30 @@ class GameController extends Controller { return view('frontend/memo', ['oeuvres' => $oes, 'niveau' => $niveau, 'nbBloc'=>$bloc]); } - public function chooseDifPuzzle() { - return view('frontend/puzzle_level'); - } public function playPuzzle($niveau) { + try { + $idRef = Cookie::get('referent'); + $ref = Referent::findOrFail($idRef); + $configjeu = $ref->configjeu()->where('actifPuzzle', '=', '1')->firstOrFail(); - $idRef = Cookie::get('referent'); - $ref = Referent::find($idRef); - - $configjeu = $ref->configjeu()->where('actifPuzzle', '=', '1')->first(); - - if($configjeu && count($configjeu->oeuvres) >= 1) { - $oes = $configjeu->oeuvres; - $params = json_decode($configjeu->parametres); - $nbTab = $params->pt; - $dimension = $params->{ "p".$niveau}; - - } else { - $oes = Oeuvre::orderByRaw("RAND()")->take(5)->get(); + if(count($configjeu->oeuvres->count()) >= 1) { + $oes = $configjeu->oeuvres()->select('image')->get(); + $params = json_decode($configjeu->parametres); + $nbTab = $params->pt; + $dimension = $params->{"p" . $niveau}; + if(!(isset($dimension) && is_numeric($dimension))) throw new ModelNotFoundException(); + } else throw new ModelNotFoundException(); + } catch(ModelNotFoundException $e) { + $oes = Oeuvre::orderByRaw("RAND()")->take(5)->select('image')->get(); $nbTab = 3; $dimension = 2; } - - return view('frontend/puzzle', ['oeuvres' => $oes, 'dimension' => $dimension, 'nbTab' => $nbTab]); - - } - public function index() - { - $res = User::referents()->get(); - return view('home',['referent' => $res]); - } - - public function findReferents($reg) { - - $res = User::referents()->name($reg)->get(); - return Response::json($res->toArray()); - } - - /** - * Show referent games - * - * @param String $id - * @return Response - */ - public function showReferentGames($id) - { - $listeOeuvre = $ListeOeuvre = ListeOeuvre::ofUser($id)->activeListOeuvre()->first(); - if($listeOeuvre == '') - $games = []; - else - $games = $listeOeuvre->jeux()->get(); - - return view('referent_games', ['games' => $games]); + return view('frontend/puzzle', ['oeuvres' => $oes, 'dimension' => $dimension, 'nbTab' => $nbTab, 'niveau' => $niveau]); } - /** - * Show one referent game - * - * @param String $id - * @param String $idGame - * @return Response - */ - public function showOneReferentGame($id, $idGame) - { - return view('one_referent_game', ['referent' => $id, 'game' => $idGame]); + public function index() { + $res = User::referents()->get(); + return view('home', ['referent' => $res]); } - - public function setRecords($idTrophee) { - - $values = Cookie::get('trophee'); - - if ($values === false) - $values = [0, 0, 0]; - - switch ($idTrophee) { - - case '1': - $values[0]++; - break; - - case '2': - $values[1]++; - break; - - case '3': - $values[2]++; - break; - - default: - break; - } - $response->withCookie(Cookie::forever('trophee', $values)); - } - } diff --git a/SRC/resources/views/frontend/puzzle.blade.php b/SRC/resources/views/frontend/puzzle.blade.php index 1c6d425..d826d94 100755 --- a/SRC/resources/views/frontend/puzzle.blade.php +++ b/SRC/resources/views/frontend/puzzle.blade.php @@ -180,6 +180,7 @@ trophee.alpha = 0; tween = game.add.tween(trophee).to( { alpha: 1 }, 1000).start(); setTimeout(function(){ + location.href ="{{URL::to('setRecords')}}" + "/" + trophy; location.href = "{{URL::to('puzzle/jouer')}}" + "/" + trophy; }, 5000); // TODO appel ajax