From a67b2fa3002de3ec47205c3900d8f77ef8c080e9 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Fri, 20 Jul 2012 11:25:54 -0400
Subject: [PATCH] CC-84: Smart Playlists

- removed soundcloud_id criteria
- added last_played criteria
---
 airtime_mvc/application/forms/SmartPlaylistCriteria.php  | 6 +++---
 airtime_mvc/application/models/Playlist.php              | 2 +-
 .../public/js/airtime/playlist/smart_playlistbuilder.js  | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/airtime_mvc/application/forms/SmartPlaylistCriteria.php b/airtime_mvc/application/forms/SmartPlaylistCriteria.php
index 2ac39aeb5..432c1c719 100644
--- a/airtime_mvc/application/forms/SmartPlaylistCriteria.php
+++ b/airtime_mvc/application/forms/SmartPlaylistCriteria.php
@@ -21,6 +21,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
             "label" => "Label",
             "language" => "Language",
             "mtime" => "Last Modified",
+            "lptime" => "Last Played",
             "length" => "Length",
             "lyricist" => "Lyricist",
             "mood" => "Mood",
@@ -29,7 +30,6 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
             "radio_station_name" => "Radio Station Name",
             "rating" => "Rating",
             "sample_rate" => "Sample Rate",
-            "soundcloud_id" => "Soundcloud Upload",
             "track_title" => "Title",
             "track_num" => "Track Number",
             "utime" => "Uploaded",
@@ -46,7 +46,8 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
             "composer" => "s",
             "conductor" => "s",
             "utime" => "n",
-            "mtime" => "n",
+            "mtime" => "n",
+            "lptime" => "n",
             "disc_number" => "n",
             "genre" => "s",
             "isrc_number" => "s",
@@ -60,7 +61,6 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
             "radio_station_name" => "s",
             "rating" => "n",
             "sample_rate" => "n",
-            "soundcloud_id" => "n",
             "track_title" => "s",
             "track_num" => "n",
             "year" => "n"
diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php
index 003e2a6a0..cfd1c80d0 100644
--- a/airtime_mvc/application/models/Playlist.php
+++ b/airtime_mvc/application/models/Playlist.php
@@ -68,6 +68,7 @@ class Application_Model_Playlist
             "conductor" => "DbConductor",
             "utime" => "DbUtime",
             "mtime" => "DbMtime",
+            "lptime" => "DbLPtime",
             "disc_number" => "DbDiscNumber",
             "genre" => "DbGenre",
             "isrc_number" => "DbIsrcNumber",
@@ -81,7 +82,6 @@ class Application_Model_Playlist
             "radio_station_name" => "DbRadioStation",
             "rating" => "DbRating",
             "sample_rate" => "DbSampleRate",
-            "soundcloud_id" => "DbSoundcloudId",
             "track_title" => "DbTrackTitle",
             "track_num" => "DbTrackNum",
             "year" => "DbYear"
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
index 76d2fd20e..914c77bbc 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
@@ -279,7 +279,7 @@ function callback(data, type) {
             if (type == 'shuffle') {
                 form.find('.success').text('Playlist shuffled');
             } else {
-            	form.find('.success').text('Smart playlist generated');
+            	form.find('.success').text('Smart playlist generated and saved');
             }
     	    form.find('.success').show();
     	    form.find('#smart_playlist_options').removeClass("closed");
@@ -287,8 +287,9 @@ function callback(data, type) {
             form.find('.success').text('Criteria saved');
             form.find('.success').show();
             
-            /* Update number of files that meet criteria and
-             * change icon to success/warning as appropriate
+            /* Update number of files that meet criteria and change icon to success/warning
+             * as appropriate. This is also done in the form but we do not pass the form
+             * back on a 'Save' callback.
              */
             if (json.poolCount > 1) {
                 $('#sp_pool_count').text(json.poolCount+' files meet the criteria');
@@ -358,6 +359,7 @@ var criteriaTypes = {
     "conductor" : "s",
     "utime" : "n",
     "mtime" : "n",
+    "lptime" : "n",
     "disc_number" : "n",
     "genre" : "s",
     "isrc_number" : "s",
@@ -371,7 +373,6 @@ var criteriaTypes = {
     "radio_station_name" : "s",
     "rating" : "n",
     "sample_rate" : "n",
-    "soundcloud_id" : "n",
     "track_title" : "s",
     "track_num" : "n",
     "year" : "n"