Extiendo noticia para que obtenga las imagenes, Corrijo la enie de Login

diff --git a/doc/noticias.xmi b/doc/noticias.xmi
index e7dca799713c5bff753fa9cfc75ce0829e530054..47375a6ef52f8be48e7895cbfe62a6c804fdfaac 100644 (file)
--- a/doc/noticias.xmi
+++ b/doc/noticias.xmi
@@ -11,7 +11,7 @@
  </XMI.header>
  <XMI.content>
   <docsettings viewid="160" documentation="
-" uniqueid="197" />
+" uniqueid="200" />
   <umlobjects>
    <UML:Class stereotype="" package="lib" xmi.id="161" abstract="0" documentation="" name="noticia" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="169" type="void" abstract="0" documentation="" name="noticia" static="0" scope="200" >
@@ -24,6 +24,8 @@
     <UML:Operation stereotype="" package="" xmi.id="186" type="string" abstract="0" documentation="" name="getFecha" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="191" type="void" abstract="0" documentation="" name="getSeccion" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="197" type="void" abstract="0" documentation="" name="getidSeccion" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="199" type="void" abstract="0" documentation="" name="getLinks" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="200" type="void" abstract="0" documentation="" name="getArchivos" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="168" value="" type="int" abstract="0" documentation="" name="Noticia" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="sistema/local_lib" xmi.id="162" abstract="0" documentation="" name="HTML_Noticia" static="0" scope="200" >
@@ -47,6 +49,7 @@
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="" name="link" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="195" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="198" type="void" abstract="0" documentation="" name="toHTML_no_tabla" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="172" value="" type="noticia" abstract="0" documentation="" name="noticia" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="184" value="" type="bool" abstract="0" documentation="" name="completa" static="0" scope="200" />
     <UML:Attribute stereotype="" package="" xmi.id="185" value="" type="int" abstract="0" documentation="" name="nuevo" static="0" scope="200" />
@@ -78,10 +81,10 @@ x2c:include:HTML/Table.php
    <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="187" roleb="164" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
   </umlobjects>
   <diagrams>
-   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="742" snapy="10" showatts="1" xmi.id="160" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Helvetica,4,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="653" >
+   <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="730" snapy="10" showatts="1" xmi.id="160" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="Helvetica,4,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="659" >
     <widgets>
-     <UML:ClassWidget usesdiagramfillcolour="0" width="136" showattsigs="601" usesdiagramusefillcolour="0" x="22" linecolour="#ff0000" y="337" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="140" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="161" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="190" showattsigs="601" usesdiagramusefillcolour="0" x="220" linecolour="#ff0000" y="163" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="168" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="136" showattsigs="601" usesdiagramusefillcolour="0" x="39" linecolour="#ff0000" y="321" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="168" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="161" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="190" showattsigs="601" usesdiagramusefillcolour="0" x="220" linecolour="#ff0000" y="163" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="182" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="73" showattsigs="601" usesdiagramusefillcolour="0" x="477" linecolour="#ff0000" y="47" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="233" showattsigs="601" usesdiagramusefillcolour="0" x="54" linecolour="#ff0000" y="38" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="77" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="170" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ClassWidget usesdiagramfillcolour="0" width="353" showattsigs="601" usesdiagramusefillcolour="0" x="265" linecolour="#ff0000" y="400" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="70" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="187" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
@@ -98,16 +101,16 @@ x2c:include:HTML/Table.php
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="162" roleBdoc="" widgetaid="161" roleAdoc="" documentation="" type="510" changeabilityA="900" changeabilityB="900" visibilityA="200" >
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="3" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="17" linecolour="none" y="-16" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="7" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="17" linecolour="none" y="-16" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="7" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="17" linecolour="none" y="-16" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="7" operation="" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="0" usefillcolor="1" seqnum="" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
       <linepath>
-       <startpoint startx="90" starty="337" />
-       <endpoint endx="220" endy="247" />
+       <startpoint startx="107" starty="321" />
+       <endpoint endx="220" endy="254" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="164" roleBdoc="" widgetaid="187" roleAdoc="" documentation="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
@@ -138,6 +141,7 @@ x2c:include:HTML/Table.php
       <listitem open="0" type="815" id="193" label="setVerMas" />
       <listitem open="0" type="815" id="194" label="setVolver" />
       <listitem open="0" type="815" id="166" label="toHTML" />
+      <listitem open="0" type="815" id="198" label="toHTML_no_tabla" />
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />
      <listitem open="1" type="813" id="187" label="HTML_Titulares" >
@@ -148,7 +152,9 @@ x2c:include:HTML/Table.php
      </listitem>
      <listitem open="1" type="813" id="161" label="noticia" >
       <listitem open="0" type="814" id="168" label="Noticia" />
+      <listitem open="0" type="815" id="200" label="getArchivos" />
       <listitem open="0" type="815" id="186" label="getFecha" />
+      <listitem open="0" type="815" id="199" label="getLinks" />
       <listitem open="0" type="815" id="191" label="getSeccion" />
       <listitem open="0" type="815" id="182" label="getSintesis" />
       <listitem open="0" type="815" id="181" label="getTexto" />

diff --git a/doc/xmi2code.config b/doc/xmi2code.config
index 487b4cb2bb190f3c8f86d488c5860a97ec1afd89..501ddba2b55251be7d4c7263bc53623915fa9a84 100644 (file)
--- a/doc/xmi2code.config
+++ b/doc/xmi2code.config
@@ -31,8 +31,8 @@
 
 <xmi2code>
   <option key="target" value="*"/>
-  <option key="xmi-input" value="noticias.xmi"/>
   <option key="xmi-input" value="intranet.xmi"/>
+  <option key="xmi-input" value="noticias.xmi"/>
   <option key="config-file" value="xmi2code.config"/>
   <option key="config-file-set" value="false"/>
   <option key="handler" value="umbrello"/>

diff --git a/lib/noticia.php b/lib/noticia.php
index bd92c7b5d54ff4f7f16d3f7d0f6f0cc4ff29a736..1f9a6656faf7a0ea93135c749d27e12661c36794 100644 (file)
--- a/lib/noticia.php
+++ b/lib/noticia.php
@@ -143,11 +143,41 @@ class noticia {
      * @return void
      * @access public
      */
-    function getIdSeccion() // ~X2C
+    function getidSeccion() // ~X2C
     {
         return $this->id_seccion;
     }
     // -X2C
 
+    // +X2C Operation 199
+    /**
+     * @return void
+     * @access public
+     */
+    function getLinks() // ~X2C
+    {
+        $db = MEconDAVDB::Connect();
+        $sql = "SELECT link_id FROM Relations WHERE article_id = ".$this->noticia;
+        return $db->getCol($sql);
+    }
+    // -X2C
+
+    // +X2C Operation 200
+    /**
+     * @return void
+     * @access public
+     */
+    function getArchivos() // ~X2C
+    {
+        $db = MEconDAVDB::Connect();
+        $sql = "SELECT file_for_article_id, caption FROM FilesForArticle WHERE article_id = ".$this->noticia;
+        $result =& $db->query($sql);
+        $archivos = array();
+        while($row =& $result->getRow())
+          $archivos[] = array('numero'=>$row[0], 'texto'=>$row[1]);
+        return $archivos;
+    }
+    // -X2C
+
 } // -X2C Class :noticia
 ?>

diff --git a/sistema/local_lib/HTML_Copete.php b/sistema/local_lib/HTML_Copete.php
index 11068184fe6c7f2228929da2102437df11e02fe4..ea3306888fd8574f750b4d6b904d799a15e8aadb 100644 (file)
--- a/sistema/local_lib/HTML_Copete.php
+++ b/sistema/local_lib/HTML_Copete.php
@@ -27,6 +27,7 @@
 // $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
 //
 
+require_once 'MECON/HTML/Image.php';
 
 
 // +X2C includes
@@ -35,7 +36,6 @@ require_once 'HTML/Table.php';
 
 // +X2C Class 162 :HTML_Copete
 /**
- * @package sistema_local_lib
  * @access public
  */
 class HTML_Copete extends HTML_Table {
@@ -43,13 +43,13 @@ class HTML_Copete extends HTML_Table {
      * @var    int $titulo
      * @access private
      */
-    var $_titulo;
+    var $titulo;
 
     /**
      * @var    int $seccion
      * @access private
      */
-    var $_seccion;
+    var $seccion;
 
     // ~X2C
 

diff --git a/sistema/local_lib/HTML_DietMarco.php b/sistema/local_lib/HTML_DietMarco.php
index ec9eded684a32a6e38233fff664f837f0d60ad7e..712df38069bae13e23f8af08ec507adcab66f615 100644 (file)
--- a/sistema/local_lib/HTML_DietMarco.php
+++ b/sistema/local_lib/HTML_DietMarco.php
@@ -39,7 +39,6 @@ require_once 'HTML/Page.php';
 
 // +X2C Class 154 :HTML_DietMarco
 /**
- * @package sistema_local_lib
  * @access public
  */
 class HTML_DietMarco extends HTML_Page {

diff --git a/sistema/local_lib/HTML_Login.php b/sistema/local_lib/HTML_Login.php
index 23b0e12fb9584b6096e377529f3d6371077b0911..9fab8017efb18f2c86dd26a8bb292c0f8d8d941e 100644 (file)
--- a/sistema/local_lib/HTML_Login.php
+++ b/sistema/local_lib/HTML_Login.php
@@ -36,7 +36,6 @@ require_once 'HTML/Table.php';
 
 // +X2C Class 171 :HTML_Login
 /**
- * @package sistema_local_lib
  * @access public
  */
 class HTML_Login extends HTML_Table {
@@ -85,7 +84,7 @@ class HTML_Login extends HTML_Table {
       $int->addRow(array($img->toHTML().'Usuarios',
                          $img2->toHTML().'Usuario:',
                         '<INPUT maxLength=50 name=usuario size=10>',
-                        $img2->toHTML().'Contrasea:',
+                        $img2->toHTML().'Contrase&ntilde;a:',
                         '<INPUT maxLength=50 name=password size=10 type=password>'.
                         '<INPUT value="'.@$_GET['redirect'].@$_POST['redirect'].'" name=redirect type=hidden>',
                         '<INPUT name = Submit type=submit value=Enviar>'));
@@ -104,4 +103,4 @@ class HTML_Login extends HTML_Table {
     // -X2C
 
 } // -X2C Class :HTML_Login
-?>
\ No newline at end of file
+?>

diff --git a/sistema/local_lib/HTML_Mensaje.php b/sistema/local_lib/HTML_Mensaje.php
index 1be99c2a32f07ed772572caa49eb587abd50d1f9..faef4f7b38dc3b1776944d4a2ebe63d9ea08f23b 100644 (file)
--- a/sistema/local_lib/HTML_Mensaje.php
+++ b/sistema/local_lib/HTML_Mensaje.php
@@ -38,7 +38,6 @@ require_once 'HTML/Table.php';
 /**
  * Clase para mostrar mensajes en Intranet.
  *
- * @package sistema_local_lib
  * @access public
  */
 class HTML_Mensaje extends HTML_Table {
@@ -46,19 +45,19 @@ class HTML_Mensaje extends HTML_Table {
      * @var    string $img
      * @access private
      */
-    var $_img;
+    var $img;
 
     /**
      * @var    int $ancho
      * @access private
      */
-    var $_ancho;
+    var $ancho;
 
     /**
      * @var    string $texto
      * @access private
      */
-    var $_texto;
+    var $texto;
 
     // ~X2C
 

diff --git a/sistema/local_lib/HTML_Noticia.php b/sistema/local_lib/HTML_Noticia.php
index 1cb5b72b712580b1e27b0110fce9794552ca12e0..52b472d7ee543a8652be24147ea811f1e9ca0a11 100644 (file)
--- a/sistema/local_lib/HTML_Noticia.php
+++ b/sistema/local_lib/HTML_Noticia.php
@@ -83,6 +83,10 @@ class HTML_Noticia extends HTML_Table {
             $this->addRow(array("<a href='$this->volver' class='noticias_ver_mas'>".$tmp->toHTML().
                                                               'volver</a>'),
                          array('class' => 'noticias_ver_mas'));
+            foreach($this->noticia->getLinks() as $l)
+              $this->addRow(array($l));
+            foreach($this->noticia->getArchivos() as $a)
+              $this->addRow(array($a['caption']));
         return parent::toHTML();    
        }
        else
@@ -113,39 +117,6 @@ class HTML_Noticia extends HTML_Table {
        }
     }
     // -X2C
-    function toHTML_no_tabla()
-    {
-        for ($i = 0 ; $i < $this->_rows ; $i++) {
-          $strHtml .= $tabs ."\t<TR>\n";
-          for ($j = 0 ; $j < $this->_cols ; $j++) {
-            if ($this->_structure[$i][$j] == "SPANNED") {
-              $strHtml .= $tabs ."\t\t<!-- span -->\n";
-              continue;
-            }
-            $type = ($this->_structure[$i][$j]["type"] == "TH" ? "TH" : "TD");
-            $attr = $this->_structure[$i][$j]["attr"];
-            $contents = $this->_structure[$i][$j]["contents"];
-            $strHtml .= $tabs . "\t\t<$type" . $this->_getAttrString($attr) . ">";                if (is_object($contents)) {
-              if (is_subclass_of($contents, "html_common")) {
-                 $contents->setTabOffset($this->_tabOffset + 3);
-                 $contents->_nestLevel = $this->_nestLevel + 1;
-              }
-              if (method_exists($contents, "toHtml")) {
-                 $contents = $contents->toHtml();
-              } elseif (method_exists($contents, "toString")) {
-                 $contents = $contents->toString();
-              }
-            }
-            if (is_array($contents)) $contents = implode(", ",$contents);
-      if (isset($this->_autoFill) && $contents == "") $contents = $this->_autoFill;
-      $strHtml .= $contents;
-      $strHtml .= "</$type>\n";
-    }
-    $strHtml .= $tabs ."\t</TR>\n";
-  }
-  return $strHtml;
-}
-
 
     // +X2C Operation 167
     /**
@@ -241,5 +212,44 @@ class HTML_Noticia extends HTML_Table {
     }
     // -X2C
 
+    // +X2C Operation 198
+    /**
+     * @return void
+     * @access public
+     */
+    function toHTML_no_tabla() // ~X2C
+    {
+        for ($i = 0 ; $i < $this->_rows ; $i++) {
+          $strHtml .= $tabs ."\t<TR>\n";
+          for ($j = 0 ; $j < $this->_cols ; $j++) {
+            if ($this->_structure[$i][$j] == "SPANNED") {
+              $strHtml .= $tabs ."\t\t<!-- span -->\n";
+              continue;
+            }
+            $type = ($this->_structure[$i][$j]["type"] == "TH" ? "TH" : "TD");
+            $attr = $this->_structure[$i][$j]["attr"];
+            $contents = $this->_structure[$i][$j]["contents"];
+            $strHtml .= $tabs . "\t\t<$type" . $this->_getAttrString($attr) . ">";                if (is_object($contents)) {
+              if (is_subclass_of($contents, "html_common")) {
+                 $contents->setTabOffset($this->_tabOffset + 3);
+                 $contents->_nestLevel = $this->_nestLevel + 1;
+              }
+              if (method_exists($contents, "toHtml")) {
+                 $contents = $contents->toHtml();
+              } elseif (method_exists($contents, "toString")) {
+                 $contents = $contents->toString();
+              }
+            }
+            if (is_array($contents)) $contents = implode(", ",$contents);
+      if (isset($this->_autoFill) && $contents == "") $contents = $this->_autoFill;
+      $strHtml .= $contents;
+      $strHtml .= "</$type>\n";
+    }
+    $strHtml .= $tabs ."\t</TR>\n";
+  }
+  return $strHtml;
+    }
+    // -X2C
+
 } // -X2C Class :HTML_Noticia
 ?>

diff --git a/sistema/local_lib/HTML_Servicio.php b/sistema/local_lib/HTML_Servicio.php
index 617681b7fb2a6b712b143d720b469d556da33ee3..5b762a83ecbec67cc7ed0d4c747eb10c3cb4a3a1 100644 (file)
--- a/sistema/local_lib/HTML_Servicio.php
+++ b/sistema/local_lib/HTML_Servicio.php
@@ -40,7 +40,6 @@ require_once 'HTML/Table.php';
 
 // +X2C Class 165 :HTML_Servicio
 /**
- * @package sistema_local_lib
  * @access public
  */
 class HTML_Servicio extends HTML_Table {

diff --git a/sistema/local_lib/HTML_Titulares.php b/sistema/local_lib/HTML_Titulares.php
index 7707d02dda6797bca66417b4337d3df60060c718..b2ad00fe10980920f1931b976690e0d801fe432a 100644 (file)
--- a/sistema/local_lib/HTML_Titulares.php
+++ b/sistema/local_lib/HTML_Titulares.php
@@ -152,4 +152,4 @@ class HTML_Titulares extends HTML_Table {
     // -X2C
 
 } // -X2C Class :HTML_Titulares
-?>
+?>
\ No newline at end of file