Los tipos de celdas clara y oscura solo reemplazan el color de la letra y el color...

diff --git a/lib/MECON/HTML/Tabla.php b/lib/MECON/HTML/Tabla.php
index 78c3a7470c706a2a4c642d3f573d6201bc83e8d4..c5d2765d294068005b65cbebcf909c6359fde88c 100644 (file)
--- a/lib/MECON/HTML/Tabla.php
+++ b/lib/MECON/HTML/Tabla.php
@@ -291,14 +291,18 @@ class MECON_HTML_Tabla extends HTML_Table {
                 case 'th':
                     $rta[$attr] = '';
                     break;
-                case 'clara': //Toma los mismos parametros que titulo pero en el pdf no se repite
-                    $rta = array_merge($rta,
-                            $this->_conf['atributos']["celda_titulo"]);
+                case 'clara': 
+                    $tmp = $this->_conf['atributos']['celda_comun'];
+                    $tmp['bgcolor'] = $this->_conf['atributos']['celda_titulo']['bgcolor'];
+                    $tmp['class'] = $this->_conf['atributos']['celda_titulo']['class'];
+                    $rta = array_merge($rta, $tmp);
                     $rta[$attr] = $attr;
                     break;
-                case 'oscura': //Toma los mismos parametros que cabecera pero en el pdf no se repite
-                    $rta = array_merge($rta,
-                            $this->_conf['atributos']["celda_cabecera"]);
+                case 'oscura':
+                    $tmp = $this->_conf['atributos']['celda_comun'];
+                    $tmp['bgcolor'] = $this->_conf['atributos']['celda_cabecera']['bgcolor'];
+                    $tmp['class'] = $this->_conf['atributos']['celda_cabecera']['class'];
+                    $rta = array_merge($rta, $tmp);
                     $rta[$attr] = $attr;
                     break;
                 default:

diff --git a/lib/MECON/PDF/Tabla.php b/lib/MECON/PDF/Tabla.php
index 876c704e1c35467d401ca287ff2113bed92268b7..38c5a58d47700a14d8d734a00b769e57e6c7e57f 100644 (file)
--- a/lib/MECON/PDF/Tabla.php
+++ b/lib/MECON/PDF/Tabla.php
@@ -120,12 +120,24 @@ class MECON_PDF_Tabla extends MECON_PDF_Contenido {
      */
     function _obtenerEstiloCelda($row, $col) {
         $clase = $this->_tabla->getCellAttributes($row, $col);
-        if (@$clase['cabecera'] || @$clase['oscura']) {
+        if (@$clase['cabecera']) {
             $estilo = $this->_config['celda_cabecera'];
         }
-        elseif (@$clase['titulo'] || @$clase['clara']) {
+        elseif (@$clase['titulo']) {
             $estilo = $this->_config['celda_titulo'];
         }
+        elseif (@$clase['oscura']) {
+            $tmp = $this->_config['celda_comun'];
+            $tmp['fillcolor'] = $this->_config['celda_cabecera']['fillcolor'];
+            $tmp['fill'] = $this->_config['celda_cabecera']['fill'];
+            $estilo = $tmp;
+        }
+        elseif (@$clase['clara']) {
+            $tmp = $this->_config['celda_comun'];
+            $tmp['fillcolor'] = $this->_config['celda_titulo']['fillcolor'];
+            $tmp['fill'] = $this->_config['celda_titulo']['fill'];
+            $estilo = $tmp;
+        }
         else {
             $estilo = $this->_config['celda_comun'];
         }

diff --git a/test/PDF/test.php b/test/PDF/test.php
index 9c34cb74b0886921cf16b6ed0967e189a2fbf862..05267513439fa8f8d56b84fc0e1c56fc5af805b1 100755 (executable)
--- a/test/PDF/test.php
+++ b/test/PDF/test.php
@@ -7,6 +7,7 @@ require_once 'MECON/HTML/Tabla.php';
 require_once 'MECON/PDF/Marco.php';
 require_once 'MECON/PDF/Tabla.php';
 require_once 'MECON/PDF/Texto.php';
+require_once 'MECON/PDF/SaltoPagina.php';
 
 $TABLA =& new MECON_HTML_Tabla();
 
@@ -59,17 +60,18 @@ $PDF_TEXTO2->setEstilo(0,  array ('font'   => 'Helvetica-Bold', 'height' => 8,
 
 //print '<PRE>MARTIN FIN </PRE>';
 
-$PDF_MARCO =& new MECON_PDF_Marco ('a4', 'landscape');
+$PDF_MARCO =& new MECON_PDF_Marco ('a4', 'portrait');
 $PDF_MARCO->seccion   = 'Prueba de la libreria de PDF\'s';
 $PDF_MARCO->titulo    = 'Alberto Giordano';
 $PDF_MARCO->subtitulo = 'Filosofo Estilista, guacho pulenta si los hay';
 
 $PDF_MARCO->addContent(new MECON_PDF_Tabla ($TABLA), false);
-$PDF_MARCO->addContent($PDF_TEXTO, false);
-$PDF_MARCO->addContent($PDF_TEXTO2, true);
-$PDF_MARCO->addContent($PDF_TEXTO2, true);
-$PDF_MARCO->addContent($PDF_TEXTO2, true);
-$PDF_MARCO->addContent(new MECON_PDF_Tabla ($TABLA), true);
+//$PDF_MARCO->addContent($PDF_TEXTO, false);
+//$PDF_MARCO->addContent($PDF_TEXTO2, true);
+//$PDF_MARCO->addContent(new MECON_PDF_SaltoPagina(), false);
+//$PDF_MARCO->addContent($PDF_TEXTO2, true);
+//$PDF_MARCO->addContent($PDF_TEXTO2, true);
+//$PDF_MARCO->addContent(new MECON_PDF_Tabla ($TABLA), true);
 
 $PDF_MARCO->display();