X-Git-Url: https://git.llucax.com/mecon/meconlib.git/blobdiff_plain/3b53a78c315679eaa81ee631458f248f9e3e1ac9..ae358836441d335d3c6a8138e32d027bbc5e1194:/marco/doc/uml/Marco.xmi

diff --git a/marco/doc/uml/Marco.xmi b/marco/doc/uml/Marco.xmi
index 0c0c7f1..66db300 100644
--- a/marco/doc/uml/Marco.xmi
+++ b/marco/doc/uml/Marco.xmi
@@ -9,7 +9,7 @@
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
-  <docsettings viewid="4" documentation="" uniqueid="130" />
+  <docsettings viewid="4" documentation="" uniqueid="132" />
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="3" abstract="0" documentation="Clase que se encarga del manejo del marco en general en los sistemas de intranet.
 Trabaja de forma general, llamando a los demas objetos para la realizacion del marco." name="Marco" static="0" scope="200" >
@@ -92,6 +92,7 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
    <UML:Class stereotype="" package="" xmi.id="14" abstract="0" documentation="Clase para el manejo de los menues y secciones de los sistemas." name="Menu" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="56" type="void" abstract="0" documentation="Constructor. Recibe como parametro el directorio en donde se encuentra el sistema." name="Menu" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="null" type="string" abstract="0" documentation="Nombre del directorio en donde se encuentra el sistema.							" name="directorio" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="5" value="" type="array" abstract="0" documentation="Array con los datos del menu" name="menu" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="59" type="string" abstract="0" documentation="Funcion que devuelve un string en html con lo que hay que imprimir en pantalla." name="toHtml" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="87" type="string" abstract="0" documentation="Funcion que devuelve un string en html de las secciones con lo que hay que imprimir en pantalla." name="toHtmlSecciones" static="0" scope="200" />
@@ -132,7 +133,6 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="array" abstract="0" documentation="Array con los datos de los hijos de la seccion" name="hijos" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="117" type="string" abstract="0" documentation="Devuelve un string con el tipo de menu de la seccion" name="darTipoMenu" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="119" type="string" abstract="0" documentation="Funcion que devuelve un string con el html a imprimir por pantalla del menu de la seccion." name="menuToHtml" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="121" type="string" abstract="0" documentation="Funcion que devuelve el string del titulo de la seccion" name="tituloToHtml" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="122" type="string" abstract="0" documentation="Funcion que devuelve el string del titulo a mostrar en pantalla" name="darTitulo" static="0" scope="201" />
     <UML:Operation stereotype="" package="" xmi.id="127" type="void" abstract="0" documentation="Funcion que se encarga de desserializar el array asociativo paginas-secciones." name="desSerializarArraySecciones" static="0" scope="201" />
@@ -140,6 +140,7 @@ Trabaja de forma general, llamando a los demas objetos para la realizacion del m
 Devuelve 1 si pertenece a la seccion, en caso contrario 0." name="verifSeccionSeleccionada" static="0" scope="201" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre de la pagina a la cual se quiere acceder." name="link_sel" static="0" scope="200" />
     </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="132" type="string" abstract="0" documentation="Funcion que se encarga de devolver el html del menu a incluir en la pagina (menu vertical, horizontal o titulo segun corresponda)" name="menuToHtml" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="60" value="" type="string" abstract="0" documentation="Nombre de la seccion." name="nombre" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="61" value="" type="Imagen" abstract="0" documentation="Este es el nombre de la imagen" name="imagen" static="0" scope="201" />
     <UML:Attribute stereotype="" package="" xmi.id="62" value="" type="Menu" abstract="0" documentation="Hijos (menu) de la seccion." name="hijos" static="0" scope="201" />
@@ -172,17 +173,13 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
    <UML:Class stereotype="" package="" xmi.id="100" abstract="0" documentation="Clase que se encarga del manejo de los menues horizontales" name="MenuHorizontal" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="106" type="string" abstract="0" documentation="Funcion que se encarga de devolver el html de lo que hay que mostrar por pantalla" name="toHtml" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="111" type="void" abstract="0" documentation="Constructor. Recibe el nombre del menu, el link y el nombre de la imagen." name="MenuHorizontal" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del menu" name="nombre" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Link del menu" name="link" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="string" abstract="0" documentation="Nombre de la imagen del menu" name="imagen" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="" type="string" abstract="0" documentation="Array con los datos del menu" name="menu" static="0" scope="200" />
     </UML:Operation>
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="103" abstract="0" documentation="" name="MenuVertical" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="107" type="string" abstract="0" documentation="Funcion que se encarga de devolver el html que hay que mostrar en pantalla." name="toHtml" static="0" scope="200" />
     <UML:Operation stereotype="" package="" xmi.id="110" type="void" abstract="0" documentation="Constructor. Recibe el nombre del menu, el link y el nombre de la imagen." name="MenuVertical" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="Nombre del menu" name="nombre" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Link del menu" name="link" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="string" abstract="0" documentation="Imagen del menu" name="imagen" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="" type="array" abstract="0" documentation="Array con los datos del menu" name="menu" static="0" scope="200" />
     </UML:Operation>
    </UML:Class>
   </umlobjects>
@@ -192,15 +189,15 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="164" showattsigs="601" usesdiagramusefillcolour="0" x="347" linecolour="#ff0000" y="89" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="220" usefillcolor="1" showattributes="1" xmi.id="3" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="147" showattsigs="601" usesdiagramusefillcolour="0" x="3" linecolour="#ff0000" y="19" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="9" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="144" showattsigs="601" usesdiagramusefillcolour="0" x="239" linecolour="#ff0000" y="17" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="10" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="139" showattsigs="601" usesdiagramusefillcolour="0" x="351" linecolour="#ff0000" y="995" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="66" usefillcolor="1" showattributes="1" xmi.id="18" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="436" showattsigs="601" usesdiagramusefillcolour="0" x="233" linecolour="#ff0000" y="877" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="195" showattsigs="601" usesdiagramusefillcolour="0" x="454" linecolour="#ff0000" y="385" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="165" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="139" showattsigs="601" usesdiagramusefillcolour="0" x="142" linecolour="#ff0000" y="1016" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="66" usefillcolor="1" showattributes="1" xmi.id="18" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="436" showattsigs="601" usesdiagramusefillcolour="0" x="14" linecolour="#ff0000" y="874" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="17" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="217" showattsigs="601" usesdiagramusefillcolour="0" x="335" linecolour="#ff0000" y="375" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="165" usefillcolor="1" showattributes="1" xmi.id="14" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="136" showattsigs="601" usesdiagramusefillcolour="0" x="44" linecolour="#ff0000" y="320" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="66" usefillcolor="1" showattributes="1" xmi.id="15" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="210" showattsigs="601" usesdiagramusefillcolour="0" x="45" linecolour="#ff0000" y="583" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="165" usefillcolor="1" showattributes="1" xmi.id="16" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="153" showattsigs="601" usesdiagramusefillcolour="0" x="489" linecolour="#ff0000" y="42" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="55" usefillcolor="1" showattributes="1" xmi.id="13" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
      <UML:ConceptWidget usesdiagramfillcolour="0" width="64" showattsigs="601" usesdiagramusefillcolour="0" x="676" linecolour="#ff0000" y="180" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="21" usefillcolor="1" showattributes="1" xmi.id="92" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="283" showattsigs="601" usesdiagramusefillcolour="0" x="500" linecolour="#ff0000" y="753" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="100" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="273" showattsigs="601" usesdiagramusefillcolour="0" x="327" linecolour="#ff0000" y="691" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="166" showattsigs="601" usesdiagramusefillcolour="0" x="326" linecolour="#ff0000" y="712" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="100" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="154" showattsigs="601" usesdiagramusefillcolour="0" x="484" linecolour="#ff0000" y="624" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="38" usefillcolor="1" showattributes="1" xmi.id="103" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,6,-1,0,50,0,0,0,0,0" />
     </widgets>
     <messages/>
     <associations>
@@ -224,7 +221,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="3" widgetaid="14" documentation="" type="501" >
       <linepath>
-       <startpoint startx="551" starty="385" />
+       <startpoint startx="443" starty="375" />
        <endpoint endx="429" endy="309" />
       </linepath>
      </UML:AssocWidget>
@@ -236,14 +233,14 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" widgetbid="16" widgetaid="17" documentation="" type="501" >
       <linepath>
-       <startpoint startx="378" starty="877" />
+       <startpoint startx="159" starty="874" />
        <endpoint endx="150" endy="748" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="18" widgetaid="17" documentation="" type="500" >
       <linepath>
-       <startpoint startx="451" starty="932" />
-       <endpoint endx="420" endy="995" />
+       <startpoint startx="232" starty="929" />
+       <endpoint endx="211" endy="1016" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="92" widgetaid="3" documentation="" type="500" >
@@ -252,33 +249,33 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <endpoint endx="676" endy="190" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="14" widgetaid="100" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="14" widgetaid="100" documentation="" type="500" >
       <linepath>
-       <startpoint startx="641" starty="753" />
-       <endpoint endx="584" endy="550" />
+       <startpoint startx="409" starty="712" />
+       <endpoint endx="407" endy="540" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="14" widgetaid="103" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="2" widgetbid="14" widgetaid="103" documentation="" type="500" >
       <linepath>
-       <startpoint startx="463" starty="691" />
-       <endpoint endx="519" endy="550" />
+       <startpoint startx="561" starty="624" />
+       <endpoint endx="479" endy="540" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" widgetbid="100" widgetaid="17" documentation="" type="501" >
       <linepath>
-       <startpoint startx="523" starty="877" />
-       <endpoint endx="641" endy="791" />
+       <startpoint startx="304" starty="874" />
+       <endpoint endx="409" endy="750" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="4" indexa="2" totalcountb="3" indexb="1" widgetbid="14" widgetaid="16" documentation="" type="501" >
       <linepath>
        <startpoint startx="150" starty="583" />
-       <endpoint endx="454" endy="440" />
+       <endpoint endx="335" endy="430" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="4" indexb="3" widgetbid="16" widgetaid="14" documentation="" type="501" >
       <linepath>
-       <startpoint startx="454" starty="495" />
+       <startpoint startx="335" starty="485" />
        <endpoint endx="202" endy="583" />
       </linepath>
      </UML:AssocWidget>
@@ -359,8 +356,8 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="815" id="106" label="toHtml" />
       </listitem>
       <listitem open="0" type="813" id="15" label="Pagina" >
-       <listitem open="0" type="815" id="67" label="link" />
        <listitem open="0" type="814" id="65" label="link" />
+       <listitem open="0" type="815" id="67" label="link" />
        <listitem open="0" type="815" id="66" label="Pagina" />
        <listitem open="0" type="814" id="81" label="permisos" />
        <listitem open="0" type="814" id="80" label="titulo" />
@@ -386,7 +383,7 @@ x2c:include: HTML/Page.php" name="HTML_Page" static="0" scope="200" />
        <listitem open="0" type="814" id="130" label="directorio" />
        <listitem open="0" type="814" id="62" label="hijos" />
        <listitem open="0" type="814" id="61" label="imagen" />
-       <listitem open="0" type="815" id="119" label="menuToHtml" />
+       <listitem open="0" type="815" id="132" label="menuToHtml" />
        <listitem open="0" type="814" id="60" label="nombre" />
        <listitem open="0" type="815" id="63" label="Seccion" />
        <listitem open="0" type="814" id="118" label="tipoMenu" />