Correccion para que se vean los nombres de los campos de noticia igual a la herramienta

diff --git a/doc/noticias.xmi b/doc/noticias.xmi
index 4beeecdfb3eb429e3624b75e93b74b0092770d45..4937942840204e46d542c42243bf997ff3b05125 100644 (file)
--- a/doc/noticias.xmi
+++ b/doc/noticias.xmi
@@ -10,7 +10,7 @@
  </XMI.header>
  <XMI.content>
   <docsettings viewid="160" documentation="
  </XMI.header>
  <XMI.content>
   <docsettings viewid="160" documentation="

-" uniqueid="186" />
+" uniqueid="190" />

   <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" >
   <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" >


@@ -19,7 +19,7 @@
     <UML:Operation stereotype="" package="" xmi.id="180" type="string" abstract="0" documentation="" name="getTitulo" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="183" type="string" abstract="0" documentation="" name="getTitulo2" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="181" type="string" abstract="0" documentation="" name="getTexto" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="180" type="string" abstract="0" documentation="" name="getTitulo" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="183" type="string" abstract="0" documentation="" name="getTitulo2" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="181" type="string" abstract="0" documentation="" name="getTexto" static="0" scope="200" />

-    <UML:Operation stereotype="" package="" xmi.id="182" type="string" abstract="0" documentation="" name="getAbstracto" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="182" type="string" abstract="0" documentation="" name="getSintesis" static="0" scope="200" />

     <UML:Operation stereotype="" package="" xmi.id="186" type="string" abstract="0" documentation="" name="getFecha" 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:Operation stereotype="" package="" xmi.id="186" type="string" abstract="0" documentation="" name="getFecha" 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>


@@ -51,27 +51,42 @@ x2c:include:HTML/Table.php
     <UML:Operation stereotype="" package="" xmi.id="178" type="string" abstract="0" documentation="" name="getNombre" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="179" type="void" abstract="0" documentation="" name="getNoticias" static="0" scope="200" />
    </UML:Class>
     <UML:Operation stereotype="" package="" xmi.id="178" type="string" abstract="0" documentation="" name="getNombre" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="179" type="void" abstract="0" documentation="" name="getNoticias" static="0" scope="200" />
    </UML:Class>

+   <UML:Class stereotype="" package="sistema/local_lib" xmi.id="187" abstract="0" documentation="" name="HTML_Titulares" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="190" type="void" abstract="0" documentation="" name="HTML_Titulares" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="int" abstract="0" documentation="" name="grupo_secciones" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="int" abstract="0" documentation="" name="antiguedad" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Attribute stereotype="" package="" xmi.id="188" value="null" type="int" abstract="0" documentation="" name="antiguedad" static="0" scope="200" />
+    <UML:Attribute stereotype="" package="" xmi.id="189" value="" type="int" abstract="0" documentation="" name="grupo_secciones" static="0" scope="200" />
+   </UML:Class>

   </umlobjects>
   <diagrams>
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="160" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" font="Helvetica,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" >
     <widgets>
   </umlobjects>
   <diagrams>
    <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="160" documentation="" type="402" showops="1" showpackage="0" name="class diagram" localid="30000" showstereotype="0" showscope="1" font="Helvetica,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" >
     <widgets>

-     <UML:ConceptWidget usesdiagramfillcolour="0" width="160" showattsigs="601" usesdiagramusefillcolour="0" x="101" linecolour="#ff0000" y="233" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="128" usefillcolor="1" showattributes="1" xmi.id="161" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="220" showattsigs="601" usesdiagramusefillcolour="0" x="408" linecolour="#ff0000" y="237" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="128" usefillcolor="1" showattributes="1" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="160" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="237" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="128" usefillcolor="1" showattributes="1" xmi.id="161" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="220" showattsigs="601" usesdiagramusefillcolour="0" x="225" linecolour="#ff0000" y="197" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="128" usefillcolor="1" showattributes="1" xmi.id="162" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />

      <UML:ConceptWidget usesdiagramfillcolour="0" width="80" showattsigs="601" usesdiagramusefillcolour="0" x="477" linecolour="#ff0000" y="47" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="32" usefillcolor="1" showattributes="1" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="272" showattsigs="601" usesdiagramusefillcolour="0" x="65" linecolour="#ff0000" y="62" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="88" usefillcolor="1" showattributes="1" xmi.id="170" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="80" showattsigs="601" usesdiagramusefillcolour="0" x="477" linecolour="#ff0000" y="47" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="32" usefillcolor="1" showattributes="1" xmi.id="164" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="272" showattsigs="601" usesdiagramusefillcolour="0" x="65" linecolour="#ff0000" y="62" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="88" usefillcolor="1" showattributes="1" xmi.id="170" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />

+     <UML:ConceptWidget usesdiagramfillcolour="0" width="416" showattsigs="601" usesdiagramusefillcolour="0" x="267" linecolour="#ff0000" y="363" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="64" usefillcolor="1" showattributes="1" xmi.id="187" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />

     </widgets>
     <messages/>
     <associations>
     </widgets>
     <messages/>
     <associations>

-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >

       <linepath>
       <linepath>

-       <startpoint startx="518" starty="237" />
-       <endpoint endx="517" endy="79" />
+       <startpoint startx="335" starty="197" />
+       <endpoint endx="503" endy="79" />

       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="162" widgetaid="161" documentation="" type="510" >
       <linepath>
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="162" widgetaid="161" documentation="" type="510" >
       <linepath>

-       <startpoint startx="261" starty="297" />
-       <endpoint endx="408" endy="301" />
+       <startpoint startx="170" starty="301" />
+       <endpoint endx="225" endy="261" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="164" widgetaid="187" documentation="" type="500" >
+      <linepath>
+       <startpoint startx="475" starty="363" />
+       <endpoint endx="530" endy="79" />

       </linepath>
      </UML:AssocWidget>
     </associations>
       </linepath>
      </UML:AssocWidget>
     </associations>


@@ -90,10 +105,15 @@ x2c:include:HTML/Table.php
       <listitem open="0" type="815" id="166" label="toHTML" />
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />
       <listitem open="0" type="815" id="166" label="toHTML" />
      </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />

+     <listitem open="1" type="813" id="187" label="HTML_Titulares" >
+      <listitem open="0" type="815" id="190" label="HTML_Titulares" />
+      <listitem open="0" type="814" id="188" label="antiguedad" />
+      <listitem open="0" type="814" id="189" label="grupo_secciones" />
+     </listitem>

      <listitem open="0" type="807" id="160" label="class diagram" />
      <listitem open="1" type="813" id="161" label="noticia" >
       <listitem open="0" type="814" id="168" label="Noticia" />
      <listitem open="0" type="807" id="160" label="class diagram" />
      <listitem open="1" type="813" id="161" label="noticia" >
       <listitem open="0" type="814" id="168" label="Noticia" />

-      <listitem open="0" type="815" id="182" label="getAbstracto" />
+      <listitem open="0" type="815" id="182" label="getSintesis" />

       <listitem open="0" type="815" id="186" label="getFecha" />
       <listitem open="0" type="815" id="181" label="getTexto" />
       <listitem open="0" type="815" id="180" label="getTitulo" />
       <listitem open="0" type="815" id="186" label="getFecha" />
       <listitem open="0" type="815" id="181" label="getTexto" />
       <listitem open="0" type="815" id="180" label="getTitulo" />

diff --git a/lib/noticia.php b/lib/noticia.php
index 96ba6b25411a8aa1beda412de3119f2314a10f71..50e89704f530963bd0b9c5f64f852490b0ddb0f1 100644 (file)
--- a/lib/noticia.php
+++ b/lib/noticia.php
@@ -60,9 +60,9 @@ class noticia {
                  WHERE Article_id = $noticia";
        $result = $db->query($query);
        $row = $result->fetchRow();
                  WHERE Article_id = $noticia";
        $result = $db->query($query);
        $row = $result->fetchRow();

-       $this->titulo2 = $row[0];
-       $this->titulo = $row[1];
-       $this->abstracto = $row[2];
+       $this->titulo = $row[0];
+       $this->titulo2 = $row[1];
+       $this->sintesis = $row[2];

        $this->texto = $row[3];
        $this->fecha = new Date($row[4]);
     }
        $this->texto = $row[3];
        $this->fecha = new Date($row[4]);
     }


@@ -95,9 +95,9 @@ class noticia {
      * @return string
      * @access public
      */
      * @return string
      * @access public
      */

-    function getAbstracto() // ~X2C
+    function getSintesis() // ~X2C

     {
     {

-        return $this->abstracto;
+        return $this->sintesis;

     }
     // -X2C
 
     }
     // -X2C
 

diff --git a/sistema/local_lib/HTML_Noticia.php b/sistema/local_lib/HTML_Noticia.php
index bbbf2002f6157f84cdc3384c3e531ff2cda32eec..d7dca9b1ae48ce3c5fc148060e6ad44a7c5f2eb1 100644 (file)
--- a/sistema/local_lib/HTML_Noticia.php
+++ b/sistema/local_lib/HTML_Noticia.php
@@ -20,8 +20,8 @@
 // | along with Hooks; if not, write to the Free Software Foundation,   |
 // | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
 // +--------------------------------------------------------------------+
 // | along with Hooks; if not, write to the Free Software Foundation,   |
 // | Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA      |
 // +--------------------------------------------------------------------+

-// | Creado: Thu Jul 3 14:43:38 2003                                   |
-// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                                                    |
+// | Creado: Thu Jul 3 14:43:38 2003                                    |
+// | Autor:  Gonzalo Merayo <gmeray@mecon.gov.ar>                       |

 // +--------------------------------------------------------------------+
 //
 // $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $
 // +--------------------------------------------------------------------+
 //
 // $Id: xmi2code.tpl.php 1 2003-06-23 18:29:20Z gmeray $


@@ -65,22 +65,43 @@ class HTML_Noticia extends HTML_Table {
      */
     function toHTML() // ~X2C
     {
      */
     function toHTML() // ~X2C
     {

-        $this->addRow(array($this->noticia->getTitulo2()), array('class' => 'subtitulo'));
-       $img_str = null;
-       if($this->nuevo)
+        if($this->completa)

        {
        {

-         $nuevo = new HTML_Image('images/nuevo.gif');
-         $img_str = $nuevo->toHTML();
+            $this->addRow(array('El Nombre de la Seccion'), array('class' => 'titulo_uno'));
+            $this->addRow(array(new HTML_Image('images/noticia_linea_azul.gif')),
+                         array('class' => 'ver_mas'));
+            $this->addRow(array($this->noticia->getTitulo()), array('class' => 'textoazul'));
+            $this->addRow(array($this->noticia->getTitulo2()), array('class' => 'titulo_vinculos'));
+            $this->addRow(array($this->noticia->getTexto()), array('class' => 'titulo_noticia'));
+            $tmp = $this->noticia->getFecha();
+            $this->addRow(array($tmp->format('Fecha de publicación: %d/%m/%Y')),
+                         array('class' => 'ver_mas'));
+            $this->addRow(array(new HTML_Image('images/blanco.gif')),
+                         array('class' => 'ver_mas'));
+            $tmp = new HTML_Image('images/noticia_anterior.gif');
+            $this->addRow(array($tmp->toHTML().'volver'),
+                         array('class' => 'ver_mas'));
+       }
+       else
+       {
+            $this->addRow(array($this->noticia->getTitulo()),
+                       array('class' => 'subtitulo'));
+           $img_str = null;
+           if($this->nuevo)
+           {
+               $nuevo = new HTML_Image('images/noticia_nuevo.gif');
+               $img_str = $nuevo->toHTML();
+           }
+            $this->addRow(array($this->noticia->getTitulo2().$img_str), array('class' => 'titulo_noticia'));
+            $tmp = $this->noticia->getFecha();
+            $this->addRow(array($tmp->format('(%d/%m/%Y)')),
+                         array('class' => 'fecha_noticia'));
+           $mas = new HTML_Image('images/noticia_mas.gif');
+            $this->addRow(array($mas->toHTML().'ver más'),
+                         array('class' => 'ver_mas'));
+            $this->addRow(array(new HTML_Image('images/noticia_linea_puntos.gif')),
+                         array('class' => 'ver_mas'));

        }
        }

-        $this->addRow(array($this->noticia->getTitulo().$img_str), array('class' => 'titulo_noticia'));
-        $tmp = $this->noticia->getFecha();
-        $this->addRow(array($tmp->format('(%d/%m/%Y)')),
-                                array('class' => 'fecha_noticia'));
-       $mas = new HTML_Image('images/mas.gif');
-        $this->addRow(array($mas->toHTML().'ver más'),
-                                array('class' => 'ver_mas'));
-        $this->addRow(array(new HTML_Image('images/linea_puntos.gif')),
-                                array('class' => 'ver_mas'));

         return parent::toHTML();    
     }
     // -X2C
         return parent::toHTML();    
     }
     // -X2C


@@ -130,4 +151,4 @@ class HTML_Noticia extends HTML_Table {
     // -X2C
 
 } // -X2C Class :HTML_Noticia
     // -X2C
 
 } // -X2C Class :HTML_Noticia

-?>
\ No newline at end of file
+?>

diff --git a/sistema/local_lib/HTML_Titulares.php b/sistema/local_lib/HTML_Titulares.php
index 1c003c9ab4655eb5d89987c1636a1938966522e5..03d2b1d66abba71b706934eb0380fa7a189491e3 100644 (file)
--- a/sistema/local_lib/HTML_Titulares.php
+++ b/sistema/local_lib/HTML_Titulares.php
@@ -105,10 +105,11 @@ class HTML_Titulares extends HTML_Table {
           }
       } 
 
           }
       } 
 

-
-        $this->addRow(array($ht1,$ht2));
+      $this->addRow(array($ht1,$ht2));
+      $this->updateCellAttributes(0,0,array('valign'=>'top'));
+      $this->updateCellAttributes(0,1,array('valign'=>'top'));

     }
     // -X2C
 
 } // -X2C Class :HTML_Titulares
     }
     // -X2C
 
 } // -X2C Class :HTML_Titulares

-?>
+?>
\ No newline at end of file