From 0c379ef840b4b7bb1165a366e51951ad4e01c5ff Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 30 Aug 2013 15:03:43 -0400 Subject: [PATCH] a working show instance select. --- .../application/services/HistoryService.php | 4 +- .../js/airtime/playouthistory/historytable.js | 58 ++++++++++++++++++- .../public/js/airtime/utilities/utilities.js | 26 ++++++--- 3 files changed, 75 insertions(+), 13 deletions(-) diff --git a/airtime_mvc/application/services/HistoryService.php b/airtime_mvc/application/services/HistoryService.php index ed411efd0..1001e01cf 100644 --- a/airtime_mvc/application/services/HistoryService.php +++ b/airtime_mvc/application/services/HistoryService.php @@ -857,7 +857,7 @@ class Application_Service_HistoryService try { $form = $this->makeHistoryItemForm(null); $history_id = $form->getElement("his_item_id"); - $instanceId = $data["instance_id"]; + $instanceId = isset($data["instance_id"]) ? $data["instance_id"] : null; $json = array(); if ($form->isValid($data) && $this->validateHistoryItem($instanceId, $form)) { @@ -883,7 +883,7 @@ class Application_Service_HistoryService try { $id = $data["his_item_id"]; - $instanceId = $data["instance_id"]; + $instanceId = isset($data["instance_id"]) ? $data["instance_id"] : null; $form = $this->makeHistoryItemForm($id); $history_id = $form->getElement("his_item_id"); $history_id->setRequired(true); diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js index ea92dc4b2..744a8b450 100644 --- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js +++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js @@ -604,7 +604,9 @@ var AIRTIME = (function(AIRTIME) { id = data[0].value, createUrl = baseUrl+"Playouthistory/create-list-item/format/json", updateUrl = baseUrl+"Playouthistory/update-list-item/format/json", - url; + url, + $select = $hisDialogEl.find("#his_instance_select"), + instance; url = (id === "") ? createUrl : updateUrl; @@ -614,6 +616,16 @@ var AIRTIME = (function(AIRTIME) { value: fnServerData.instance }); } + else if ($select.length > 0) { + instance = $select.val(); + + if (instance > 0) { + data.push({ + name: "instance_id", + value: instance + }); + } + } $.post(url, data, function(json) { @@ -645,6 +657,46 @@ var AIRTIME = (function(AIRTIME) { } }); + $('body').on("click", "#his_instance_retrieve", function(e) { + var startPicker = $hisDialogEl.find('#his_item_starts_datetimepicker').data('datetimepicker'), + endPicker = $hisDialogEl.find('#his_item_ends_datetimepicker').data('datetimepicker'), + url = baseUrl+"playouthistory/show-history-feed", + startDate = startPicker.getLocalDate(), + endDate = endPicker.getLocalDate(), + getEpochSeconds = AIRTIME.utilities.fnGetSecondsEpoch, + data; + + data = { + start: getEpochSeconds(startDate), + end: getEpochSeconds(endDate), + format: "json" + }; + + $.get(url, data, function(json) { + var i, + $select = $('