affichage des musiques sur toutes les pages

This commit is contained in:
2024-06-17 16:40:30 +02:00
parent 1f04b03f30
commit e11dfe168f
3 changed files with 5 additions and 47 deletions

View File

@@ -17,7 +17,7 @@ class Model_music extends CI_Model {
return $query->result();
}
<<<<<<< HEAD
public function getArtistes(){
$query = $this->db->query(
"SELECT artist.id AS artistId, artist.name AS artistName, album.name AS albumName, album.id AS albumId, album.year, cover.jpeg
@@ -71,36 +71,9 @@ class Model_music extends CI_Model {
JOIN song ON track.songId = song.id
WHERE album.id = ?
ORDER BY track.diskNumber, track.number",
=======
public function getArtistes(){
$query = $this->db->query(
"SELECT artist.id AS artistId, artist.name AS artistName, album.name AS albumName, album.year, cover.jpeg
FROM album
INNER JOIN artist ON album.artistId = artist.id
JOIN cover ON cover.id = album.coverId
GROUP BY artist.name, album.year
"
);
return $query->result();
}
public function getTracksByAlbumId($albumId){
$query = $this->db->query(
"SELECT track.number, track.duration, song.name as songName
FROM track
JOIN album ON album.id = track.albumid
JOIN artist ON artist.id = album.artistId
JOIN song ON song.id = track.songId
WHERE track.albumId = ?
ORDER BY track.number",
>>>>>>> 1bd8d93ce58f04d7fc10d62db226dd012b1f7560
array($albumId)
);
array($albumId) );
return $query->result();
}
<<<<<<< HEAD
=======
public function get_tri_Albums($Ctri){
$query = $this->db->query(
@@ -127,5 +100,5 @@ class Model_music extends CI_Model {
$query = $this->db->get();
return $query->result();
}
>>>>>>> 1bd8d93ce58f04d7fc10d62db226dd012b1f7560
}