From d2b77e594dc6ffa3e93d86257e884f464f1d1f9e Mon Sep 17 00:00:00 2001
From: Vincent <xefal77@gmail.com>
Date: Tue, 4 Jun 2024 22:09:23 +0200
Subject: [PATCH] Fix query 4/?
---
application/controllers/Artistes.php | 7 ++++---
application/controllers/Music.php | 2 +-
application/models/Model_music.php | 15 ++++++++-------
application/views/albums_list.php | 2 +-
.../views/{artists_name.php => artists_list.php} | 2 +-
.../{musiques_name.php => musiques_list.php} | 2 +-
6 files changed, 16 insertions(+), 14 deletions(-)
rename application/views/{artists_name.php => artists_list.php} (90%)
rename application/views/{musiques_name.php => musiques_list.php} (93%)
diff --git a/application/controllers/Artistes.php b/application/controllers/Artistes.php
index 30d26a4..63fa972 100644
--- a/application/controllers/Artistes.php
+++ b/application/controllers/Artistes.php
@@ -12,9 +12,9 @@ class Artistes extends CI_Controller {
public function index(){
$genre = $this->input->get('genre');
$order = $this->input->get('order');
- $query = $this->input->get('query');
+ $query = $this->input->get('query');
- $artists = $this->model_music->getArtists($genre, $order, $query);
+ $artists = $this->model_music->getArtists($genre, $order, $query); // Pass $query
$genres = $this->model_music->researchtype();
$is_logged_in = $this->session->userdata('logged_in');
@@ -26,7 +26,8 @@ class Artistes extends CI_Controller {
$this->load->view('layout/header', $data);
$this->load->view('layout/getter', $data);
- $this->load->view('artists_name', $data);
+ $this->load->view('artists_list', $data);
$this->load->view('layout/footer');
}
}
+
diff --git a/application/controllers/Music.php b/application/controllers/Music.php
index ede0c0d..c2cc852 100644
--- a/application/controllers/Music.php
+++ b/application/controllers/Music.php
@@ -30,7 +30,7 @@ class Music extends CI_Controller {
$this->load->view('layout/header', $data);
$this->load->view('layout/getter', $data);
- $this->load->view('musiques_name', $data);
+ $this->load->view('musiques_list', $data);
$this->load->view('layout/footer');
}
}
diff --git a/application/models/Model_music.php b/application/models/Model_music.php
index 13b2f43..0a2d301 100644
--- a/application/models/Model_music.php
+++ b/application/models/Model_music.php
@@ -46,32 +46,33 @@ class Model_music extends CI_Model {
return $query->result();
}
- public function getArtists($genre = '', $order = '') {
+ public function getArtists($genre = '', $order = 'asc', $query = '') {
$this->db->select('artist.name as artistName, artist.id as artistId');
$this->db->from('artist');
$this->db->join('album', 'album.artistid = artist.id');
$this->db->join('genre', 'genre.id = album.genreid');
$this->db->join('cover', 'cover.id = album.coverid');
-
+
$this->db->distinct("artist.name");
-
+
if (!empty($genre)) {
$this->db->where('genre.name', $genre);
}
-
+
if ($order == 'asc' || $order == 'desc') {
$this->db->order_by('artist.name', $order);
}
-
+
if (!empty($query)) {
$this->db->like('artist.name', $query);
}
-
+
$result = $this->db->get();
return $result->result();
}
+
- public function getMusics($genre = '', $order = '', $artist = '') {
+ public function getMusics($genre = '', $order = '', $artist = '', $query = '') {
$this->db->select('album.name, album.id, year, artist.name as artistName, genre.name as genreName, jpeg, song.name as trackName, track.id as trackId');
$this->db->from('track');
$this->db->join('album', 'track.albumId = album.id');
diff --git a/application/views/albums_list.php b/application/views/albums_list.php
index 0bed337..74225f6 100644
--- a/application/views/albums_list.php
+++ b/application/views/albums_list.php
@@ -1,4 +1,4 @@
-<h5>Albums list</h5>
+<h5>Liste des Albums</h5>
<section class="list">
<?php
diff --git a/application/views/artists_name.php b/application/views/artists_list.php
similarity index 90%
rename from application/views/artists_name.php
rename to application/views/artists_list.php
index 2c7d739..d4c3080 100644
--- a/application/views/artists_name.php
+++ b/application/views/artists_list.php
@@ -1,4 +1,4 @@
-<h5>Artists list</h5>
+<h5>Liste des Artistes</h5>
<section class="list">
<?php
foreach($artists as $artist){
diff --git a/application/views/musiques_name.php b/application/views/musiques_list.php
similarity index 93%
rename from application/views/musiques_name.php
rename to application/views/musiques_list.php
index cca404d..a8ac66f 100644
--- a/application/views/musiques_name.php
+++ b/application/views/musiques_list.php
@@ -1,4 +1,4 @@
-<h5>Musiques List</h5>
+<h5>Liste des musiques</h5>
<section class="list">
<?php
foreach($musics as $music){