diff --git a/src/WebApp/application/views/best_films.php b/src/WebApp/application/views/best_films.php index 6eaef3f6ab8d0fc986d76739cbea0a909012d20c..dbac6f39c35285000f11f21bd7d27529060dfe60 100644 --- a/src/WebApp/application/views/best_films.php +++ b/src/WebApp/application/views/best_films.php @@ -74,7 +74,7 @@ include('getMovie.php'); <div class="collapse navbar-collapse" id="navbarResponsive"> <ul class="navbar-nav ml-auto"> <li class="nav-item"> - <a class="nav-link js-scroll-trigger" href="#filtre">Filtre</a> + <a class="nav-link js-scroll-trigger" href="#filter">Filtre</a> </li> <li class="nav-item"> <a class="nav-link js-scroll-trigger" href="#class">Classement</a> @@ -97,14 +97,13 @@ include('getMovie.php'); <div class="container"> - <div id="class" class="row align-items-center no-gutters mb-4 mb-lg-5"> + <div id="filter" class="row align-items-center no-gutters mb-4 mb-lg-5"> <div class="featured-text text-center text-lg-left"> - <h1>Les films les mieux notés</h1> <center><form method="POST" action="best_films" name="formulaire"> <div class="form-group"> <!--<input type = submit class="btn btn-primary js-scroll-trigger " href="#projects" value = "Cliquez ici pour générer un film2 aléatoire">--> - <label for="film"><a class="btn btn-primary js-scroll-trigger" href="#projects" onclick="document.formulaire.submit();return false;" type="submit">Cliquez ici pour actualiser le classement</a> + <label for="film"> <br /><br /><select name="genre" class="form-control flex-fill mr-0 mr-sm-2 mb-3 mb-sm-0" id="genre" style="text-align:center"> <option value="">Tous les genres</option> <option value=18>Action</option> @@ -116,25 +115,33 @@ include('getMovie.php'); <option value=878>Science-Fiction</option> </select> <br/> - + <label>Voir les films sortis entre <input type="number" name="min_year" min="1937" max="2018" value="<?php + if (isset($_POST["min_year"])){echo $_POST["min_year"];} else {echo 1937;}?>"/> et + <input type="number" name="max_year" min="1938" max="2019" value="<?php + if (isset($_POST["max_year"])){echo $_POST["max_year"];} else {echo 2019;}?>" /></label> + <br/><br/> + <a class="btn btn-primary js-scroll-trigger" href="#projects" onclick="document.formulaire.submit();return false;" type="submit">Cliquez ici pour actualiser le classement</a> </label> </div> </form></center> <?php - if (isset($_POST["genre"])) + if (!isset($_POST["genre"])) + { + $_POST["genre"]=""; + } + if (!isset($_POST["min_year"])) { - echo $_POST["genre"]; - $array=getBestMovieArray(($_POST["genre"])); + $_POST["min_year"]=""; } - else + if (!isset($_POST["max_year"])) { - echo "test"; - $array=getBestMovieArray(""); + $_POST["max_year"]=""; } + $array=getBestMovieArray(($_POST["genre"]),$_POST["min_year"],$_POST["max_year"]); ?> - <div> + <div id="class"> <table class="table borderless"> <tbody> <tr> @@ -143,7 +150,7 @@ include('getMovie.php'); for($k=0; $k<1; $k++) { echo('<tr>'); - for ($i = (0+5*$k); $i < (5+5*$k); $i++) { + for ($i = (0+5*$k); $i < min(5+5*$k,count($array)); $i++) { echo('<td><br/><a href="fiche_film?id='.$array[$i]['id'].'" onclick="$(\'.loading\').fadeIn(1);"><img class="img-fluid img-thumbnail" width="100%" src="https://image.tmdb.org/t/p/w500/'.$array[$i]['poster_path'].'" alt="affiche du film"> <br/><br/><b><center>'.($i+1).'- '.$array[$i]['title'].'</center></b></a> </td>'); } echo('</tr>'); @@ -157,9 +164,9 @@ include('getMovie.php'); <tr> <br/> <?php - for($k=1; $k<4; $k++) + for($k=1; $k<4 ; $k++) { - for ($i = (0+5*$k); $i < (5+5*$k); $i++) { + for ($i = (0+5*$k); $i < min(5+5*$k,count($array)); $i++) { echo('<tr>'); echo('<td><a href="fiche_film?id='.$array[$i]['id'].'" onclick="$(\'.loading\').fadeIn(1);"> <b><center>'.($i + 1).'- '.$array[$i]['title'].'</center></b></a></td>'); echo('</tr>'); diff --git a/src/WebApp/application/views/getMovie.php b/src/WebApp/application/views/getMovie.php index 47bcd7209d91e6711515893ed9b8c6fabbecaf0b..13fa06221076fef1a4d11861b5f266a5285aa7bf 100644 --- a/src/WebApp/application/views/getMovie.php +++ b/src/WebApp/application/views/getMovie.php @@ -48,9 +48,9 @@ function getMovieRecommendationArray($id) return $movie_array; } -function getBestMovieArray($genre) +function getBestMovieArray($genre,$min_y,$max_y) { - $tmdb_url='https://api.themoviedb.org/3/discover/movie?api_key=7ac6810245f15284418f2a15b9b22225&with_genres=' . $genre . 'language=fr-FR&sort_by=vote_average.desc&vote_count.gte=10000'; + $tmdb_url='https://api.themoviedb.org/3/discover/movie?api_key=7ac6810245f15284418f2a15b9b22225&language=fr-FR&with_genres=' . $genre . '&sort_by=vote_average.desc&vote_count.gte=3000&primary_release_date.gte=' .$min_y . '&primary_release_date.lte=' .$max_y.''; $movie_json = file_get_contents($tmdb_url); $movie_array = json_decode($movie_json, true);