From 5e7a5b3e1d48d1db17488a7c2d27396b1757d39d Mon Sep 17 00:00:00 2001
From: Robb Ebright <ebright.48@osu.edu>
Date: Sun, 7 Jan 2018 15:27:58 -0500
Subject: [PATCH] Revert "fixed smart block criteria view to show dropdown
 based upon current values vs. database values to fix display when form is
 invalid"

This reverts commit fc4f82a83a5ccc47eb61f65f0e93e57623261241.
---
 .../views/scripts/form/smart-block-criteria.phtml | 15 +++++----------
 .../js/airtime/playlist/smart_blockbuilder.js     |  1 +
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
index 91d1cb6c2..114cfd919 100644
--- a/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
+++ b/airtime_mvc/application/views/scripts/form/smart-block-criteria.phtml
@@ -92,24 +92,19 @@
             <div <?php if (/*($i > 0) && */ $disabled) {
                           echo 'style=display:none';
                       } ?> >
-                <?php
-                echo $this->element->getElement("sp_criteria_field_".$i."_".$j) ?>
-                <?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j); Logging::info($this->element->getElement('sp_criteria_modifier_'.$i.'_'.$j)->getValue());?>
+                <?php echo $this->element->getElement("sp_criteria_field_".$i."_".$j) ?>
+                <?php echo $this->element->getElement("sp_criteria_modifier_".$i."_".$j)   /* @todo finish this */?>
 
                 <?php echo $this->element->getElement("sp_criteria_value_".$i."_".$j) ?>
-                <span class='sp_text_font' id="datetime_select"
-                    <?php //hide the datetime select unless the relative datetime modifiers are selected
-                    if(!(preg_match('/before|after|between/', $this->element->getElement("sp_criteria_modifier_".$i."_".$j)->getValue()) == 1)
-                    ) {echo('style="display:none;"'); }?>>
-                <?php echo $this->element->getElement('sp_criteria_datetime_select_'.$i."_".$j) ?><?php echo _(" ago "); ?></span>
+                <span class='sp_text_font' id="datetime_select" <?php echo $this->element->getElement("sp_criteria_datetime_select_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo $this->element->getElement('sp_criteria_datetime_select_'.$i."_".$j) ?><?php echo _(" ago "); ?></span>
 
                 <a class='btn btn-small btn-new' id='modifier_add_<?php echo $i ?>'>
                     <i class='icon-white icon-plus'></i><?php echo(_("New Modifier")); ?>
                 </a>
 
                 <span class='sp_text_font' id="extra_criteria" <?php echo $this->element->getElement("sp_criteria_extra_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo _(" to "); ?><?php echo $this->element->getElement('sp_criteria_extra_'.$i."_".$j) ?></span>
-                <span class='sp_text_font' id="extra_datetime_select"
-                    <?php if (!($this->element->getElement("sp_criteria_modifier_".$i."_".$j)->getValue() == 'between')) { echo 'style="display:none;"'; }?>><?php echo $this->element->getElement('sp_criteria_extra_datetime_select_'.$i."_".$j) ?><?php echo _(" ago "); ?></span>
+                <span class='sp_text_font' id="extra_datetime_select" <?php echo $this->element->getElement("sp_criteria_extra_datetime_select_".$i."_".$j)->getAttrib("disabled") == "disabled"?'style="display:none;"':""?>><?php echo $this->element->getElement('sp_criteria_extra_datetime_select_'.$i."_".$j) ?><?php echo _(" ago "); ?></span>
+
                 <a style='margin-right:3px' class='btn btn-small btn-danger' id='criteria_remove_<?php echo $i ?>'>
                     <i class='icon-white icon-remove spl-no-r-margin'></i>
                 </a>
diff --git a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
index c70abbef9..5442de35c 100644
--- a/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
+++ b/airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
@@ -529,6 +529,7 @@ function setupUI() {
  * and shows the criteria drop-down
  */
 function enableAndShowDateTimeDropdown(valEle, index) {
+    console.log('datetime show');
     var spanDatetime = valEle.nextAll("#datetime_select");
     spanDatetime.children('#sp_criteria_datetime_select_'+index).removeAttr("disabled");
     spanDatetime.children('#sp_criteria_extra_datetime_select_'+index).removeAttr("disabled");