X-Git-Url: https://git.llucax.com/mecon/intranet.git/blobdiff_plain/3160012cdccbdc9fa1743e66da33b699504d5c84..22b9df4770c3bb030d5d0130974ff8bbe81044cc:/doc/intranet.xmi?ds=sidebyside

diff --git a/doc/intranet.xmi b/doc/intranet.xmi
index a6b4281..0ffbba5 100644
--- a/doc/intranet.xmi
+++ b/doc/intranet.xmi
@@ -9,55 +9,78 @@
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
-  <docsettings viewid="152" documentation="" uniqueid="164" />
+  <docsettings viewid="152" documentation="" uniqueid="174" />
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="153" abstract="0" documentation="x2c:extern
 x2c:include:HTML/Page.php
 " name="HTML_Page" static="0" scope="200" />
    <UML:Class stereotype="" package="sistema/local_lib" xmi.id="154" abstract="0" documentation="" name="HTML_DietMarco" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="155" type="void" abstract="0" documentation="" name="toHTML" static="0" scope="200" />
-    <UML:Operation stereotype="" package="" xmi.id="156" type="void" abstract="0" documentation="" name="addBody" static="0" scope="200" >
-     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="body" static="0" scope="200" />
-    </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="157" type="void" abstract="0" documentation="" name="addTitle" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="title" static="0" scope="200" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="158" type="void" abstract="0" documentation="" name="HTML_DietMarco" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="string" abstract="0" documentation="" name="seccion" static="0" scope="200" />
     </UML:Operation>
-    <UML:Attribute stereotype="" package="" xmi.id="159" value="" type="int" abstract="0" documentation="" name="body" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="160" value="" type="int" abstract="0" documentation="" name="title" static="0" scope="200" />
-    <UML:Attribute stereotype="" package="" xmi.id="161" value="" type="int" abstract="0" documentation="" name="copete" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="168" type="void" abstract="0" documentation="" name="addBodyContent" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="content" static="0" scope="200" />
+    </UML:Operation>
    </UML:Class>
    <UML:Class stereotype="" package="sistema/local_lib" xmi.id="162" abstract="0" documentation="" name="HTML_Copete" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="163" type="void" abstract="0" documentation="" name="HTML_Copete" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="seccion" static="0" scope="200" />
     </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="169" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="164" abstract="0" documentation="x2c:extern
 x2c:include:HTML/Table.php
 " name="HTML_Table" static="0" scope="200" />
+   <UML:Class stereotype="" package="sistema/local_lib" xmi.id="165" abstract="0" documentation="" name="HTML_Servicio" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="166" type="void" abstract="0" documentation="" name="HTML_Servicio" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="" name="seccion" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="167" type="void" abstract="0" documentation="" name="toHTML" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="170" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
+   </UML:Class>
+   <UML:Class stereotype="" package="sistema/local_lib" xmi.id="171" abstract="0" documentation="" name="HTML_Login" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="172" type="void" abstract="0" documentation="" name="HTML_Login" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="173" type="void" abstract="0" documentation="" name="getCSS" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="174" type="void" abstract="0" documentation="" name="toHTML" 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="152" 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="77" showattsigs="601" usesdiagramusefillcolour="0" x="199" linecolour="#ff0000" y="99" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="32" usefillcolor="1" showattributes="1" xmi.id="153" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="236" showattsigs="601" usesdiagramusefillcolour="0" x="85" linecolour="#ff0000" y="240" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="128" usefillcolor="1" showattributes="1" xmi.id="154" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="204" showattsigs="601" usesdiagramusefillcolour="0" x="390" linecolour="#ff0000" y="213" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="40" 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="1" width="80" showattsigs="601" usesdiagramusefillcolour="1" x="410" linecolour="none" y="86" showopsigs="601" usesdiagramlinecolour="1" fillcolour="none" 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="77" showattsigs="601" usesdiagramusefillcolour="0" x="108" linecolour="#ff0000" y="23" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="32" usefillcolor="1" showattributes="1" xmi.id="153" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="236" showattsigs="601" usesdiagramusefillcolour="0" x="15" linecolour="#ff0000" y="120" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="72" usefillcolor="1" showattributes="1" xmi.id="154" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="204" showattsigs="601" usesdiagramusefillcolour="0" x="79" linecolour="#ff0000" y="277" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="56" 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="1" width="80" showattsigs="601" usesdiagramusefillcolour="1" x="352" linecolour="none" y="75" showopsigs="601" usesdiagramlinecolour="1" fillcolour="none" 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="208" showattsigs="601" usesdiagramusefillcolour="0" x="294" linecolour="#ff0000" y="258" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="72" usefillcolor="1" showattributes="1" xmi.id="165" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="132" showattsigs="601" usesdiagramusefillcolour="0" x="519" linecolour="#ff0000" y="259" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="72" usefillcolor="1" showattributes="1" xmi.id="171" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="Helvetica,8,-1,5,50,0,0,0,0,0" />
     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="153" widgetaid="154" documentation="" type="500" >
       <linepath>
-       <startpoint startx="203" starty="240" />
-       <endpoint endx="237" endy="131" />
+       <startpoint startx="133" starty="120" />
+       <endpoint endx="146" endy="55" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
+      <linepath>
+       <startpoint startx="181" starty="277" />
+       <endpoint endx="372" endy="107" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="164" widgetaid="162" documentation="" type="500" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="2" widgetbid="164" widgetaid="165" documentation="" type="500" >
       <linepath>
-       <startpoint startx="492" starty="213" />
-       <endpoint endx="450" endy="118" />
+       <startpoint startx="398" starty="258" />
+       <endpoint endx="392" endy="107" />
+      </linepath>
+     </UML:AssocWidget>
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="3" widgetbid="164" widgetaid="171" documentation="" type="500" >
+      <linepath>
+       <startpoint startx="585" starty="259" />
+       <endpoint endx="412" endy="107" />
       </linepath>
      </UML:AssocWidget>
     </associations>
@@ -68,17 +91,24 @@ x2c:include:HTML/Table.php
     <listitem open="1" type="801" id="-1" label="Logical View" >
      <listitem open="1" type="813" id="162" label="HTML_Copete" >
       <listitem open="0" type="815" id="163" label="HTML_Copete" />
+      <listitem open="0" type="815" id="169" label="getCSS" />
      </listitem>
      <listitem open="1" type="813" id="154" label="HTML_DietMarco" >
       <listitem open="0" type="815" id="158" label="HTML_DietMarco" />
-      <listitem open="0" type="815" id="156" label="addBody" />
+      <listitem open="0" type="815" id="168" label="addBodyContent" />
       <listitem open="0" type="815" id="157" label="addTitle" />
-      <listitem open="0" type="814" id="159" label="body" />
-      <listitem open="0" type="814" id="161" label="copete" />
-      <listitem open="0" type="814" id="160" label="title" />
-      <listitem open="0" type="815" id="155" label="toHTML" />
+     </listitem>
+     <listitem open="1" type="813" id="171" label="HTML_Login" >
+      <listitem open="0" type="815" id="172" label="HTML_Login" />
+      <listitem open="0" type="815" id="173" label="getCSS" />
+      <listitem open="0" type="815" id="174" label="toHTML" />
      </listitem>
      <listitem open="1" type="813" id="153" label="HTML_Page" />
+     <listitem open="1" type="813" id="165" label="HTML_Servicio" >
+      <listitem open="0" type="815" id="166" label="HTML_Servicio" />
+      <listitem open="0" type="815" id="170" label="getCSS" />
+      <listitem open="0" type="815" id="167" label="toHTML" />
+     </listitem>
      <listitem open="1" type="813" id="164" label="HTML_Table" />
      <listitem open="0" type="807" id="152" label="class diagram" />
     </listitem>