X-Git-Url: https://git.llucax.com/mecon/intranet.git/blobdiff_plain/7e48327fd634cc173dc5df502f5f175484c2b944..f05f1b7fbe5df248ba7f3b9506dfa313fad063bb:/sistema/local_lib/HTML_Noticia.php

diff --git a/sistema/local_lib/HTML_Noticia.php b/sistema/local_lib/HTML_Noticia.php
index c1b6d2c..9730ac4 100644
--- a/sistema/local_lib/HTML_Noticia.php
+++ b/sistema/local_lib/HTML_Noticia.php
@@ -31,6 +31,7 @@
 
 // +X2C includes
 require_once 'HTML/Table.php';
+require_once 'MECON/HTML/Link.php';
 // ~X2C
 
 // +X2C Class 162 :HTML_Noticia
@@ -73,6 +74,17 @@ class HTML_Noticia extends HTML_Table {
             $this->addRow(array($this->noticia->getTitulo()), array('class' => 'noticias_textoazul'));
             $this->addRow(array($this->noticia->getTitulo2()), array('class' => 'noticias_titulo_vinculos'));
             $this->addRow(array($this->noticia->getTexto()), array('class' => 'noticias_titulo_noticia'));
+            foreach($this->noticia->getLinks() as $l)
+              $this->addRow(array(new MECON_HTML_Link('una_noticia',$l['texto'],$l)));
+            foreach($this->noticia->getArchivos() as $a)
+            {
+              //Cuando se cambie la herramienta hay que usar este otro script
+              //para obtener los archivos
+              //$this->addRow(array(new MECON_HTML_Link('attach.php',$a['texto'],$a)));
+              $this->addRow(array(new MECON_HTML_Link('http://intranet.mecon.ar/get_file.epl',
+                        $a['texto'],
+                        array('NEWS.FilesForArticle.file_for_article_id' =>$a['numero']))));
+            }
             $tmp = $this->noticia->getFecha();
             $this->addRow(array($tmp->format('Fecha de publicación: %d/%m/%Y')),
 	                  array('class' => 'noticias_ver_mas'));
@@ -83,11 +95,14 @@ 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'));
+        return parent::toHTML();    
 	}
 	else
 	{
-            $this->addRow(array($this->noticia->getSeccion()),
-	                array('class' => 'noticias_subtitulo'));
+            $seccion = $this->noticia->getSeccion();
+	    if(!is_null($seccion))
+              $this->addRow(array($seccion),
+ 	                  array('class' => 'noticias_subtitulo'));
   	    $img_str = null;
  	    if($this->nuevo)
 	    {
@@ -99,12 +114,15 @@ class HTML_Noticia extends HTML_Table {
             $this->addRow(array($tmp->format('(%d/%m/%Y)')),
 	                  array('class' => 'noticias_fecha_noticia'));
 	    $mas = new MECON_HTML_Image('images/noticia_mas.gif');
-            $this->addRow(array("<a href='$this->vermas' class='noticias_ver_mas'>".$mas->toHTML().' ver más</a>'),
+	    if(isset($this->vermas))
+	    {
+              $this->addRow(array("<a href='$this->vermas' class='noticias_ver_mas'>".$mas->toHTML().' ver más</a>'),
 	                  array('class' => 'noticias_ver_mas'));
+	    }
             $this->addRow(array(new MECON_HTML_Image('images/noticia_linea_puntos.gif')),
 	                  array('class' => 'noticias_ver_mas'));
+        return @ $this->toHTML_no_tabla();    
 	}
-        return parent::toHTML();    
     }
     // -X2C
 
@@ -202,5 +220,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
 ?>