X-Git-Url: https://git.llucax.com/mecon/samurai.git/blobdiff_plain/de4cfadb31bf782b45184a44ba02bb73f8cc2f77..10542daf46438502fdc1ab6b874ba17636687b2c:/doc/Samurai.xmi?ds=inline

diff --git a/doc/Samurai.xmi b/doc/Samurai.xmi
index 60d23de..26a1345 100644
--- a/doc/Samurai.xmi
+++ b/doc/Samurai.xmi
@@ -10,7 +10,7 @@
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
-  <docsettings viewid="336" documentation="" uniqueid="394" />
+  <docsettings viewid="336" documentation="" uniqueid="398" />
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="207" abstract="0" documentation="Clase para el manejo de los usuarios.
 @see \ref page_samurai_html_usuario" name="SAMURAI_Usuario" static="0" scope="200" >
@@ -47,6 +47,11 @@
      <UML:Parameter stereotype="" package="" xmi.id="4" value="" type="int" abstract="0" documentation="identificador del sistema en el que se esta haciendo la asociacion" name="id_sistema" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="5" value="" type="int" abstract="0" documentation="Login del usuario que esta haciendo los cambios" name="responsable" static="0" scope="200" />
     </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="396" type="mixed" abstract="0" documentation="Devuelve la informacion completa del usuario. Sistemas a los que esta asignado, perfiles que tiene dentro de cada sistema y permisos." name="informacionGeneral" static="0" scope="200" />
+    <UML:Operation stereotype="" package="" xmi.id="398" type="mixed" abstract="0" documentation="Funcion que obtiene la lista de usuarios que tienen al menos un permiso en la intranet." name="filtrarUsuarios" static="1" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;DB" abstract="0" documentation="Conexion a la base de datos" name="db" static="0" scope="201" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Parte del login a filtrar" name="login" static="0" scope="201" />
+    </UML:Operation>
     <UML:Attribute stereotype="" package="" xmi.id="211" value="" type="string" abstract="0" documentation="Login del usuario en intranet.
 x2c: get set" name="login" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="212" value="" type="int" abstract="0" documentation="Numero de documento del usuario
@@ -103,9 +108,7 @@ x2c:get set" name="perfiles" static="0" scope="202" />
 x2c: get set" name="id" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="226" value="" type="string" abstract="0" documentation="Descripcion del perfil.
 x2c: get set" name="descripcion" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="227" value="" type="string" abstract="0" documentation="Tipo de perfil. E = Externo. I = Interno. D = Dios.
-x2c: get set" name="tipo" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="271" value="" type="SAMURAI_DB" abstract="0" documentation="Objeto Samurai_DB" name="db" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="271" value="" type="SAMURAI_DB" abstract="0" documentation="" name="db" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="330" value="" type="string" abstract="0" documentation="Responsable de las ultimas modificaciones
 x2c: get set" name="responsable" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="361" value="" type="array(int)" abstract="0" documentation="Array con los permisos asignados al perfil. Solo se cargan cuando se esta trabajando con el abm puesto que varian segun cada sistema.
@@ -185,25 +188,33 @@ x2c: get set" name="permisos" static="0" scope="201" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="341" type="array(Sistema)" abstract="0" documentation="Devuelve el array de sistemas" name="getSistemas" static="1" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;SAMURAI_DB" abstract="0" documentation="Base de Datos" name="db" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="true" type="bool" abstract="0" documentation="Indica si se deben buscar solamente los sistemas activos" name="activos" static="0" scope="201" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="342" type="array(int)" abstract="0" documentation="Devuleve un array con los identificadores de todos los sistemas." name="getIdSistemas" static="1" scope="202" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;SAMURAI_DB" abstract="0" documentation="Base de Datos" name="db" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="true" type="bool" abstract="0" documentation="Indica si se deben buscar solamente los sistemas activos" name="activos" static="0" scope="201" />
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="343" type="array()" abstract="0" documentation="Devuelve un array asociativo en donde la clave es el identificador y el valor es el nombre del sistema" name="getArraySistemas" static="1" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;SAMURAI_DB" abstract="0" documentation="Base de Datos" name="db" static="0" scope="200" />
-    </UML:Operation>
-    <UML:Attribute stereotype="" package="" xmi.id="235" value="" type="int" abstract="0" documentation="Identificador del sistema." name="id" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="237" value="" type="string" abstract="0" documentation="Nombre del sistema." name="nombre" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="238" value="" type="string" abstract="0" documentation="Descripcion del sistema." name="descripcion" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="239" value="" type="date" abstract="0" documentation="Fecha en la cual se inicio el sistema." name="fecha_inicio" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="240" value="" type="date" abstract="0" documentation="Fecha en la cual se dio por terminado el desarrollo del sistema." name="fecha_fin" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="241" value="" type="date" abstract="0" documentation="Fecha de implementacion del sistema." name="fecha_implementacion" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="242" value="" type="string" abstract="0" documentation="Texto con los datos del o de los contacto/s en el area usuario." name="contacto" static="0" scope="202" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="true" type="bool" abstract="0" documentation="Indica si se deben buscar solamente los sistemas activos" name="activos" static="0" scope="201" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="397" type="array()" abstract="0" documentation="Devuelve un array asociativo en donde la clave es el identificador y el valor es el nombre del sistema. Solo devuelve aquellos sistemas en los cuales el usuario tiene permisos." name="getArraySistemasSeleccionar" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="&amp;DB" abstract="0" documentation="Conexion a la base de datos" name="DB" static="0" scope="201" />
+    </UML:Operation>
+    <UML:Attribute stereotype="" package="" xmi.id="235" value="null" type="int" abstract="0" documentation="Identificador del sistema." name="id" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="237" value="null" type="string" abstract="0" documentation="Nombre del sistema." name="nombre" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="238" value="null" type="string" abstract="0" documentation="Descripcion del sistema." name="descripcion" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="239" value="null" type="date" abstract="0" documentation="Fecha en la cual se inicio el sistema." name="fecha_inicio" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="240" value="null" type="date" abstract="0" documentation="Fecha en la cual se dio por terminado el desarrollo del sistema." name="fecha_fin" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="241" value="null" type="date" abstract="0" documentation="Fecha de implementacion del sistema." name="fecha_implementacion" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="242" value="null" type="string" abstract="0" documentation="Texto con los datos del o de los contacto/s en el area usuario." name="contacto" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="272" value="" type="SAMURAI_DB" abstract="0" documentation="Objeto Samurai_DB" name="db" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="289" value="" type="string" abstract="0" documentation="Login del responsable de los ultimos cambios del sistema." name="responsable" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="300" value="" type="array" abstract="0" documentation="Array asociativo (id - descripcion) con los permisos asociados al sistema." name="permisos" static="0" scope="202" />
-    <UML:Attribute stereotype="" package="" xmi.id="310" value="" type="array" abstract="0" documentation="Array con los permisos asociados al sistema
+    <UML:Attribute stereotype="" package="" xmi.id="289" value="null" type="string" abstract="0" documentation="Login del responsable de los ultimos cambios del sistema." name="responsable" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="300" value="null" type="array" abstract="0" documentation="Array asociativo (id - descripcion) con los permisos asociados al sistema." name="permisos" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="310" value="null" type="array" abstract="0" documentation="Array con los permisos asociados al sistema
 x2c: get set" name="asociaciones" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="395" value="1" type="int" abstract="0" documentation="indica si el sistema esta activo o no.
+x2c: get set" name="estado" static="0" scope="202" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="210" abstract="0" documentation="Clase para el manejo de los Permisos." name="SAMURAI_Permiso" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="259" type="void" abstract="0" documentation="Constructor. Si recibe como parametro el identificador del permiso, busca la informacion en la DB." name="SAMURAI_Permiso" static="0" scope="200" >
@@ -243,8 +254,12 @@ x2c:include: DB.php" name="DB" static="0" scope="200" />
    <UML:Class stereotype="" package="" xmi.id="265" abstract="0" documentation="Manejo interno de las bases de datos." name="SAMURAI_DB" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="269" type="DB" abstract="0" documentation="Realiza la conexion con la base de datos." name="connect" static="0" scope="200" />
    </UML:Class>
-   <UML:Class stereotype="" package="SAMURAI" xmi.id="377" abstract="0" documentation="Chequeador de permisos." name="SAMURAI_Perm" static="0" scope="200" >
-    <UML:Operation stereotype="" package="" xmi.id="380" type="void" abstract="0" documentation="Constructor." name="SAMURAI_Perm" static="0" scope="200" >
+   <UML:Class stereotype="" package="SAMURAI" xmi.id="377" abstract="0" documentation="Chequeador de permisos.
+Para la libreria de perl: 
+@see perm.epl" name="SAMURAI_Perm" static="0" scope="200" >
+    <UML:Operation stereotype="" package="" xmi.id="380" type="void" abstract="0" documentation="Constructor.
+Para la libreria de perl: 
+@see perm.epl" name="SAMURAI_Perm" static="0" scope="200" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="Login del usuario para el cual obtener los permisos." name="login" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="int" abstract="0" documentation="Sistema con el cual se va a trabajar." name="sistema" static="0" scope="200" />
      <UML:Parameter stereotype="" package="" xmi.id="3" value="" type="&amp;DB" abstract="0" documentation="Base de datos a usar." name="db" static="0" scope="200" />
@@ -267,108 +282,110 @@ x2c:set" name="sistema" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="389" value="" type="&amp;DB" abstract="0" documentation="Base de datos a usar en las conexiones." name="db" static="0" scope="202" />
     <UML:Attribute stereotype="" package="" xmi.id="390" value="array()" type="array" abstract="0" documentation="Observaciones de los permisos." name="observaciones" static="0" scope="202" />
    </UML:Class>
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="265" roleb="264" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="265" roleb="210" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="265" roleb="209" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="265" roleb="208" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="501" rolea="265" roleb="207" multia="" doca="" multib="" docb="" package="" xmi.id="-1" abstract="0" documentation="" name="" static="0" scope="200" changeabilitya="900" changeabilityb="900" namea="" />
-   <UML:Association nameb="" stereotype="" visibilitya="200" visibilityb="200" assoctype="500" rolea="265" roleb="264" 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="1" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="911" snapy="10" showatts="1" xmi.id="206" documentation="" type="402" showops="1" showpackage="0" name="Clases y Relaciones" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica,4,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="644" >
+   <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="911" snapy="10" showatts="1" xmi.id="206" documentation="" type="402" showops="1" showpackage="0" name="Clases y Relaciones" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica [Adobe],12,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="684" >
     <widgets>
-     <UML:ClassWidget usesdiagramfillcolour="0" width="157" showattsigs="601" usesdiagramusefillcolour="0" x="750" linecolour="#ff0000" y="290" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="266" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="207" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="110" showattsigs="601" usesdiagramusefillcolour="0" x="640" linecolour="#ff0000" y="10" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="308" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="208" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="148" showattsigs="601" usesdiagramusefillcolour="0" x="200" linecolour="#ff0000" y="10" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="630" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="209" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="118" showattsigs="601" usesdiagramusefillcolour="0" x="480" linecolour="#ff0000" y="310" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="210" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="210" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="35" showattsigs="601" usesdiagramusefillcolour="0" x="490" linecolour="#ff0000" y="10" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#d5d5cf" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="264" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="79" showattsigs="601" usesdiagramusefillcolour="0" x="480" linecolour="#ff0000" y="120" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="35" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="265" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="157" showattsigs="601" usesdiagramusefillcolour="0" x="750" linecolour="#ff0000" y="290" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="280" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="207" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="110" showattsigs="601" usesdiagramusefillcolour="0" x="640" linecolour="#ff0000" y="10" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="294" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="208" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="174" showattsigs="601" usesdiagramusefillcolour="0" x="200" linecolour="#ff0000" y="10" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="658" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="209" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="118" showattsigs="601" usesdiagramusefillcolour="0" x="480" linecolour="#ff0000" y="310" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="210" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="210" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="23" showattsigs="601" usesdiagramusefillcolour="0" x="490" linecolour="#ff0000" y="10" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#d5d5cf" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="264" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="79" showattsigs="601" usesdiagramusefillcolour="0" x="480" linecolour="#ff0000" y="120" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="35" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="265" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
     </widgets>
     <messages/>
     <associations>
-     <UML:AssocWidget totalcounta="3" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="264" roleBdoc="" widgetaid="265" roleAdoc="" documentation="" type="500" 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,5,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,5,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,5,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="3" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="264" widgetaid="265" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="506" starty="120" />
-       <endpoint endx="507" endy="38" />
+       <endpoint endx="501" endy="38" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="10" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-10" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-40" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="210" roleBdoc="" widgetaid="265" roleAdoc="" documentation="" type="501" 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,5,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,5,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,5,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,5,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,5,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,5,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,5,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="3" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="210" widgetaid="265" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="506" starty="155" />
        <endpoint endx="539" endy="310" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="209" roleBdoc="" widgetaid="265" roleAdoc="" documentation="" type="501" 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,5,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,5,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,5,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,5,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,5,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,5,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,5,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="209" widgetaid="265" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="480" starty="137" />
-       <endpoint endx="348" endy="325" />
+       <endpoint endx="374" endy="339" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="10" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="30" linecolour="none" y="20" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="30" linecolour="none" y="20" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="30" linecolour="none" y="20" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="2" visibilityB="200" totalcountb="2" indexb="1" widgetbid="208" roleBdoc="" widgetaid="265" roleAdoc="" documentation="" type="501" 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,5,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,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="10" 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,5,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,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="10" 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,5,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,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="10" 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,5,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="3" indexa="2" visibilityB="200" totalcountb="2" indexb="1" widgetbid="208" widgetaid="265" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="532" starty="120" />
-       <endpoint endx="640" endy="164" />
+       <endpoint endx="640" endy="157" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-10" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-10" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-10" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="3" indexa="2" visibilityB="200" totalcountb="2" indexb="1" widgetbid="207" roleBdoc="" widgetaid="265" roleAdoc="" documentation="" type="501" 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,5,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,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="20" 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,5,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,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="20" 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,5,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,5,50,0,0,0,0,0" />
-      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="0" linecolour="none" y="20" 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,5,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="3" indexa="2" visibilityB="200" totalcountb="2" indexb="1" widgetbid="207" widgetaid="265" roleBdoc="" roleAdoc="" type="501" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="532" starty="155" />
-       <endpoint endx="750" endy="423" />
+       <endpoint endx="750" endy="430" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-10" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="30" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-10" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="0" linecolour="none" y="30" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="-10" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="30" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
     </associations>
    </diagram>
-   <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="901" snapy="10" showatts="1" xmi.id="336" documentation="" type="402" showops="1" showpackage="0" name="Clases" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica,4,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1184" >
+   <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="901" snapy="10" showatts="1" xmi.id="336" documentation="" type="402" showops="1" showpackage="0" name="Clases" localid="30000" showstereotype="0" showscope="1" snapcsgrid="0" font="helvetica [Adobe],12,-1,5,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1212" >
     <widgets>
-     <UML:ClassWidget usesdiagramfillcolour="0" width="35" showattsigs="601" usesdiagramusefillcolour="0" x="470" linecolour="#ff0000" y="20" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#d5d5cf" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="264" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="429" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="230" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="308" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="208" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="360" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="10" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="210" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="210" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="87" showattsigs="601" usesdiagramusefillcolour="0" x="450" linecolour="#ff0000" y="80" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="35" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="265" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="430" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="550" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="630" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="209" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="447" showattsigs="601" usesdiagramusefillcolour="0" x="450" linecolour="#ff0000" y="230" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="266" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="207" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
-     <UML:ClassWidget usesdiagramfillcolour="0" width="287" showattsigs="601" usesdiagramusefillcolour="0" x="570" linecolour="#ff0000" y="20" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="140" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="377" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="23" showattsigs="601" usesdiagramusefillcolour="0" x="470" linecolour="#ff0000" y="20" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#d5d5cf" height="28" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="264" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,75,0,0,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="429" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="230" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="294" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="208" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="360" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="10" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="210" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="210" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="87" showattsigs="601" usesdiagramusefillcolour="0" x="450" linecolour="#ff0000" y="80" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="35" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="265" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="430" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="550" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="658" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="209" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="447" showattsigs="601" usesdiagramusefillcolour="0" x="450" linecolour="#ff0000" y="230" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="294" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="207" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
+     <UML:ClassWidget usesdiagramfillcolour="0" width="287" showattsigs="601" usesdiagramusefillcolour="0" x="570" linecolour="#ff0000" y="20" showopsigs="601" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="140" usefillcolor="1" showattributes="1" isinstance="0" xmi.id="377" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,8,-1,0,50,0,1,0,0,0" />
     </widgets>
     <messages/>
     <associations>
-     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="264" roleBdoc="" widgetaid="265" roleAdoc="" documentation="" type="500" 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,5,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,5,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,5,50,0,0,0,0,0" />
+     <UML:AssocWidget totalcounta="2" indexa="1" visibilityB="200" totalcountb="2" indexb="1" widgetbid="264" widgetaid="265" roleBdoc="" roleAdoc="" type="500" changeabilityA="900" changeabilityB="900" visibilityA="200" >
       <linepath>
        <startpoint startx="493" starty="80" />
-       <endpoint endx="487" endy="48" />
+       <endpoint endx="481" endy="48" />
       </linepath>
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="703" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="701" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="702" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-20" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="709" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="18" usesdiagramusefillcolour="1" x="-20" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="710" fillcolour="none" height="25" usefillcolor="1" pretext="+" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,0,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="711" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
+      <UML:FloatingTextWidget usesdiagramfillcolour="1" width="8" usesdiagramusefillcolour="1" x="0" linecolour="none" y="0" instancename="" posttext="" usesdiagramlinecolour="1" role="712" fillcolour="none" height="25" usefillcolor="1" pretext="" isinstance="0" xmi.id="-1" text="" font="helvetica,12,-1,5,50,0,0,0,0,0" />
      </UML:AssocWidget>
     </associations>
    </diagram>
@@ -379,7 +396,7 @@ x2c:set" name="sistema" static="0" scope="202" />
      <listitem open="1" type="803" id="-1" label="Diagramas" >
       <listitem open="1" type="807" id="336" label="Clases" />
       <listitem open="1" type="807" id="206" label="Clases y Relaciones" />
-      <listitem open="1" type="813" id="377" label="SAMURAI_Perm" >
+      <listitem open="0" type="813" id="377" label="SAMURAI_Perm" >
        <listitem open="0" type="814" id="389" label="db" />
        <listitem open="0" type="814" id="390" label="observaciones" />
        <listitem open="0" type="814" id="378" label="permisos" />
@@ -398,14 +415,13 @@ x2c:set" name="sistema" static="0" scope="202" />
       <listitem open="0" type="813" id="265" label="SAMURAI_DB" >
        <listitem open="0" type="815" id="269" label="connect" />
       </listitem>
-      <listitem open="1" type="813" id="208" label="SAMURAI_Perfil" >
+      <listitem open="0" type="813" id="208" label="SAMURAI_Perfil" >
        <listitem open="0" type="814" id="271" label="db" />
        <listitem open="0" type="814" id="226" label="descripcion" />
        <listitem open="0" type="814" id="225" label="id" />
        <listitem open="0" type="814" id="392" label="idSistema" />
        <listitem open="0" type="814" id="361" label="permisos" />
        <listitem open="0" type="814" id="330" label="responsable" />
-       <listitem open="0" type="814" id="227" label="tipo" />
        <listitem open="0" type="815" id="229" label="SAMURAI_Perfil" />
        <listitem open="0" type="815" id="325" label="borrarDb" />
        <listitem open="0" type="815" id="363" label="borrarPermisos" />
@@ -442,6 +458,7 @@ x2c:set" name="sistema" static="0" scope="202" />
        <listitem open="0" type="814" id="242" label="contacto" />
        <listitem open="0" type="814" id="272" label="db" />
        <listitem open="0" type="814" id="238" label="descripcion" />
+       <listitem open="0" type="814" id="395" label="estado" />
        <listitem open="0" type="814" id="240" label="fecha_fin" />
        <listitem open="0" type="814" id="241" label="fecha_implementacion" />
        <listitem open="0" type="814" id="239" label="fecha_inicio" />
@@ -455,6 +472,7 @@ x2c:set" name="sistema" static="0" scope="202" />
        <listitem open="0" type="815" id="313" label="eliminarAsociacion" />
        <listitem open="0" type="815" id="315" label="existeAsociacion" />
        <listitem open="0" type="815" id="343" label="getArraySistemas" />
+       <listitem open="0" type="815" id="397" label="getArraySistemasSeleccionar" />
        <listitem open="0" type="815" id="250" label="getContacto" />
        <listitem open="0" type="815" id="246" label="getDescripcion" />
        <listitem open="0" type="815" id="248" label="getFechaFin" />
@@ -493,11 +511,13 @@ x2c:set" name="sistema" static="0" scope="202" />
        <listitem open="0" type="815" id="216" label="SAMURAI_Usuario" />
        <listitem open="0" type="815" id="386" label="asociarPerfil" />
        <listitem open="0" type="815" id="372" label="borrarDb" />
+       <listitem open="0" type="815" id="398" label="filtrarUsuarios" />
        <listitem open="0" type="815" id="366" label="getArrayUsuarios" />
        <listitem open="0" type="815" id="365" label="getLoginUsuarios" />
        <listitem open="0" type="815" id="367" label="getUsuarios" />
        <listitem open="0" type="815" id="371" label="grabarDb" />
        <listitem open="0" type="815" id="370" label="guardarDatos" />
+       <listitem open="0" type="815" id="396" label="informacionGeneral" />
        <listitem open="0" type="815" id="373" label="modificarDb" />
        <listitem open="0" type="815" id="368" label="obtenerDatosDb" />
        <listitem open="0" type="815" id="375" label="verificarAsociacionExistente" />
@@ -507,9 +527,9 @@ x2c:set" name="sistema" static="0" scope="202" />
     </listitem>
     <listitem open="0" type="802" id="-1" label="Use Case View" />
     <listitem open="1" type="821" id="-1" label="Component View" />
-    <listitem open="0" type="823" id="-1" label="Diagrams" />
     <listitem open="1" type="827" id="-1" label="Deployment View" />
    </listitem>
   </listview>
+  <codegeneration/>
  </XMI.content>
 </XMI>