Se arregla para que ande bien con QuickForm 3.2.

[mecon/meconlib.git] / lib / MECON / HTML / QuickForm / mdate.php

diff --git a/lib/MECON/HTML/QuickForm/mdate.php b/lib/MECON/HTML/QuickForm/mdate.php
index 803fd315d7e3d1fab5ef26559671392666c56c0f..78aced3c42b990920b7e78eb574210d2cbf359f4 100644 (file)
--- a/lib/MECON/HTML/QuickForm/mdate.php
+++ b/lib/MECON/HTML/QuickForm/mdate.php
@@ -47,44 +47,37 @@ class MECON_HTML_QuickForm_mdate extends HTML_QuickForm_date {
      * @return    void
      */
     function MECON_HTML_QuickForm_mdate($elementName=null, $elementLabel=null, $options=array(), $attributes=null) {
-        $this->_options = array ('es' => array (
+        $this->_locale = array ('es' => array (
                                            'weekdays_short'=> array ('' => '--', 'Dom', 'Lun', 'Mar', 'Mié', 'Jue', 'Vie', 'Sáb'),
                                            'weekdays_long' => array ('' => '--', 'Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'),
                                            'months_short'  => array ('' => '--', 'Ene', 'Feb', 'Mar', 'Abr', 'May', 'Jun', 'Jul', 'Ago', 'Sep', 'Oct', 'Nov', 'Dic'),
-                                           'months_long'   => array ('' => '--', 'Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septimbre', 'Octubre', 'Noviembre', 'Diciembre')
+                                           'months_long'   => array ('' => '--',
+                                               'Enero', 'Febrero', 'Marzo',
+                                               'Abril', 'Mayo', 'Junio',
+                                               'Julio', 'Agosto', 'Septiembre', 
+                                               'Octubre', 'Noviembre', 'Diciembre')
                                        )
                                 );
-
         parent::HTML_QuickForm_date($elementName, $elementLabel,
                                     array_merge(array('language'=>'es','format'=>'d F Y'), $options),
                                     $attributes);
     } //end constructor
 
-    // }}}
-    // {{{ _createNumericOptionList()
-
-    /**
-     * Creates a numeric option list based on a start number and end number
-     *
-     * @param int $start The start number
-     * @param int $end The end number
-     *
-     * @access public
-     * @return array An array of numeric options.
-     */
-    function _createNumericOptionList($start, $end) {
-        $options = array();
-        //TODO
-        //Verificar que esto este funcionando bien.
-        $options[''] = '--';
-        //Hasta aca
-        for ($i = $start; $i <= $end; $i++) {
+   /**
+    * Creates an option list containing the numbers from the start number to the end, inclusive
+    *
+    * @param    int     The start number
+    * @param    int     The end number
+    * @param    int     Increment by this value
+    * @access   private
+    * @return   array   An array of numeric options.
+    */
+    function _createOptionList($start, $end, $step = 1) {
+        for ($i = $start, $options = array('' => '--'); $start > $end? $i >= $end: $i <= $end; $i += $step) {
             $options[$i] = sprintf('%02d', $i);
         }
-
         return $options;
-
-    } // end func _createNumericOptionList
+    } // end func _createOptionList
 
     /**
      * Devuelve un objeto date
@@ -95,7 +88,10 @@ class MECON_HTML_QuickForm_mdate extends HTML_QuickForm_date {
      */
     function &getValue() {
         if ($this->_selectedDate['Y']) {
-            return new Date (sprintf("%04d-%02d-%02d 00:00:00",$this->_selectedDate['Y'],$this->_selectedDate['F'],$this->_selectedDate['d']));
+            return new Date (@sprintf("%04d-%02d-%02d %02d:%02d:00",
+            $this->_selectedDate['Y'], $this->_selectedDate['F'],
+            $this->_selectedDate['d'], $this->_selectedDate['H'],
+            $this->_selectedDate['i']));
         } else {
             return null;
         }