From 53a85204daf1b542f4d5ddb583a7331fb9fa06bd Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 17 Apr 2012 16:52:59 -0400 Subject: [PATCH 01/15] CC-3498: Calendar -> Show Content better representation of duration needed -fixed (check for array length after explode()) --- airtime_mvc/application/models/ShowInstance.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index ea7ef121b..c25f1e2c3 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -570,9 +570,14 @@ class Application_Model_ShowInstance { if ($time != "00:00:00") { $time_arr = explode(".", $time); - $time_arr[1] = "." . $time_arr[1]; - $milliseconds = number_format(round($time_arr[1], 2), 2); - $time = $time_arr[0] . substr($milliseconds, 1); + if (count($time_arr) > 1) { + $time_arr[1] = "." . $time_arr[1]; + $milliseconds = number_format(round($time_arr[1], 2), 2); + $time = $time_arr[0] . substr($milliseconds, 1); + } + else { + $time = $time_arr[0] . ".00"; + } } else { $time = "00:00:00.00"; } From 000f7d549c80e74e8739348f5a733713668309ca Mon Sep 17 00:00:00 2001 From: James Date: Wed, 18 Apr 2012 12:25:10 -0400 Subject: [PATCH 02/15] CC-3652: Can't edit current show if it's a single instance when the timezone is in CEST(prague timezone) - fixed a bug where variable name wasn't changed --- airtime_mvc/application/models/Show.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index daef8d2c7..42c360947 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1314,7 +1314,7 @@ class Application_Model_Show { $show = new Application_Model_Show($show_id); - while($utcStartDateTime->getTimestamp() <= $p_dateTime->getTimestamp() + while($utcStartDateTime->getTimestamp() <= $p_populateUntilDateTime->getTimestamp() && (is_null($utcLastShowDateTime) || $utcStartDateTime->getTimestamp() < $utcLastShowDateTime->getTimestamp())){ list($utcStartDateTime, $utcEndDateTime) = Application_Model_Show::createUTCStartEndDateTime($start, $duration, $timezone); From 91cc6331394858f02c48cdf0b0d79dcbec50b12a Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 13 Apr 2012 12:29:23 -0400 Subject: [PATCH 03/15] changed "current" label - not perfect --- airtime_mvc/public/js/airtime/dashboard/playlist.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index 3ad590fb6..bd47c06b1 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -148,7 +148,13 @@ function updatePlaybar(){ else $('#current').text(currentSong.name+","); }else{ - $('#current').html("Current: Nothing Scheduled"); + if (master_dj_on_air) { + $('#current').html("Current: Master DJ On Air"); + } else if (scheduled_play_on_air) { + $('#current').html("Current: Show DJ On Air"); + } else if (live_dj_on_air) { + $('#current').html("Current: Nothing Scheduled"); + } } if (nextSong !== null){ From ef22a332586c014f4580d47ffbf2bda7b4ae9155 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 13 Apr 2012 12:30:02 -0400 Subject: [PATCH 04/15] fixed whitespace --- airtime_mvc/public/js/airtime/dashboard/playlist.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index bd47c06b1..49572e0b0 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -148,7 +148,7 @@ function updatePlaybar(){ else $('#current').text(currentSong.name+","); }else{ - if (master_dj_on_air) { + if (master_dj_on_air) { $('#current').html("Current: Master DJ On Air"); } else if (scheduled_play_on_air) { $('#current').html("Current: Show DJ On Air"); From a7ac80e78557df8a3b6e448b654e69d4cec51fff Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 13 Apr 2012 13:02:54 -0400 Subject: [PATCH 05/15] CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source -fixed --- airtime_mvc/public/js/airtime/dashboard/playlist.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index 49572e0b0..185872f83 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -150,9 +150,9 @@ function updatePlaybar(){ }else{ if (master_dj_on_air) { $('#current').html("Current: Master DJ On Air"); - } else if (scheduled_play_on_air) { - $('#current').html("Current: Show DJ On Air"); } else if (live_dj_on_air) { + $('#current').html("Current: Live DJ On Air"); + } else { $('#current').html("Current: Nothing Scheduled"); } } From 7659ae6384143f2e77103b8ef827dfe949959bad Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 13 Apr 2012 15:49:16 -0400 Subject: [PATCH 06/15] added missing bracket on --- airtime_mvc/application/views/scripts/playlist/playlist.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/views/scripts/playlist/playlist.phtml b/airtime_mvc/application/views/scripts/playlist/playlist.phtml index a214727b7..b01309bcf 100644 --- a/airtime_mvc/application/views/scripts/playlist/playlist.phtml +++ b/airtime_mvc/application/views/scripts/playlist/playlist.phtml @@ -38,7 +38,7 @@
00
Fade out (s):
-
00/span>
+
00
@@ -52,4 +52,4 @@
No open playlist
- \ No newline at end of file + From fffaac726c85548ce8ec3b13d9ccf8e249f56ec8 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 16 Apr 2012 10:51:12 -0400 Subject: [PATCH 07/15] CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source -semi-fixed --- airtime_mvc/public/js/airtime/dashboard/playlist.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index 185872f83..34bd81eb0 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -149,9 +149,9 @@ function updatePlaybar(){ $('#current').text(currentSong.name+","); }else{ if (master_dj_on_air) { - $('#current').html("Current: Master DJ On Air"); + $('#current').html("Current: Master Stream"); } else if (live_dj_on_air) { - $('#current').html("Current: Live DJ On Air"); + $('#current').html("Current: "+currentShow.name+""); } else { $('#current').html("Current: Nothing Scheduled"); } From a58dc95f07116069706fa9235a2c635e8e872734 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 13 Apr 2012 12:29:23 -0400 Subject: [PATCH 08/15] changed "current" label - not perfect --- airtime_mvc/public/js/airtime/dashboard/playlist.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index 34bd81eb0..bd47c06b1 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -148,11 +148,11 @@ function updatePlaybar(){ else $('#current').text(currentSong.name+","); }else{ - if (master_dj_on_air) { - $('#current').html("Current: Master Stream"); + if (master_dj_on_air) { + $('#current').html("Current: Master DJ On Air"); + } else if (scheduled_play_on_air) { + $('#current').html("Current: Show DJ On Air"); } else if (live_dj_on_air) { - $('#current').html("Current: "+currentShow.name+""); - } else { $('#current').html("Current: Nothing Scheduled"); } } From 1c9871a6ede4d86e9b84647a88e6b91c1cf87da1 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 13 Apr 2012 12:30:02 -0400 Subject: [PATCH 09/15] fixed whitespace --- airtime_mvc/public/js/airtime/dashboard/playlist.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index bd47c06b1..49572e0b0 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -148,7 +148,7 @@ function updatePlaybar(){ else $('#current').text(currentSong.name+","); }else{ - if (master_dj_on_air) { + if (master_dj_on_air) { $('#current').html("Current: Master DJ On Air"); } else if (scheduled_play_on_air) { $('#current').html("Current: Show DJ On Air"); From ddf1a6d027529a319090c20a95cc19690eade550 Mon Sep 17 00:00:00 2001 From: denise Date: Fri, 13 Apr 2012 13:02:54 -0400 Subject: [PATCH 10/15] CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source -fixed --- airtime_mvc/public/js/airtime/dashboard/playlist.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index 49572e0b0..185872f83 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -150,9 +150,9 @@ function updatePlaybar(){ }else{ if (master_dj_on_air) { $('#current').html("Current: Master DJ On Air"); - } else if (scheduled_play_on_air) { - $('#current').html("Current: Show DJ On Air"); } else if (live_dj_on_air) { + $('#current').html("Current: Live DJ On Air"); + } else { $('#current').html("Current: Nothing Scheduled"); } } From a7fb8ea3f298638f859386df5508dce88330e48f Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 16 Apr 2012 10:51:12 -0400 Subject: [PATCH 11/15] CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source -semi-fixed --- airtime_mvc/public/js/airtime/dashboard/playlist.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index 185872f83..34bd81eb0 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -149,9 +149,9 @@ function updatePlaybar(){ $('#current').text(currentSong.name+","); }else{ if (master_dj_on_air) { - $('#current').html("Current: Master DJ On Air"); + $('#current').html("Current: Master Stream"); } else if (live_dj_on_air) { - $('#current').html("Current: Live DJ On Air"); + $('#current').html("Current: "+currentShow.name+""); } else { $('#current').html("Current: Nothing Scheduled"); } From 479e112317c494806ce8c425aed88700a3186ca0 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 16 Apr 2012 15:51:05 -0400 Subject: [PATCH 12/15] CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source -fixed --- .../application/controllers/ScheduleController.php | 2 ++ airtime_mvc/public/js/airtime/dashboard/playlist.js | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index 9becb88f8..0268b77e1 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -333,6 +333,7 @@ class ScheduleController extends Zend_Controller_Action public function getCurrentPlaylistAction() { $range = Application_Model_Schedule::GetPlayOrderRange(); + $show = Application_Model_Show::GetCurrentShow(); /* Convert all UTC times to localtime before sending back to user. */ if (isset($range["previous"])){ @@ -371,6 +372,7 @@ class ScheduleController extends Zend_Controller_Action $this->view->switch_status = $switch_status; $this->view->entries = $range; + $this->view->show_name = $show[0]["name"]; } public function removeGroupAction() diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index 34bd81eb0..d48734fc3 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -8,6 +8,8 @@ var nextSong = null; var currentShow = new Array(); var nextShow = new Array(); +var showName = null; + var currentElem; var serverUpdateInterval = 5000; @@ -149,9 +151,13 @@ function updatePlaybar(){ $('#current').text(currentSong.name+","); }else{ if (master_dj_on_air) { - $('#current').html("Current: Master Stream"); + if (showName) { + $('#current').html("Current: "+showName+" - Master Stream"); + } else { + $('#current').html("Current: Master Stream"); + } } else if (live_dj_on_air) { - $('#current').html("Current: "+currentShow.name+""); + $('#current').html("Current: "+showName+" - Live Stream"); } else { $('#current').html("Current: Nothing Scheduled"); } @@ -352,6 +358,7 @@ function getScheduleFromServer(){ parseItems(data.entries); parseSourceStatus(data.source_status); parseSwitchStatus(data.switch_status); + showName = data.show_name; }, error:function(jqXHR, textStatus, errorThrown){}}); setTimeout(getScheduleFromServer, serverUpdateInterval); } From 3ddabf5cf7b6702757dc867c7ea546efb25e5980 Mon Sep 17 00:00:00 2001 From: denise Date: Mon, 16 Apr 2012 17:53:51 -0400 Subject: [PATCH 13/15] CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source -fixed --- airtime_mvc/public/js/airtime/dashboard/playlist.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js index d48734fc3..368e776d5 100644 --- a/airtime_mvc/public/js/airtime/dashboard/playlist.js +++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js @@ -157,7 +157,11 @@ function updatePlaybar(){ $('#current').html("Current: Master Stream"); } } else if (live_dj_on_air) { - $('#current').html("Current: "+showName+" - Live Stream"); + if (showName) { + $('#current').html("Current: "+showName+" - Live Stream"); + } else { + $('#current').html("Current: Live Stream"); + } } else { $('#current').html("Current: Nothing Scheduled"); } From 897b61b357baa38337ae288d16ea38cac836bfdf Mon Sep 17 00:00:00 2001 From: James Date: Wed, 18 Apr 2012 14:00:40 -0400 Subject: [PATCH 14/15] CC-3479: Calendar->Drag and Drop show has some inconsistencies with hours - fixed --- airtime_mvc/application/models/Show.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/Show.php b/airtime_mvc/application/models/Show.php index 42c360947..015c12bcc 100644 --- a/airtime_mvc/application/models/Show.php +++ b/airtime_mvc/application/models/Show.php @@ -1687,8 +1687,8 @@ class Application_Model_Show { $showDay = CcShowDaysQuery::create() ->filterByDbShowId($this->_showId) ->findOne(); - - $showDay->setDbFirstShow($dt) + + $showDay->setDbFirstShow($dt)->setDbStartTime($dt) ->save(); Logging::log("setting show's first show."); From dacdc4e4322cd3c4e80b391d4cbc7475e9ff3076 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 18 Apr 2012 15:38:47 -0400 Subject: [PATCH 15/15] CC-3672: Source switch stays connected if current show is cancelled - fixed --- airtime_mvc/application/controllers/ScheduleController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index 0268b77e1..4b5a92320 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -852,7 +852,10 @@ class ScheduleController extends Zend_Controller_Action try { $scheduler = new Application_Model_Scheduler(); - $scheduler->cancelShow($id); + $scheduler->cancelShow($id); + // send kick out source stream signal to pypo + $data = array("sourcename"=>"live_dj"); + Application_Model_RabbitMq::SendMessageToPypo("disconnect_source", $data); } catch (Exception $e) { $this->view->error = $e->getMessage();