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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
James 2011-11-21 11:39:42 -05:00
commit d4a02a655c
19 changed files with 126 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

24
airtime_mvc/application/controllers/ScheduleController.php
View file

@ -491,11 +491,11 @@ class ScheduleController extends Zend_Controller_Action
'add_show_genre' => $show->getGenre(),
'add_show_description' => $show->getDescription()));
$startsDateTime = new DateTime($show->getStartDate()." ".$show->getStartTime(), new DateTimeZone(date_default_timezone_get()));
$endsDateTime = new DateTime($show->getEndDate()." ".$show->getEndTime(), new DateTimeZone(date_default_timezone_get()));
//$startsDateTime->setTimezone(new DateTimeZone(date_default_timezone_get()));
//$endsDateTime->setTimezone(new DateTimeZone(date_default_timezone_get()));
$startsDateTime = new DateTime($show->getStartDate()." ".$show->getStartTime(), new DateTimeZone("UTC"));
$endsDateTime = new DateTime($show->getEndDate()." ".$show->getEndTime(), new DateTimeZone("UTC"));
$startsDateTime->setTimezone(new DateTimeZone(date_default_timezone_get()));
$endsDateTime->setTimezone(new DateTimeZone(date_default_timezone_get()));
$formWhen->populate(array('add_show_start_date' => $startsDateTime->format("Y-m-d"),
'add_show_start_time' => $startsDateTime->format("H:i"),
@ -595,12 +595,14 @@ class ScheduleController extends Zend_Controller_Action
$show = new Application_Model_Show($data['add_show_id']);
$startDateModified = true;
if ($data['add_show_id'] != -1 && !array_key_exists('add_show_start_date', $data)){
//show is being updated and changing the start date was disabled, since the
//array key does not exist. We need to repopulate this entry from the db.
$data['add_show_start_date'] = $show->getStartDate();
$startDateModified = false;
}
if ($data['add_show_id'] != -1 && !array_key_exists('add_show_start_date', $data)){
//show is being updated and changing the start date was disabled, since the
//array key does not exist. We need to repopulate this entry from the db.
//The start date will be return in UTC time, so lets convert it to local time.
$dt = Application_Model_DateHelper::ConvertToLocalDateTime($show->getStartDate());
$data['add_show_start_date'] = $dt->format("Y-m-d");
$startDateModified = false;
}
$data['add_show_hosts'] = $this->_getParam('hosts');
$data['add_show_day_check'] = $this->_getParam('days');

47
airtime_mvc/application/models/Show.php
View file

@ -448,7 +448,7 @@ class Application_Model_Show {
}
/**
* Get the start date of the current show.
* Get the start date of the current show in UTC timezone.
*
* @return string
* The start date in the format YYYY-MM-DD
@ -457,38 +457,49 @@ class Application_Model_Show {
global $CC_DBC;
$showId = $this->getId();
$sql = "SELECT first_show FROM cc_show_days"
$sql = "SELECT first_show, start_time, timezone FROM cc_show_days"
." WHERE show_id = $showId"
." ORDER BY first_show";
." ORDER BY first_show"
." LIMIT 1";
$firstDate = $CC_DBC->GetOne($sql);
$rows = $CC_DBC->GetAll($sql);
if (is_null($firstDate)){
if (count($rows) == 0){
return "";
} else {
return $firstDate;
$row = $rows[0];
$dt = new DateTime($row["first_show"]." ".$row["start_time"], new DateTimeZone($row["timezone"]));
$dt->setTimezone(new DateTimeZone("UTC"));
return $dt->format("Y-m-d");
}
}
/**
* Get the start time of the current show.
* Get the start time of the current show in UTC timezone.
*
* @return string
* The start time in the format HH:MM:SS
* The start time in the format HH:MM
*/
public function getStartTime(){
global $CC_DBC;
$showId = $this->getId();
$sql = "SELECT start_time FROM cc_show_days"
." WHERE show_id = $showId";
$sql = "SELECT first_show, start_time, timezone FROM cc_show_days"
." WHERE show_id = $showId"
." ORDER BY first_show"
." LIMIT 1";
$startTime = $CC_DBC->GetOne($sql);
$rows = $CC_DBC->GetAll($sql);
if (is_null($startTime)){
if (count($rows) == 0){
return "";
} else {
return $startTime;
$row = $rows[0];
$dt = new DateTime($row["first_show"]." ".$row["start_time"], new DateTimeZone($row["timezone"]));
$dt->setTimezone(new DateTimeZone("UTC"));
return $dt->format("H:i");
}
}
@ -540,7 +551,7 @@ class Application_Model_Show {
*/
public function isStartDateTimeInPast(){
$date = new Application_Model_DateHelper;
$current_timestamp = $date->getTimestamp();
$current_timestamp = $date->getUtcTimestamp();
return ($current_timestamp > ($this->getStartDate()." ".$this->getStartTime()));
}
@ -619,9 +630,9 @@ class Application_Model_Show {
$sql .= "WHERE show_id = $p_data[add_show_id]";
$CC_DBC->query($sql);
$oldStartDateTimeEpoch = strtotime($this->getStartDate()." ".$this->getStartTime());
$newStartDateTimeEpoch = strtotime($p_data['add_show_start_date']." ".$p_data['add_show_start_time']);
$diff = $newStartDateTimeEpoch - $oldStartDateTimeEpoch;
$dtOld = new DateTime($this->getStartDate()." ".$this->getStartTime(), new DateTimeZone("UTC"));
$dtNew = new DateTime($p_data['add_show_start_date']." ".$p_data['add_show_start_time'], new DateTimeZone(date_default_timezone_get()));
$diff = $dtOld->getTimestamp() - $dtNew->getTimestamp();
$sql = "UPDATE cc_show_instances "
."SET starts = starts + INTERVAL '$diff sec', "

13
airtime_mvc/public/js/airtime/dashboard/versiontooltip.js
View file

@ -8,9 +8,9 @@ function getContent() {
var msg = "";
if(isUpToDate()) {
msg = "You are running the latest version";
} else if(diff <= 2) {
} else if(diff == 1) {
msg = "New version available: " + link;
} else if(diff == 3) {
} else if(diff == 2) {
msg = "This version will soon be obsolete.<br/>Please upgrade to " + link;
} else {
msg = "This version is no longer supported.<br/>Please upgrade to " + link;
@ -44,7 +44,7 @@ function getLatestVersion() {
* Returns the download link to latest release in HTML
*/
function getLatestLink() {
return "<a href='" + $("#version-link").html() + "'>" + getLatestVersion() + "</a>";
return "<a href='' onclick='openLatestLink();'>" + getLatestVersion() + "</a>";
}
/**
@ -58,6 +58,13 @@ function isUpToDate() {
return (diff == 0 && current == latest) || diff < 0;
}
/**
* Opens the link in a new window
*/
function openLatestLink() {
window.open($("#version-link").html());
}
/**
* Sets up the tooltip for version notification
*/

7
airtime_mvc/public/js/fullcalendar/fullcalendar.js
View file

@ -399,7 +399,9 @@ function Calendar(element, options, eventSources) {
elementOuterWidth = element.outerWidth();
header.updateTitle(currentView.title);
var today = new Date();
//adjusting this date ensures that the "today" button is greyed out on the
//correct day.
var today = adjustDateToServerDate(new Date(), options["serverTimezoneOffset"]);
if (today >= currentView.start && today < currentView.end) {
header.disableButton('today');
}else{
@ -581,7 +583,8 @@ function Calendar(element, options, eventSources) {
function today() {
date = new Date();
//adjusting this date ensures that clicking "today" takes us to the correct date.
date = adjustDateToServerDate(new Date(), options["serverTimezoneOffset"]);
renderView();
}