X-Git-Url: https://git.llucax.com/mecon/meconlib.git/blobdiff_plain/0520607cdb3e5d7347ed08bfe8c2a4dfaeefee15..d8d1303e69f2b5f4a495c128cc70ca0b78d7d3ce:/lib/MECON/HTML/QuickForm/mdate.php?ds=sidebyside

diff --git a/lib/MECON/HTML/QuickForm/mdate.php b/lib/MECON/HTML/QuickForm/mdate.php
index b1fb915..6e5a8d3 100644
--- a/lib/MECON/HTML/QuickForm/mdate.php
+++ b/lib/MECON/HTML/QuickForm/mdate.php
@@ -1,31 +1,28 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Martin Marrese
-// | Date: jue jun  5 17:59:44 ART 2003
-// +----------------------------------------------------------------------+
-//
-// $Id$
-//
-// $Author$
-// $URL$
-// $Date$
-// $Rev$
-//
+<?php /* vim: set binary expandtab tabstop=4 shiftwidth=4 textwidth=80:
+-------------------------------------------------------------------------------
+                             Ministerio de Economía
+                                    meconlib
+-------------------------------------------------------------------------------
+This file is part of meconlib.
 
+meconlib is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
 
+meconlib is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ 
+You should have received a copy of the GNU General Public License; if not,
+write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+Boston, MA  02111-1307  USA
+-------------------------------------------------------------------------------
+Creado: jue jun  5 17:59:44 ART 2003
+Autor:  Martin Marrese <mmarre@mecon.gov.ar>
+-------------------------------------------------------------------------------
+$Id$
+-----------------------------------------------------------------------------*/
 
 require_once 'HTML/QuickForm/date.php';
 require_once 'Date.php';
@@ -53,14 +50,16 @@ class HTML_QuickForm_mdate extends HTML_QuickForm_date
     function HTML_QuickForm_mdate($elementName=null, $elementLabel=null, $options=array(), $attributes=null)
     {
         $this->_options = 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')
+                                               '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')
                                 )
                         );
                         
-        parent::HTML_QuickForm_date($elementName, $elementLabel, $options, $attributes);
+        parent::HTML_QuickForm_date($elementName, $elementLabel,
+            array_merge(array('language'=>'es','format'=>'d F Y'), $options),
+            $attributes);
     } //end constructor
 
     // }}}
@@ -80,7 +79,7 @@ class HTML_QuickForm_mdate extends HTML_QuickForm_date
         $options = array();
         //TODO 
         //Verificar que esto este funcionando bien.
-        $options['--'] = '--';
+        $options[''] = '--';
         //Hasta aca
         for ($i = $start; $i <= $end; $i++) {
             $options[$i] = sprintf('%02d', $i);
@@ -99,7 +98,7 @@ class HTML_QuickForm_mdate extends HTML_QuickForm_date
      */
     function &getValue()
     {
-        if ($this->_selectedDate['Y'] != 00) {
+        if ($this->_selectedDate['Y']) {
             return new Date (sprintf("%04d-%02d-%02d 00:00:00",$this->_selectedDate['Y'],$this->_selectedDate['F'],$this->_selectedDate['d']));
         } 
         else {
@@ -118,12 +117,18 @@ class HTML_QuickForm_mdate extends HTML_QuickForm_date
      */
     function validate($valor, $nombre, $formato = '')
     {
-        $str = sprintf ("%4d-%02d-%02d",$valor['Y'],$valor['F'],$valor['d']);
-   
-        if (($valor['Y'] != '--' && $valor['d'] != '--' && $valor['F'] != '--') && ($valor['Y'] != '' && $valor['d'] != '' && $valor['F'] != '')) {
+        // Si viene completamente lleno, se valida con el paquete Validate.
+        if ($valor['Y'] and $valor['d'] and $valor['F']) {
+            $str = sprintf('%4d-%02d-%02d', $valor['Y'], $valor['F'], $valor['d']);
             return  Validate::date($str, array('format' => '%Y-%m-%d'));
+        // Si viene completamente vacio, es valido.
+        } elseif (!$valor['Y'] and !$valor['d'] and !$valor['F']) {
+            return true;
+        // Si viene a medio completar, es invalido.
+        } else {
+            return false;
         }
-        return true;
     } // end func validate
 }
+
 ?>