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

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

This commit is contained in:
Martin Konecny 2012-09-19 15:44:28 -04:00
parent 2c215f40ef 4b2d6caf0e
commit 58d5cf5512
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
airtime_mvc/application/models/Show.php
View File

@ -186,6 +186,7 @@ SQL;
/* Check if the show being resized and any of its repeats * overlap
with other scheduled shows */
$utc = new DateTimeZone("UTC");
foreach ($showInstances as $si) {
$startsDateTime = new DateTime($si->getDbStarts(), new DateTimeZone("UTC"));
@ -223,15 +224,10 @@ SQL;
$sql_gen = <<<SQL
UPDATE cc_show_instances
SET ends = (ends + interval :deltaDay1 + interval :interval1)
SET ends = (ends + :deltaDay1::INTERVAL + :interval1::INTERVAL)
WHERE (show_id = :show_id1
AND ends > :current_timestamp1)
AND ((ends + interval :deltaDay2 + interval :interval2 - starts) <= interval '24:00')
UPDATE cc_show_days
SET duration = (CAST(duration AS interval) + interval :deltaDay3 + interval :interval3)
WHERE show_id = :show_id2
AND ((CAST(duration AS interval) + interval :deltaDay4 + interval :interval4) <= interval '24:00')
AND ((ends + :deltaDay2::INTERVAL + :interval2::INTERVAL - starts) <= interval '24:00')
SQL;
Application_Common_Database::prepareAndExecute($sql_gen,
@ -241,7 +237,18 @@ SQL;
':show_id1' => $this->_showId,
':current_timestamp1' => $current_timestamp,
':deltaDay2' => "$deltaDay days",
':interval2' => "$hours:$mins",
':interval2' => "$hours:$mins"
), "execute");
$sql_gen = <<<SQL
UPDATE cc_show_days
SET duration = (CAST(duration AS interval) + :deltaDay3::INTERVAL + :interval3::INTERVAL)
WHERE show_id = :show_id2
AND ((CAST(duration AS interval) + :deltaDay4::INTERVAL + :interval4::INTERVAL) <= interval '24:00')
SQL;
Application_Common_Database::prepareAndExecute($sql_gen,
array(
':deltaDay3' => "$deltaDay days",
':interval3' => "$hours:$mins",
':show_id2' => $this->_showId,

19
airtime_mvc/public/js/airtime/library/library.js
View File

@ -1089,7 +1089,7 @@ function validateAdvancedSearch(divs) {
if (!valid) allValid = false;
}
addRemoveValidationIcons(valid, $(field));
addRemoveValidationIcons(valid, $(field), searchTermType);
/* Empty fields should not have valid/invalid indicator
* Range values are considered valid even if only the
@ -1114,9 +1114,20 @@ function validateAdvancedSearch(divs) {
return allValid;
}
function addRemoveValidationIcons(valid, field) {
var validIndicator = "<span class='checked-icon sp-checked-icon'></span>",
invalidIndicator = "<span class='not-available-icon sp-checked-icon'></span>";
function addRemoveValidationIcons(valid, field, searchTermType) {
var title = '';
if (searchTermType === 'i') {
title = 'Input must be a positive number';
} else if (searchTermType === 'n') {
title = 'Input must be a number';
} else if (searchTermType === 't') {
title = 'Input must be in the format: yyyy-mm-dd';
} else if (searchTermType === 'l') {
title = 'Input must be in the format: hh:mm:ss.t';
}
var validIndicator = " <span class='checked-icon sp-checked-icon'></span>",
invalidIndicator = " <span title='"+title+"' class='not-available-icon sp-checked-icon'></span>";
if (valid) {
if (!field.closest('div').children(':last-child').hasClass('checked-icon')) {