Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-84: Smart Playlists 

- removed soundcloud_id criteria
- added last_played criteria
This commit is contained in:
denise 2012-07-20 11:25:54 -04:00
parent d801139a12
commit a67b2fa300
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
airtime_mvc/application/forms/SmartPlaylistCriteria.php
View File

@ -21,6 +21,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
"label" => "Label", "label" => "Label",
"language" => "Language", "language" => "Language",
"mtime" => "Last Modified", "mtime" => "Last Modified",
"lptime" => "Last Played",
"length" => "Length", "length" => "Length",
"lyricist" => "Lyricist", "lyricist" => "Lyricist",
"mood" => "Mood", "mood" => "Mood",
@ -29,7 +30,6 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
"radio_station_name" => "Radio Station Name", "radio_station_name" => "Radio Station Name",
"rating" => "Rating", "rating" => "Rating",
"sample_rate" => "Sample Rate", "sample_rate" => "Sample Rate",
"soundcloud_id" => "Soundcloud Upload",
"track_title" => "Title", "track_title" => "Title",
"track_num" => "Track Number", "track_num" => "Track Number",
"utime" => "Uploaded", "utime" => "Uploaded",
@ -47,6 +47,7 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
"conductor" => "s", "conductor" => "s",
"utime" => "n", "utime" => "n",
"mtime" => "n", "mtime" => "n",
"lptime" => "n",
"disc_number" => "n", "disc_number" => "n",
"genre" => "s", "genre" => "s",
"isrc_number" => "s", "isrc_number" => "s",
@ -60,7 +61,6 @@ class Application_Form_SmartPlaylistCriteria extends Zend_Form_SubForm
"radio_station_name" => "s", "radio_station_name" => "s",
"rating" => "n", "rating" => "n",
"sample_rate" => "n", "sample_rate" => "n",
"soundcloud_id" => "n",
"track_title" => "s", "track_title" => "s",
"track_num" => "n", "track_num" => "n",
"year" => "n" "year" => "n"

2
airtime_mvc/application/models/Playlist.php
View File

@ -68,6 +68,7 @@ class Application_Model_Playlist
"conductor" => "DbConductor", "conductor" => "DbConductor",
"utime" => "DbUtime", "utime" => "DbUtime",
"mtime" => "DbMtime", "mtime" => "DbMtime",
"lptime" => "DbLPtime",
"disc_number" => "DbDiscNumber", "disc_number" => "DbDiscNumber",
"genre" => "DbGenre", "genre" => "DbGenre",
"isrc_number" => "DbIsrcNumber", "isrc_number" => "DbIsrcNumber",
@ -81,7 +82,6 @@ class Application_Model_Playlist
"radio_station_name" => "DbRadioStation", "radio_station_name" => "DbRadioStation",
"rating" => "DbRating", "rating" => "DbRating",
"sample_rate" => "DbSampleRate", "sample_rate" => "DbSampleRate",
"soundcloud_id" => "DbSoundcloudId",
"track_title" => "DbTrackTitle", "track_title" => "DbTrackTitle",
"track_num" => "DbTrackNum", "track_num" => "DbTrackNum",
"year" => "DbYear" "year" => "DbYear"

9
airtime_mvc/public/js/airtime/playlist/smart_playlistbuilder.js
View File

@ -279,7 +279,7 @@ function callback(data, type) {
if (type == 'shuffle') { if (type == 'shuffle') {
form.find('.success').text('Playlist shuffled'); form.find('.success').text('Playlist shuffled');
} else { } else {
form.find('.success').text('Smart playlist generated'); form.find('.success').text('Smart playlist generated and saved');
} }
form.find('.success').show(); form.find('.success').show();
form.find('#smart_playlist_options').removeClass("closed"); form.find('#smart_playlist_options').removeClass("closed");
@ -287,8 +287,9 @@ function callback(data, type) {
form.find('.success').text('Criteria saved'); form.find('.success').text('Criteria saved');
form.find('.success').show(); form.find('.success').show();
/* Update number of files that meet criteria and /* Update number of files that meet criteria and change icon to success/warning
* change icon to success/warning as appropriate * 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) { if (json.poolCount > 1) {
$('#sp_pool_count').text(json.poolCount+' files meet the criteria'); $('#sp_pool_count').text(json.poolCount+' files meet the criteria');
@ -358,6 +359,7 @@ var criteriaTypes = {
"conductor" : "s", "conductor" : "s",
"utime" : "n", "utime" : "n",
"mtime" : "n", "mtime" : "n",
"lptime" : "n",
"disc_number" : "n", "disc_number" : "n",
"genre" : "s", "genre" : "s",
"isrc_number" : "s", "isrc_number" : "s",
@ -371,7 +373,6 @@ var criteriaTypes = {
"radio_station_name" : "s", "radio_station_name" : "s",
"rating" : "n", "rating" : "n",
"sample_rate" : "n", "sample_rate" : "n",
"soundcloud_id" : "n",
"track_title" : "s", "track_title" : "s",
"track_num" : "n", "track_num" : "n",
"year" : "n" "year" : "n"