From 0b4dde90ac4252248b808b48fd11eec9a17e0c9c Mon Sep 17 00:00:00 2001 From: Felix-Vimalaratnam Date: Mon, 17 Jun 2024 21:06:19 +0200 Subject: [PATCH] =?UTF-8?q?probl=C3=A8me=20r=C3=A9solu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/config/config.php | 2 +- .../application/controllers/Albums.php | 1 - .../application/controllers/Artistes.php | 2 -- .../application/models/Model_music.php | 36 +++++++------------ .../application/views/addAlbumtoplaylist.php | 4 +-- .../views/addArtistestoplaylist.php | 2 +- .../application/views/addSongtoplaylist.php | 4 +-- .../application/views/albums_list.php | 6 ++-- .../application/views/chansons_list.php | 22 ++++++------ .../application/views/playlist_list.php | 6 ++-- 10 files changed, 37 insertions(+), 48 deletions(-) diff --git a/CodeIgniter-3.1.13/application/config/config.php b/CodeIgniter-3.1.13/application/config/config.php index f0eca6a..615e3f2 100644 --- a/CodeIgniter-3.1.13/application/config/config.php +++ b/CodeIgniter-3.1.13/application/config/config.php @@ -23,7 +23,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | a PHP script and you can easily do that on your own. | */ -$config['base_url']='/~felix-vi/SAE_PHP_2024_test/CodeIgniter-3.1.13/'; +$config['base_url']='/~felix-vi/SAE_PHP_2024/CodeIgniter-3.1.13/'; /* |-------------------------------------------------------------------------- diff --git a/CodeIgniter-3.1.13/application/controllers/Albums.php b/CodeIgniter-3.1.13/application/controllers/Albums.php index c03686d..7ab51b5 100644 --- a/CodeIgniter-3.1.13/application/controllers/Albums.php +++ b/CodeIgniter-3.1.13/application/controllers/Albums.php @@ -66,7 +66,6 @@ class Albums extends CI_Controller { $this->load->view('layout/footer'); }else{ $playlistId = $this->input->post('playlist_id'); - $page = $this->input->get('page'); $this->model_music->AddAlbumtoPlaylist($playlistId,$id); redirect('albums'); } diff --git a/CodeIgniter-3.1.13/application/controllers/Artistes.php b/CodeIgniter-3.1.13/application/controllers/Artistes.php index 22ee67c..645e6d8 100644 --- a/CodeIgniter-3.1.13/application/controllers/Artistes.php +++ b/CodeIgniter-3.1.13/application/controllers/Artistes.php @@ -14,7 +14,6 @@ class Artistes extends CI_Controller { $order = $this->input->get('order'); if ($recherche=filter_input(INPUT_GET,'recherche') == false or $recherche=filter_input(INPUT_GET,'recherche') == null){ - $artistes = $this->model_music->getArtistes(); $artistes = $this->model_music->get_filtered_artistes($genre, $sort, $order); $data['artistes'] = $artistes; }else{ @@ -26,7 +25,6 @@ class Artistes extends CI_Controller { if ($artistes == false){ $page = preg_split('/[\/]/',$_SERVER['REQUEST_URI']); $this->load->view('error',['page'=>$page[count($page)-1]]); - $artistes = $this->model_music->getArtistes(); $artistes = $this->model_music->get_filtered_artistes($genre, $sort, $order); $data['artistes'] = $artistes; } diff --git a/CodeIgniter-3.1.13/application/models/Model_music.php b/CodeIgniter-3.1.13/application/models/Model_music.php index a9c3149..e2e3e94 100644 --- a/CodeIgniter-3.1.13/application/models/Model_music.php +++ b/CodeIgniter-3.1.13/application/models/Model_music.php @@ -53,16 +53,6 @@ class Model_music extends CI_Model { return $query->result(); } - public function getArtistes(){ - $query = $this->db->query( - "SELECT artist.name, artist.id - FROM artist - ORDER BY artist.name - " - ); - return $query->result(); - } - public function get_filtered_artistes($genre = [], $sort = null, $order = null) { $this->db->distinct(); $this->db->select('artist.Id,artist.name, genre.name as genreName'); @@ -317,7 +307,7 @@ class Model_music extends CI_Model { public function getPlaylist(){ $query = $this->db->query( - "SELECT Playlist.name, Playlist.playlistid + "SELECT Playlist.name, Playlist.playlistId FROM Playlist ORDER BY Playlist.name " @@ -327,7 +317,7 @@ class Model_music extends CI_Model { public function getSearchPlaylist($nom){ $query = $this->db->query( - "SELECT Playlist.name, Playlist.playlistid + "SELECT Playlist.name, Playlist.playlistId FROM Playlist WHERE Playlist.name LIKE '$nom' " @@ -346,9 +336,9 @@ class Model_music extends CI_Model { $trackId = $track->trackId; $query = $this->db->query( - "SELECT Playlist.name, Playlist.playlistid + "SELECT Playlist.name, Playlist.playlistId FROM Playlist - JOIN PlaylistSong ON Playlist.playlistid = PlaylistSong.playlistid + JOIN PlaylistSong ON Playlist.playlistId = PlaylistSong.playlistId WHERE PlaylistSong.trackId = $trackId ORDER BY Playlist.name " @@ -383,12 +373,12 @@ class Model_music extends CI_Model { public function get_song_playlist($id){ $this->db->select('track.id as trackId, song.name,song.id,album.year,album.name as albumName, artist.name as artistName, genre.name as genreName'); $this->db->from('Playlist'); - $this->db->join('PlaylistSong', 'PlaylistSong.playlistid = Playlist.playlistid'); - $this->db->join('track', 'PlaylistSong.trackid = track.id'); + $this->db->join('PlaylistSong', 'PlaylistSong.playlistId = Playlist.playlistId'); + $this->db->join('track', 'PlaylistSong.trackId = track.id'); $this->db->join('song', 'track.songId = song.id'); $this->db->join('album', 'album.id = track.albumId'); $this->db->join('artist', 'album.artistId = artist.Id'); - $this->db->join('genre', 'genre.id = album.genreid'); + $this->db->join('genre', 'genre.id = album.genreId'); $this->db->where('PlaylistSong.playlistId', $id); $query = $this->db->get(); return $query->result(); @@ -438,7 +428,7 @@ class Model_music extends CI_Model { // Étape 3: Vérifier si l'une des pistes de cette chanson est dans la playlist $this->db->select('PlaylistSong.trackid as trackId'); $this->db->from('PlaylistSong'); - $this->db->where_in('PlaylistSong.trackid', $trackIds); + $this->db->where_in('PlaylistSong.trackId', $trackIds); $this->db->where('PlaylistSong.playlistId',$idplaylist); $query = $this->db->get(); @@ -481,9 +471,9 @@ class Model_music extends CI_Model { } // Étape 3: Vérifier si l'une des pistes de cette chanson est dans la playlist - $this->db->select('PlaylistSong.trackid as trackId'); + $this->db->select('PlaylistSong.trackId as trackId'); $this->db->from('PlaylistSong'); - $this->db->where_in('PlaylistSong.trackid', $trackIds); + $this->db->where_in('PlaylistSong.trackId', $trackIds); $query = $this->db->get(); return $query; } @@ -492,10 +482,10 @@ class Model_music extends CI_Model { $this->db->select('track.id as trackId'); $this->db->from('album'); $this->db->join('track', 'album.id = track.albumId'); - $this->db->where('track.albumId', $albumId); + $this->db->where('album.id', $albumId); $query = $this->db->get(); foreach($query->result() as $tab){ - if($this->model_music->SongInPlaylist($tab->trackId) == false){ + if($this->model_music->SongInThisPlaylist($tab->trackId,$idplaylist) == false){ $this->model_music->AddSongtoPlaylist($idplaylist,$tab->trackId); } } @@ -509,7 +499,7 @@ class Model_music extends CI_Model { $this->db->where('artist.id', $artisteId); $query = $this->db->get(); foreach($query->result() as $tab){ - if($this->model_music->SongInPlaylist($tab->trackId) == false){ + if($this->model_music->SongInThisPlaylist($tab->trackId,$idplaylist) == false){ $this->model_music->AddSongtoPlaylist($idplaylist,$tab->trackId); } } diff --git a/CodeIgniter-3.1.13/application/views/addAlbumtoplaylist.php b/CodeIgniter-3.1.13/application/views/addAlbumtoplaylist.php index 682cb97..6d41794 100644 --- a/CodeIgniter-3.1.13/application/views/addAlbumtoplaylist.php +++ b/CodeIgniter-3.1.13/application/views/addAlbumtoplaylist.php @@ -6,11 +6,11 @@
-
+
diff --git a/CodeIgniter-3.1.13/application/views/addArtistestoplaylist.php b/CodeIgniter-3.1.13/application/views/addArtistestoplaylist.php index 2f3b21d..ebc4678 100644 --- a/CodeIgniter-3.1.13/application/views/addArtistestoplaylist.php +++ b/CodeIgniter-3.1.13/application/views/addArtistestoplaylist.php @@ -9,7 +9,7 @@
diff --git a/CodeIgniter-3.1.13/application/views/addSongtoplaylist.php b/CodeIgniter-3.1.13/application/views/addSongtoplaylist.php index 57b8a92..ea2f3b3 100644 --- a/CodeIgniter-3.1.13/application/views/addSongtoplaylist.php +++ b/CodeIgniter-3.1.13/application/views/addSongtoplaylist.php @@ -10,8 +10,8 @@
diff --git a/CodeIgniter-3.1.13/application/views/albums_list.php b/CodeIgniter-3.1.13/application/views/albums_list.php index 736b36d..91414f3 100644 --- a/CodeIgniter-3.1.13/application/views/albums_list.php +++ b/CodeIgniter-3.1.13/application/views/albums_list.php @@ -67,9 +67,9 @@ foreach ($albums as $album):
albumId}", $album->name); ?> - session->userdata('logged_in')): ?> - albumId}", ""); ?> - + session->userdata('logged_in')): + echo anchor("albums/addAlbumtoPlaylist/{$album->albumId}", ""); + endif; ?>
cover de l'album diff --git a/CodeIgniter-3.1.13/application/views/chansons_list.php b/CodeIgniter-3.1.13/application/views/chansons_list.php index f0278b4..d012aea 100644 --- a/CodeIgniter-3.1.13/application/views/chansons_list.php +++ b/CodeIgniter-3.1.13/application/views/chansons_list.php @@ -139,15 +139,17 @@ foreach($chansons_for_current_page as $chanson): ?> $start_page = max(1, $total_pages - 4); } - for ($i = $start_page; $i <= $end_page; $i++): ?> - - - - - - + if ( $total_pages > 1){ + for ($i = $start_page; $i <= $end_page; $i++): ?> + + + + + + - - Next » - + + Next » + +
\ No newline at end of file diff --git a/CodeIgniter-3.1.13/application/views/playlist_list.php b/CodeIgniter-3.1.13/application/views/playlist_list.php index df7b08b..fa75852 100644 --- a/CodeIgniter-3.1.13/application/views/playlist_list.php +++ b/CodeIgniter-3.1.13/application/views/playlist_list.php @@ -10,10 +10,10 @@ echo""; foreach($playlists as $playlist){ echo "
"; echo "
"; - echo anchor("chansons/view/{$playlist->playlistid}","{$playlist->name}"); + echo anchor("chansons/view/{$playlist->playlistId}","{$playlist->name}"); if($this->session->userdata('logged_in')){ - echo anchor("playlist/deletePlaylist/{$playlist->playlistid}",""); - echo anchor("playlist/duplicatePlaylist/{$playlist->playlistid}",""); + echo anchor("playlist/deletePlaylist/{$playlist->playlistId}",""); + echo anchor("playlist/duplicatePlaylist/{$playlist->playlistId}",""); } echo "
"; echo "
";