added functionality recently added

iamKunal · Nov 12, 2016 · 0aa7f8c · 0aa7f8c
1 parent f4f06b9
commit 0aa7f8c
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/beatboxer/Show.java b/src/beatboxer/Show.java
@@ -55,7 +55,7 @@ public ObservableList<BBItem> ShowAllAlbums() {
 
     public ObservableList<BBSong> ShowAllTracksinAlbum(int albumId) {
         try {
-            String sql = "select * from track natural join artist natural join album natural join trackinfo WHERE albumid = ? order by trackname";
+            String sql = "select trackid,trackname,artistname,albumname,location,genre,favourite from track natural join artist natural join album natural join trackinfo WHERE albumid = ? order by trackname";
             PreparedStatement statement = con.prepareStatement(sql);
             statement.setInt(1, albumId);
             ResultSet res = statement.executeQuery();
@@ -74,6 +74,7 @@ public ObservableList<BBItem> ShowAllPlayLists() {
             ObservableList<BBItem> list = FXCollections.observableArrayList();
             list.add(new BBItem(0, "All Songs"));
             list.add(new BBItem(-1, "Favourites"));
+            list.add(new BBItem(-2, "Recently Added"));
             list.addAll(BBGenerator.item(res));
             return list;
         } catch (SQLException e) {
@@ -84,7 +85,7 @@ public ObservableList<BBItem> ShowAllPlayLists() {
 
     public ObservableList<BBSong> ShowAllTracksinPlayList(int playlistid) {
         try {
-            String sql = "select * from track natural join artist natural join album natural join trackinfo natural join playlistinfo where playlistid = ? order by trackorder";
+            String sql = "select trackid,trackname,artistname,albumname,location,genre,favourite from track natural join artist natural join album natural join trackinfo natural join playlistinfo where playlistid = ? order by trackorder";
             PreparedStatement tracks = con.prepareStatement(sql);
             tracks.setInt(1, playlistid);
             ResultSet res = tracks.executeQuery();
@@ -97,7 +98,7 @@ public ObservableList<BBSong> ShowAllTracksinPlayList(int playlistid) {
 
     public ObservableList<BBSong> ShowAllFavourites() {
         try {
-            String sql = "select * from track natural join artist natural join album natural join trackinfo where favourite = true order by trackname";
+            String sql = "select trackid,trackname,artistname,albumname,location,genre,favourite from track natural join artist natural join album natural join trackinfo where favourite = true order by trackname";
             Statement tracks = con.createStatement();
             ResultSet res = tracks.executeQuery(sql);
             return BBGenerator.song(res);
@@ -147,7 +148,7 @@ public ObservableList<BBSong> ShowByMode(String mode) {
 
     public ObservableList<BBSong> ShowRecentlyAdded() {
         try {
-            String sql = "select * from track natural join artist natural join album natural join trackinfo where to_seconds(dateadded) + 86400 >= to_seconds(current_timestamp()) order by dateadded desc";
+            String sql = "select trackid,trackname,artistname,albumname,location,genre,favourite from track natural join artist natural join album natural join trackinfo where to_seconds(dateadded) + 86400 >= to_seconds(current_timestamp()) order by dateadded desc";
             Statement tracks = con.createStatement();
             ResultSet res = tracks.executeQuery(sql);
             return BBGenerator.song(res);
@@ -159,7 +160,7 @@ public ObservableList<BBSong> ShowRecentlyAdded() {
 
     private ResultSet ShowByGenre(ArrayList<String> genre) {
         try {
-            String sql = "select * from track natural join artist natural join album natural join trackinfo where genre like ?";
+            String sql = "select trackid,trackname,artistname,albumname,location,genre,favourite from track natural join artist natural join album natural join trackinfo where genre like ?";
             for (int i = 0; i < genre.size() - 1; i++) {
                 sql += " or genre like ?";
             }