Changeset 3294

Timestamp:

01/16/07 07:53:15 (2 years ago)

Author:

fabien

Message:

fixed support for time in admin generator and object helpers

Files:

• trunk/data/generator/sfPropelAdmin/default/template/actions/actions.class.php (modified) (2 diffs)
• trunk/lib/helper/DateFormHelper.php (modified) (3 diffs)
• trunk/lib/helper/FormHelper.php (modified) (2 diffs)
• trunk/lib/helper/ObjectHelper.php (modified) (1 diff)
• trunk/test/functional/backend/timeTest.php (modified) (2 diffs)
• trunk/test/unit/helper/DateFormHelperTest.php (modified) (2 diffs)

trunk/data/generator/sfPropelAdmin/default/template/actions/actions.class.php

@@ -250 +250 @@
-        {
-          $dateFormat = new sfDateFormat($this->getUser()->getCulture());
-= ($type == CreoleTypes::DATE ? 'd' : 'g')
-($type == CreoleTypes::DATE ? 'i' : 'I')
+ = $type == CreoleTypes::DATE ? 'd' : 'g'
+$type == CreoleTypes::DATE ? 'i' : 'I'
-          if (!is_array($<?php echo $this->getSingularName() ?>['<?php echo $name ?>']))
-          {
@@ -259 +259 @@
-          {
-            $value_array = $<?php echo $this->getSingularName() ?>['<?php echo $name ?>'];
-
+.(isset($value_array['hour']) ? ' '.$value_array['hour'].':'.$value_array['minute'].(isset($value_array['second']) ? ':'.$value_array['second'] : '') : '')
-          }
-          $this-><?php echo $this->getSingularName() ?>->set<?php echo $column->getPhpName() ?>($value);

trunk/lib/helper/DateFormHelper.php

@@ -588 +588 @@
-  $ampm_seperator = _get_option($options, 'ampm_seperator', '');
-  $include_second = _get_option($options, 'include_second');
-
-
-
+  
+
+ 
-
-  if ($include_custom = _get_option($options, 'include_custom'))
@@ -620 +620 @@
-  $tags = array();
-
- . 
-($_12hour_time)
-
- . 
+.
+$_12hour_time
+
+.
-  $tags[] = select_minute_tag($minute_name, _parse_value_for_date($value, 'minute', 'i'), $options + $include_custom_minute, $html_options);
-
-  if ($include_second)
-  {
- . 
+.
-    $tags[] = select_second_tag($second_name, _parse_value_for_date($value, 'second', 's'), $options + $include_custom_second, $html_options);
-  }
@@ -636 +636 @@
-  if ($_12hour_time)
-  {
- . "[ampm]"
- . 
+.'[ampm]'
+.
-  }
-

trunk/lib/helper/FormHelper.php

@@ -619 +619 @@
-  $culture = _get_option($options, 'culture', $context->getUser()->getCulture());
-
+  $withTime = _get_option($options, 'withtime', false);
+
-  // rich control?
-  if (!_get_option($options, 'rich', false))
@@ -627 +629 @@
-    $options['culture'] = $culture;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-  $dateFormat = new sfDateFormat($culture);

trunk/lib/helper/ObjectHelper.php

@@ -35 +35 @@
-  $options = _parse_attributes($options);
-
-
+ G:i
-
-  return input_date_tag(_convert_method_to_name($method, $options), $value, $options);

trunk/test/functional/backend/timeTest.php

@@ -32 +32 @@
-;
-
-
-
+ (without time)
+ + 3600
-$b->
-
+withtime=false 
-
-  post('/article/edit/id/1', array('article' => array('end_date' => array('day' => date('d', $tomorrow), 'month' => date('m', $tomorrow), 'year' => date('Y', $tomorrow)))))->
@@ -46 +46 @@
-  checkResponseElement(sprintf('select[name="article[end_date][day]"] option[value="%s"][selected="selected"]', date('d', $tomorrow)))->
-  checkResponseElement(sprintf('select[name="article[end_date][month]"] option[value="%s"][selected="selected"]', date('m', $tomorrow)))->
-
+
+
+
-;
+
+// non rich date (with time)
+$b->
+  customizeGenerator(array('edit' => array('fields' => array('end_date' => array('params' => 'withtime=true rich=false')))))->
+
+  post('/article/edit/id/1', array('article' => array('end_date' => array('day' => date('d', $tomorrow), 'month' => date('m', $tomorrow), 'year' => date('Y', $tomorrow), 'hour' => date('G', $tomorrow), 'minute' => date('i', $tomorrow)))))->
+  isStatusCode(302)->
+  isRequestParameter('module', 'article')->
+  isRequestParameter('action', 'edit')->
+
+  isRedirected(true)->
+  followRedirect()->
+  checkResponseElement(sprintf('select[name="article[end_date][day]"] option[value="%s"][selected="selected"]', date('d', $tomorrow)))->
+  checkResponseElement(sprintf('select[name="article[end_date][month]"] option[value="%s"][selected="selected"]', date('m', $tomorrow)))->
+  checkResponseElement(sprintf('select[name="article[end_date][year]"] option[value="%s"][selected="selected"]', date('Y', $tomorrow)))->
+  checkResponseElement(sprintf('select[name="article[end_date][hour]"] option[value="%s"][selected="selected"]', date('G', $tomorrow)))->
+  checkResponseElement(sprintf('select[name="article[end_date][minute]"] option[value="%s"][selected="selected"]', date('i', $tomorrow)))
+;

trunk/test/unit/helper/DateFormHelperTest.php

@@ -81 +81 @@
-}
-
-77
+81
-
-$context = sfContext::getInstance();
@@ -189 +189 @@
-// select_time_tag()
-$t->diag('select_time_tag()');
+$t->like(select_time_tag('time'), '/<select name="time\[hour\]" id="time_hour">/', 'select_time_tag() outputs a select tag for hours');
+$t->like(select_time_tag('time'), '/selected="selected">'.date('H').'/', 'select_time_tag() selects the current hours by default');
+$t->like(select_time_tag('time'), '/<select name="time\[minute\]" id="time_minute">/', 'select_time_tag() outputs a select tag for minutes');
+$t->like(select_time_tag('time'), '/selected="selected">'.date('i').'/', 'select_time_tag() selects the current minutes by default');
-$t->todo('select_time_tag()');
-