From 7ef94d3b2fcd5479a5e38143cd575c090e3e9869 Mon Sep 17 00:00:00 2001
From: stiti <moncef.stiti@gmail.com>
Date: Tue, 4 Jun 2024 15:05:19 +0200
Subject: [PATCH] Corrections

---
 CodeIgniter-3.1.13/application/controllers/Utilisateur.php | 2 --
 CodeIgniter-3.1.13/application/models/Model_music.php      | 6 +++---
 CodeIgniter-3.1.13/application/views/album_view.php        | 5 ++---
 CodeIgniter-3.1.13/application/views/musiques_list.php     | 1 -
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CodeIgniter-3.1.13/application/controllers/Utilisateur.php b/CodeIgniter-3.1.13/application/controllers/Utilisateur.php
index 6f61946..0819d4f 100644
--- a/CodeIgniter-3.1.13/application/controllers/Utilisateur.php
+++ b/CodeIgniter-3.1.13/application/controllers/Utilisateur.php
@@ -460,9 +460,7 @@ class Utilisateur extends CI_Controller {
     
         $user_id = $this->session->userdata('user_id');
         $data['user'] = $this->Utilisateur_model->get_user_by_id($user_id);
-    
         $data['avis'] = $this->Utilisateur_model->get_avis_by_user($user_id);
-
         $data['title']="Dashboard - Onzeur";
         $data['css']="assets/css/dashboard";
     
diff --git a/CodeIgniter-3.1.13/application/models/Model_music.php b/CodeIgniter-3.1.13/application/models/Model_music.php
index 508d6f4..0cbc42e 100644
--- a/CodeIgniter-3.1.13/application/models/Model_music.php
+++ b/CodeIgniter-3.1.13/application/models/Model_music.php
@@ -78,9 +78,9 @@ class Model_music extends CI_Model {
 
     public function get_album_by_id($id){
         $query = $this->db->query(
-            "SELECT album.id, album.name, album.year, artist.name as artistName, genre.name as genreName, cover.jpeg
+            "SELECT album.id, album.name, album.year, album.artistId, album.genreId, artist.name as artistName, genre.name as genreName, cover.jpeg
              FROM album
-             JOIN artist ON album.artistid = artist.id
+             JOIN artist ON album.artistId = artist.id
              JOIN genre ON album.genreid = genre.id
              JOIN cover ON album.coverid = cover.id
              WHERE album.id = ?", array($id)
@@ -99,7 +99,7 @@ class Model_music extends CI_Model {
         }
     
         return $album;
-    }
+    }    
 
     public function getMusiques($limit, $offset, $order_by = 'name', $order_direction = 'ASC', $genre_id = null, $artist_id = null) {
         // Préparer la colonne de tri en fonction du paramètre $order_by
diff --git a/CodeIgniter-3.1.13/application/views/album_view.php b/CodeIgniter-3.1.13/application/views/album_view.php
index e54e30b..9d564d8 100644
--- a/CodeIgniter-3.1.13/application/views/album_view.php
+++ b/CodeIgniter-3.1.13/application/views/album_view.php
@@ -1,10 +1,9 @@
 
     <div class="album-details">
         <h1><?php echo $album->name; ?></h1>
-        
-        <p><strong>Artiste :</strong> <?php echo $album->artistName; ?></p>
+        <p><strong>Artiste :</strong> <a href="<?php echo site_url('artiste/index/' . $album->artistId); ?>"><?php echo $album->artistName; ?></a></p>
         <p><strong>Année :</strong> <?php echo $album->year; ?></p>
-        <p><strong>Genre :</strong> <?php echo $album->genreName; ?></p>
+        <p><strong>Genre :</strong> <a href="<?php echo base_url('index.php/musiques/index?genre_id='.$album->genreId); ?>"><?php echo $album->genreName; ?></a></p>
         <img src="data:image/jpeg;base64,<?php echo base64_encode($album->jpeg); ?>" alt="Image d'album">
 
         <?php if (!empty($album->tracks)): ?>
diff --git a/CodeIgniter-3.1.13/application/views/musiques_list.php b/CodeIgniter-3.1.13/application/views/musiques_list.php
index 6e25cb1..f641779 100644
--- a/CodeIgniter-3.1.13/application/views/musiques_list.php
+++ b/CodeIgniter-3.1.13/application/views/musiques_list.php
@@ -28,7 +28,6 @@
         </form>
     </div>
 
-    
     <section class="list">
         <?php foreach($musiques as $musique): ?>
             <div>