diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index a3aab34c5..9460ce914 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -43,14 +43,14 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view = $this->getResource('view');
$view->doctype('XHTML1_STRICT');
}
-
+
protected function _initGlobals()
{
$view = $this->getResource('view');
$baseUrl = Application_Common_OsPath::getBaseDir();
-
+
$view->headScript()->appendScript("var baseUrl = '$baseUrl'");
-
+
$user = Application_Model_User::GetCurrentUser();
if (!is_null($user)){
$userType = $user->getType();
@@ -58,7 +58,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$userType = "";
}
$view->headScript()->appendScript("var userType = '$userType';");
-
+
}
protected function _initHeadLink()
@@ -68,7 +68,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view = $this->getResource('view');
$baseUrl = Application_Common_OsPath::getBaseDir();
-
+
$view->headLink()->appendStylesheet($baseUrl.'css/redmond/jquery-ui-1.8.8.custom.css?'.$CC_CONFIG['airtime_version']);
$view->headLink()->appendStylesheet($baseUrl.'css/pro_dropdown_3.css?'.$CC_CONFIG['airtime_version']);
$view->headLink()->appendStylesheet($baseUrl.'css/qtip/jquery.qtip.min.css?'.$CC_CONFIG['airtime_version']);
@@ -83,16 +83,16 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$CC_CONFIG = Config::getConfig();
$view = $this->getResource('view');
-
+
$baseUrl = Application_Common_OsPath::getBaseDir();
-
+
//$view->headScript()->appendFile($baseUrl.'js/libs/jquery-1.7.2.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendFile('http://code.jquery.com/jquery-1.10.1.min.js','text/javascript');
$view->headScript()->appendFile('http://code.jquery.com/jquery-migrate-1.2.1.min.js','text/javascript');
-
+
//$view->headScript()->appendFile($baseUrl.'js/libs/jquery-ui-1.8.18.custom.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendFile('http://code.jquery.com/ui/1.10.3/jquery-ui.js','text/javascript');
-
+
$view->headScript()->appendFile($baseUrl.'js/libs/jquery.stickyPanel.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendFile($baseUrl.'js/qtip/jquery.qtip.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendFile($baseUrl.'js/jplayer/jquery.jplayer.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
@@ -104,7 +104,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$view->headScript()->appendFile($baseUrl.'locale/datatables-translation-table?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendScript("$.i18n.setDictionary(general_dict)");
$view->headScript()->appendScript("var baseUrl='$baseUrl'");
-
+
//scripts for now playing bar
$view->headScript()->appendFile($baseUrl.'js/airtime/airtime_bootstrap.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendFile($baseUrl.'js/airtime/dashboard/helperfunctions.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
diff --git a/airtime_mvc/application/controllers/PlayouthistoryController.php b/airtime_mvc/application/controllers/PlayouthistoryController.php
index b77420594..db1b23dd6 100644
--- a/airtime_mvc/application/controllers/PlayouthistoryController.php
+++ b/airtime_mvc/application/controllers/PlayouthistoryController.php
@@ -150,24 +150,24 @@ class PlayouthistoryController extends Zend_Controller_Action
unset($this->view->form);
}
-
+
public function deleteListItemAction()
{
$history_id = $this->_getParam('id');
-
+
$historyService = new Application_Service_HistoryService();
- $historyService->deletePlayedItem($history_id);
+ $historyService->deletePlayedItem($history_id);
}
-
+
public function updateListItemAction()
{
$request = $this->getRequest();
$params = $request->getPost();
Logging::info($params);
-
+
$historyService = new Application_Service_HistoryService();
$json = $historyService->editPlayedItem($params);
-
+
$this->view->data = $json;
}
@@ -182,34 +182,42 @@ class PlayouthistoryController extends Zend_Controller_Action
$this->view->data = $json;
}
-
+
public function templateAction()
{
-
+
}
-
+
+ public function configureItemTemplateAction() {
+
+ $historyService = new Application_Service_HistoryService();
+ $mandatoryFields = $historyService->mandatoryItemTemplate();
+
+ $this->view->required = $mandatoryFields;
+ }
+
public function createTemplateAction()
{
-
+
}
-
+
public function editTemplateAction()
{
-
+
}
-
+
public function deleteTemplateAction()
{
-
+
}
-
+
public function createTemplateFieldAction()
{
-
+
}
-
+
public function deleteTemplateFieldAction()
{
-
+
}
}
diff --git a/airtime_mvc/application/forms/EditHistoryItem.php b/airtime_mvc/application/forms/EditHistoryItem.php
index eebc6b849..e165a009c 100644
--- a/airtime_mvc/application/forms/EditHistoryItem.php
+++ b/airtime_mvc/application/forms/EditHistoryItem.php
@@ -3,17 +3,20 @@
class Application_Form_EditHistoryItem extends Zend_Form
{
const VALIDATE_DATETIME_FORMAT = 'yyyy-MM-dd HH:mm:ss';
+ //this is used by the javascript widget, unfortunately h/H is opposite from Zend.
+ const TIMEPICKER_DATETIME_FORMAT = 'yyyy-MM-dd hh:mm:ss';
+
const VALIDATE_DATE_FORMAT = 'yyyy-MM-dd';
const VALIDATE_TIME_FORMAT = 'HH:mm:ss';
-
+
const ID_PREFIX = "his_item_";
-
+
const ITEM_TYPE = "type";
const ITEM_CLASS = "class";
const ITEM_ID_SUFFIX = "name";
-
+
const TEXT_INPUT_CLASS = "input_text";
-
+
private $formElTypes = array(
TEMPLATE_DATE => array(
"class" => "Zend_Form_Element_Text",
@@ -105,11 +108,11 @@ class Application_Form_EditHistoryItem extends Zend_Form
"class" => "Zend_Validate_Float",
)
)
- ),
+ ),
);
-
+
public function init() {
-
+
$this->setDecorators(array(
'PrepareElements',
array('ViewScript', array('viewScript' => 'form/edit-history-item.phtml'))
@@ -121,32 +124,34 @@ class Application_Form_EditHistoryItem extends Zend_Form
));
$history_id->setDecorators(array('ViewHelper'));
$this->addElement($history_id);
-
+
$starts = new Zend_Form_Element_Text(self::ID_PREFIX.'starts');
$starts->setValidators(array(
new Zend_Validate_Date(self::VALIDATE_DATETIME_FORMAT)
));
$starts->setAttrib('class', self::TEXT_INPUT_CLASS);
- $starts->setAttrib('data-format', self::VALIDATE_DATETIME_FORMAT);
+ $starts->setAttrib('data-format', self::TIMEPICKER_DATETIME_FORMAT);
$starts->addFilter('StringTrim');
$starts->setLabel(_('Start Time'));
$starts->setDecorators(array('ViewHelper'));
+ $starts->setRequired(true);
$this->addElement($starts);
-
+
$ends = new Zend_Form_Element_Text(self::ID_PREFIX.'ends');
$ends->setValidators(array(
new Zend_Validate_Date(self::VALIDATE_DATETIME_FORMAT)
));
$ends->setAttrib('class', self::TEXT_INPUT_CLASS);
- $ends->setAttrib('data-format', self::VALIDATE_DATETIME_FORMAT);
+ $ends->setAttrib('data-format', self::TIMEPICKER_DATETIME_FORMAT);
$ends->addFilter('StringTrim');
$ends->setLabel(_('End Time'));
$ends->setDecorators(array('ViewHelper'));
+ $ends->setRequired(true);
$this->addElement($ends);
-
+
$dynamic_attrs = new Zend_Form_SubForm();
$this->addSubForm($dynamic_attrs, self::ID_PREFIX.'template');
-
+
// Add the submit button
$this->addElement('button', 'his_item_save', array(
'ignore' => true,
@@ -156,7 +161,7 @@ class Application_Form_EditHistoryItem extends Zend_Form
'ViewHelper'
)
));
-
+
// Add the cancel button
$this->addElement('button', 'his_item_cancel', array(
'ignore' => true,
@@ -167,66 +172,66 @@ class Application_Form_EditHistoryItem extends Zend_Form
)
));
}
-
+
public function createFromTemplate($template) {
-
+
$templateSubForm = $this->getSubForm(self::ID_PREFIX.'template');
-
+
for ($i = 0, $len = count($template); $i < $len; $i++) {
-
+
$item = $template[$i];
-
+
$formElType = $this->formElTypes[$item[self::ITEM_TYPE]];
-
+
$label = $item[self::ITEM_ID_SUFFIX];
$id = self::ID_PREFIX.$label;
$el = new $formElType[self::ITEM_CLASS]($id);
-
+
//cleaning up presentation of tag name for labels.
$label = implode(" ", explode("_", $label));
$label = ucwords($label);
$el->setLabel(_($label));
-
+
if (isset($formElType["attrs"])) {
-
+
$attrs = $formElType["filters"];
-
+
foreach ($attrs as $key => $value) {
$el->setAttrib($key, $value);
}
}
if (isset($formElType["filters"])) {
-
+
$filters = $formElType["filters"];
-
+
foreach ($filters as $filter) {
$el->addFilter($filter);
}
}
-
+
if (isset($formElType["validators"])) {
-
+
$validators = $formElType["validators"];
-
+
foreach ($validators as $index => $arr) {
$validator = new $arr[self::ITEM_CLASS]();
-
+
//extra validator info
if (isset($arr["params"])) {
-
+
foreach ($arr["params"] as $key => $value) {
$method = "set".ucfirst($key);
$validator->$method($value);
}
}
-
+
$el->addValidator($validator);
}
}
-
+
$el->setDecorators(array('ViewHelper'));
$templateSubForm->addElement($el);
- }
+ }
}
}
\ No newline at end of file
diff --git a/airtime_mvc/application/services/HistoryService.php b/airtime_mvc/application/services/HistoryService.php
index da76a3a8c..be6e63fec 100644
--- a/airtime_mvc/application/services/HistoryService.php
+++ b/airtime_mvc/application/services/HistoryService.php
@@ -212,22 +212,68 @@ class Application_Service_HistoryService
public function populateTemplateItem($values) {
$this->con->beginTransaction();
-
+
try {
$template = $this->getItemTemplate();
+ $prefix = Application_Form_EditHistoryItem::ID_PREFIX;
$historyRecord = new CcPlayoutHistory();
-
+
$timezoneUTC = new DateTimeZone("UTC");
$timezoneLocal = new DateTimeZone($this->timezone);
-
- $dateTime = new DateTime($values["starts"], $timezoneLocal);
- $dateTime->setTimezone($timezoneLocal);
+
+ $dateTime = new DateTime($values[$prefix."starts"], $timezoneLocal);
+ $dateTime->setTimezone($timezoneUTC);
$historyRecord->setDbStarts($dateTime->format("Y-m-d H:i:s"));
-
- $dateTime = new DateTime($result["ends"], $timezoneUTC);
+
+ $dateTime = new DateTime($values[$prefix."ends"], $timezoneLocal);
$dateTime->setTimezone($timezoneUTC);
$historyRecord->setDbEnds($dateTime->format("Y-m-d H:i:s"));
-
+
+ $templateValues = $values[$prefix."template"];
+
+ $file = $historyRecord->getCcFiles();
+
+ $metadata = array();
+
+ for ($i = 0, $len = count($template); $i < $len; $i++) {
+
+ $item = $template[$i];
+ $key = $item["name"];
+ $isFileMd = $item["isFileMd"];
+
+ $entry = $templateValues[$prefix.$key];
+
+ if (!$isFileMd) {
+ Logging::info("adding metadata");
+ }
+ else if ($isFileMd && isset($file)) {
+ Logging::info("adding file metadata associated to a file");
+ }
+ else if ($isFileMd && empty($file)) {
+ Logging::info("adding file metadata NOT associated to a file");
+ $metadata[$key] = $entry;
+ }
+ else {
+ Logging::info("doing something else");
+ }
+
+
+ }
+
+ if (count($metadata) > 0) {
+ $meta = new CcPlayoutHistoryMetaData();
+ }
+
+ foreach ($metadata as $key => $val) {
+
+ $meta->setDbKey($key);
+ $meta->setDbValue($val);
+
+ $historyRecord->addCcPlayoutHistoryMetaData($meta);
+ }
+
+ $historyRecord->save($this->con);
+
$this->con->commit();
}
catch (Exception $e) {
@@ -250,6 +296,8 @@ class Application_Service_HistoryService
Logging::info("created list item");
Logging::info($values);
+
+ $this->populateTemplateItem($values);
}
else {
Logging::info("created list item NOT VALID");
@@ -350,14 +398,37 @@ class Application_Service_HistoryService
//---------------- Following code is for History Templates --------------------------//
+ public function getFieldTypes() {
+
+ $fields = array(
+ TEMPLATE_DATE,
+ TEMPLATE_TIME,
+ TEMPLATE_DATETIME,
+ TEMPLATE_STRING,
+ TEMPLATE_BOOLEAN,
+ TEMPLATE_INT,
+ TEMPLATE_FLOAT,
+ );
+
+ return $fields;
+ }
+
+ public function mandatoryItemTemplate() {
+
+ $fields = array();
+
+ $fields[] = array("name" => "starts", "type" => TEMPLATE_DATETIME, "isFileMd" => false);
+ $fields[] = array("name" => "ends", "type" => TEMPLATE_DATETIME, "isFileMd" => false);
+
+ return $fields;
+ }
private function defaultItemTemplate() {
$fields = array();
- //array index is the position of the item in the history template table.
- //$fields[] = array("name" => "starts", "type" => TEMPLATE_DATETIME, "isFileMd" => false);
- //$fields[] = array("name" => "ends", "type" => TEMPLATE_DATETIME, "isFileMd" => false);
+ $fields[] = array("name" => "starts", "type" => TEMPLATE_DATETIME, "isFileMd" => false);
+ $fields[] = array("name" => "ends", "type" => TEMPLATE_DATETIME, "isFileMd" => false);
$fields[] = array("name" => MDATA_KEY_TITLE, "type" => TEMPLATE_STRING, "isFileMd" => true); //these fields can be populated from an associated file.
$fields[] = array("name" => MDATA_KEY_CREATOR, "type" => TEMPLATE_STRING, "isFileMd" => true);
diff --git a/airtime_mvc/application/views/scripts/playouthistory/configure-item-template.phtml b/airtime_mvc/application/views/scripts/playouthistory/configure-item-template.phtml
new file mode 100644
index 000000000..3dd1c2c7e
--- /dev/null
+++ b/airtime_mvc/application/views/scripts/playouthistory/configure-item-template.phtml
@@ -0,0 +1,7 @@
+
+
+required as $field): ?>
+
+
+
+
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/playouthistory/template.phtml b/airtime_mvc/application/views/scripts/playouthistory/template.phtml
index 5c59f19ef..35df0a2d9 100644
--- a/airtime_mvc/application/views/scripts/playouthistory/template.phtml
+++ b/airtime_mvc/application/views/scripts/playouthistory/template.phtml
@@ -1,3 +1,4 @@