From 0c381d4692490d2ea3f5dbcaea5fdee4869514bb Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 21 Aug 2012 11:58:39 -0400 Subject: [PATCH 1/2] CC-4253: Smart Playlist: Please support filter tracks by date -fixed --- airtime_mvc/application/models/Block.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index fbd429d1e..00cdf1c04 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -1140,7 +1140,17 @@ EOT; $column = CcFilesPeer::getTableMap()->getColumnByPhpName(self::$criteria2PeerMap[$spCriteria]); // if the column is timestamp, convert it into UTC if ($column->getType() == PropelColumnTypes::TIMESTAMP) { - $spCriteriaValue = Application_Common_DateHelper::ConvertToUtcDateTimeString($criteria['value']); + /* Check if only a date was supplied and trim + * the time after it is converted to UTC time + */ + if (strlen($criteria['value']) <= 10) { + //extract date only from timestamp in db + $spCriteria = 'date('.$spCriteria.')'; + $spCriteriaValue = Application_Common_DateHelper::ConvertToUtcDateTimeString($criteria['value']); + $spCriteriaValue = substr($spCriteriaValue, 0, 10); + } else { + $spCriteriaValue = Application_Common_DateHelper::ConvertToUtcDateTimeString($criteria['value']); + } } else if($spCriteria == "bit_rate") { // multiply 1000 because we store only number value // e.g 192kps is stored as 192000 From 167881c903c613b4ac786d5e700ffb79f7afe834 Mon Sep 17 00:00:00 2001 From: denise Date: Tue, 21 Aug 2012 12:01:48 -0400 Subject: [PATCH 2/2] CC-4253: Smart Playlist: Please support filter tracks by date -code refactor --- airtime_mvc/application/models/Block.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/airtime_mvc/application/models/Block.php b/airtime_mvc/application/models/Block.php index 00cdf1c04..d5816fab5 100644 --- a/airtime_mvc/application/models/Block.php +++ b/airtime_mvc/application/models/Block.php @@ -1140,16 +1140,14 @@ EOT; $column = CcFilesPeer::getTableMap()->getColumnByPhpName(self::$criteria2PeerMap[$spCriteria]); // if the column is timestamp, convert it into UTC if ($column->getType() == PropelColumnTypes::TIMESTAMP) { + $spCriteriaValue = Application_Common_DateHelper::ConvertToUtcDateTimeString($criteria['value']); /* Check if only a date was supplied and trim * the time after it is converted to UTC time */ if (strlen($criteria['value']) <= 10) { //extract date only from timestamp in db $spCriteria = 'date('.$spCriteria.')'; - $spCriteriaValue = Application_Common_DateHelper::ConvertToUtcDateTimeString($criteria['value']); $spCriteriaValue = substr($spCriteriaValue, 0, 10); - } else { - $spCriteriaValue = Application_Common_DateHelper::ConvertToUtcDateTimeString($criteria['value']); } } else if($spCriteria == "bit_rate") { // multiply 1000 because we store only number value