- Correccion de bugs

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

diff --git a/lib/MECON/HTML/QuickForm.php b/lib/MECON/HTML/QuickForm.php
index 3f952e3629fd18194604e71fc2afd09b4a2b9993..c5b52cafa236657b7428e4ec83aab9bf5d2343b6 100644 (file)
--- a/lib/MECON/HTML/QuickForm.php
+++ b/lib/MECON/HTML/QuickForm.php
@@ -24,55 +24,60 @@ Autor:  Leandro Lucarella <llucar@mecon.gov.ar>
 $Id$
 -----------------------------------------------------------------------------*/
 
-require_once 'HTML/QuickForm.php';
+require_once 'MECON/HTML/QuickFormSimple.php';
 require_once 'MECON/HTML/QuickForm/Renderer/Tabla.php';
-require_once 'MECON/HTML/QuickForm/Renderer/Tabla_Servicios.php';
 
 /**
  * QuickForm de uso general del MECON.
  */
-class MECON_HTML_QuickForm extends HTML_QuickForm {
-    var $_rendererOpts = array();
-    var $_renderer = 'MECON_HTML_QuickForm_Renderer_Tabla()';
+class MECON_HTML_QuickForm extends MECON_HTML_QuickFormSimple {
+    
+    var $renderer;
+    
     function MECON_HTML_QuickForm($formName='', $method='post', $action='', $target='_self', $attributes=null)
     {
-        parent::HTML_QuickForm($formName, $method, $action, $target, $attributes);
-        $this->registerElementType('mdate', 'MECON/HTML/QuickForm/mdate.php', 'HTML_QuickForm_mdate');
-        $this->registerRule('fecha', 'function', 'validate', 'HTML_QuickForm_mdate');
-        $this->setRequiredNote('<FONT color="red">*</FONT> indica un campo obligatorio');
-        $this->setJsWarnings('Hay errores en el formulario:', 'Por favor corríjalos antes de continuar.');
+        parent::MECON_HTML_QuickFormSimple($formName, $method, $action, $target, $attributes);
+        $this->renderer =& new MECON_HTML_QuickForm_Renderer_Tabla();
     }
-    function addRule($element, $message, $type, $format='', $validation='client', $reset = false, $force = false)
-    {
-        parent::addRule($element, $message, $type, $format, $validation, $reset, $force);
-    }
-    function addGroupRule($group, $arg1, $type='', $format='', $howmany=0, $validation = 'client')
+
+    function toHtml() 
     {
-        parent::addGroupRule($group, $arg1, $type, $format, $howmany, $validation);
+        $this->accept($this->renderer);
+        return $this->renderer->toHtml();
     }
-    function toHtml() {
 
-        //AGREGADO por mmarre
-        $renderer =& new $this->_renderer ($this->_rendererOpts);
-       
-        $this->accept($renderer);
-        return $renderer->toHtml();
-    }
+    /**
+     * TODO aclarar que usar
+     * $FORM->renderer->updateAttributes()
+     *
+     * @deprecated 
+     */
     function setRendererOpts($opts) {
-        $this->_rendererOpts = $opts;
+        $this->renderer->updateAttributes($opts);
     }
-    function getRendererOpts($opts) {
-        return $this->_rendererOpts;;
+
+    /**
+     * TODO aclarar que usar
+     * $FORM->renderer->updateAttributes()
+     *
+     * @deprecated 
+     */
+    function getRendererOpts() {
+        return $this->renderer->getAttributes();
     }
+
+    /**
+     * TODO aclarar que usar
+     * $FORM->renderer->updateAttributes()
+     *
+     * @deprecated 
+     */
     function updateRendererOpts($opts) {
-        $this->_rendererOpts = array_merge($this->_rendererOpts, $opts);
+        $this->renderer->updateAttributes($opts);
     }
-    
-    //AGREGADO POR mmarre PARA PODER DECIDIR CUAL DE NUESTROS RENDERES UTILIZAR
-    //Por defecto utiliza el renderer que deja las tablas como estaban en un
-    //principio.
-    function setRenderer($renderer = 'MECON_HTML_QuickForm_Renderer_Tabla') {
-        $this->_renderer = $renderer.'()';
+
+    function getCSS() {
+        return $this->renderer->getCSS();
     }
 
 }