diff --git a/application/models/Model_music.php b/application/models/Model_music.php index c1c171d..2faa37f 100644 --- a/application/models/Model_music.php +++ b/application/models/Model_music.php @@ -55,16 +55,20 @@ class Model_music extends CI_Model { $this->db->distinct("artist.name"); - if(!empty($genre)){ + if (!empty($genre)) { $this->db->where('genre.name', $genre); } - if($order == 'asc' || $order == 'desc'){ - $this->db->order_by('artist.name',$order ); + if ($order == 'asc' || $order == 'desc') { + $this->db->order_by('artist.name', $order); } - $query = $this->db->get(); - return $query->result(); + if (!empty($query)) { + $this->db->like('artist.name', $query); + } + + $result = $this->db->get(); + return $result->result(); } public function getMusics($genre = '', $order = '', $artist = '') { @@ -77,20 +81,24 @@ class Model_music extends CI_Model { $this->db->join('cover', 'cover.id = album.coverid'); $this->db->limit(100); - if(!empty($genre)){ + if (!empty($genre)) { $this->db->where('genre.name', $genre); } - if(!empty($artist)){ + if (!empty($artist)) { $this->db->where('artist.name', $artist); } - if($order == 'asc' || $order == 'desc'){ - $this->db->order_by('song.name',$order ); + if ($order == 'asc' || $order == 'desc') { + $this->db->order_by('song.name', $order); } - $query = $this->db->get(); - return $query->result(); + if (!empty($query)) { + $this->db->like('song.name', $query); + } + + $result = $this->db->get(); + return $result->result(); } // Suppression de la deuxième méthode researchtype diff --git a/application/views/layout/getter.php b/application/views/layout/getter.php index 11c8683..82182bc 100644 --- a/application/views/layout/getter.php +++ b/application/views/layout/getter.php @@ -12,6 +12,7 @@ <!-- Div contenant les filtres, cachée par défaut --> <div id="filters" style="display: none;"> <form method="GET" action=""> + <!-- Filtre par artiste --> <label for="">Artiste : </label> <select name="artist" id="artist" onchange="this.form.submit()"> @@ -37,6 +38,7 @@ <option value="asc" <?= isset($_GET['order']) && $_GET['order'] == 'asc' ? 'selected' : '' ?>>Croissant</option> <option value="desc" <?= isset($_GET['order']) && $_GET['order'] == 'desc' ? 'selected' : '' ?>>Décroissant</option> </select> + </form> </div> </div>