test filtre 3/?
This commit is contained in:
		@@ -42,7 +42,6 @@ class Model_music extends CI_Model {
 | 
			
		||||
        return $query->result();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    public function getArtists($genre = '', $order = '') {
 | 
			
		||||
        $this->db->select('artist.name as artistName, artist.id as artistId');
 | 
			
		||||
        $this->db->from('artist');
 | 
			
		||||
@@ -56,19 +55,15 @@ class Model_music extends CI_Model {
 | 
			
		||||
            $this->db->where('genre.name', $genre);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		
 | 
			
		||||
        if($order == 'asc' || $order == 'desc'){
 | 
			
		||||
            $this->db->order_by('artist.name',$order );
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		
 | 
			
		||||
        $query = $this->db->get();
 | 
			
		||||
        return $query->result();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    public function getMusics($genre = '', $order = '', $artist = '') {
 | 
			
		||||
 | 
			
		||||
        $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');
 | 
			
		||||
@@ -78,8 +73,6 @@ class Model_music extends CI_Model {
 | 
			
		||||
        $this->db->join('cover', 'cover.id = album.coverid');
 | 
			
		||||
        $this->db->limit(100);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
        if(!empty($genre)){
 | 
			
		||||
            $this->db->where('genre.name', $genre);
 | 
			
		||||
        }
 | 
			
		||||
@@ -88,45 +81,17 @@ class Model_music extends CI_Model {
 | 
			
		||||
            $this->db->where('artist.name', $artist);
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		
 | 
			
		||||
        if($order == 'asc' || $order == 'desc'){
 | 
			
		||||
            $this->db->order_by('song.name',$order );
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
		
 | 
			
		||||
        $query = $this->db->get();
 | 
			
		||||
        return $query->result();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // Suppression de la deuxième méthode researchtype
 | 
			
		||||
 | 
			
		||||
    public function research(){
 | 
			
		||||
		$query = $this->db->query(
 | 
			
		||||
			
 | 
			
		||||
		);}
 | 
			
		||||
 | 
			
		||||
	public function researchtype(){
 | 
			
		||||
 | 
			
		||||
		$this->db->select('name');
 | 
			
		||||
		$this->db->from('genre');
 | 
			
		||||
		/*
 | 
			
		||||
		if(!empty($playlist_id)){
 | 
			
		||||
			$this->db->where('playlists.playlist_id', $playlist_id);
 | 
			
		||||
		}*/
 | 
			
		||||
 | 
			
		||||
		$query = $this->db->get();
 | 
			
		||||
		return $query->result();
 | 
			
		||||
		
 | 
			
		||||
        $query = $this->db->query();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
	public function nameArtist(){
 | 
			
		||||
 | 
			
		||||
		$this->db->select('name');
 | 
			
		||||
		$this->db->from('artist');
 | 
			
		||||
		
 | 
			
		||||
 | 
			
		||||
		$query = $this->db->get();
 | 
			
		||||
		return $query->result();
 | 
			
		||||
		
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user