diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index fc9b472f8..3bdb48bd0 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -147,6 +147,12 @@ class LibraryController extends Zend_Controller_Action { $post = $this->getRequest()->getPost(); $datatables = StoredFile::searchFilesForPlaylistBuilder($post); + + //format clip lengh to 2 decimal + /*foreach($datatables["aaData"] as &$data){ + $sec = Playlist::playlistTimeToSeconds($data[5]); + $data[5] = Playlist::secondsToPlaylistTime($sec); + }*/ die(json_encode($datatables)); } diff --git a/airtime_mvc/application/models/Playlist.php b/airtime_mvc/application/models/Playlist.php index 8ecdf64ce..f436eafab 100644 --- a/airtime_mvc/application/models/Playlist.php +++ b/airtime_mvc/application/models/Playlist.php @@ -90,8 +90,9 @@ class Playlist { public static function secondsToPlaylistTime($p_seconds) { $seconds = $p_seconds; - $milliseconds = intval(($seconds - intval($seconds)) * 1000); - $milliStr = str_pad($milliseconds, 3, '0', STR_PAD_LEFT); + $rounded = round($seconds, 2); + list($dump, $milliseconds) = explode('.', $rounded); + $milliStr = str_pad($milliseconds, 2, '0', STR_PAD_LEFT); $hours = floor($seconds / 3600); $seconds -= $hours * 3600; $minutes = floor($seconds / 60); @@ -398,6 +399,10 @@ class Playlist { $offset = 0; foreach ($rows as $row) { $files[$i] = $row->toArray(BasePeer::TYPE_FIELDNAME, true, true); + // display only upto 2 decimal place by calling secondsToPlaylistTime + $clipSec = Playlist::playlistTimeToSeconds($files[$i]['cliplength']); + $files[$i]['cliplength'] = Playlist::secondsToPlaylistTime($clipSec); + // calling the function again to get rid of round off addition error $offset += Playlist::playlistTimeToSeconds($files[$i]['cliplength']); $files[$i]['offset'] = Playlist::secondsToPlaylistTime($offset); $i++; diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml index 08085623f..c7e80f56d 100644 --- a/airtime_mvc/application/views/scripts/playlist/update.phtml +++ b/airtime_mvc/application/views/scripts/playlist/update.phtml @@ -1,7 +1,8 @@ -pl->getContents())) : ?> +pl->getContents(); +if (count($items)) : ?> - -pl->getContents() as $item) : ?> +
  • - pl->getContents()) -1): ?> +
    @@ -25,7 +26,7 @@ - pl->getContents()) -1): ?> +