X-Git-Url: https://git.llucax.com/mecon/samurai.git/blobdiff_plain/14b7965388416e66c0d012ac6f001f9c877b5ce8..c64a4b5ee229adce6e0d0adb68c73ddb4f8a2e72:/doc/uml/Samurai.xmi?ds=sidebyside

diff --git a/doc/uml/Samurai.xmi b/doc/uml/Samurai.xmi
index 6922b94..b91c3a4 100644
--- a/doc/uml/Samurai.xmi
+++ b/doc/uml/Samurai.xmi
@@ -9,7 +9,7 @@
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
-  <docsettings viewid="206" documentation="" uniqueid="309" />
+  <docsettings viewid="206" documentation="" uniqueid="315" />
   <umlobjects>
    <UML:Class stereotype="" package="" xmi.id="207" abstract="0" documentation="Clase para el manejo de los usuarios." name="Usuario" static="0" scope="200" >
     <UML:Operation stereotype="" package="" xmi.id="216" type="void" abstract="0" documentation="Constructor.Recibe como parametro opcional el login del usuario. y busca en la base la informacion referida a el." name="Usuario" static="0" scope="200" >
@@ -108,7 +108,26 @@
     </UML:Operation>
     <UML:Operation stereotype="" package="" xmi.id="309" type="void" abstract="0" documentation="Borra los permisos que tenga asociado el sistema segun el criterio de observaciones" name="borrarPermisosDb" static="0" scope="201" >
      <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="Identificador del sistema" name="idSistema" static="0" scope="200" />
-     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="bool" abstract="0" documentation="Si es false borra todas las asociaciones que tenga el sistema. Si es true borra solo aquellas que tengan observaciones = ''" name="observaciones" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="null" type="bool" abstract="0" documentation="Null u observacion de la asociacion a borrar" name="observaciones" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="3" value="null" type="int" abstract="0" documentation="Identificador del permiso a borrar" name="idPermiso" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="312" type="bool" abstract="0" documentation="Guarda en base las nuevas asociaciones que se van cargando y actualiza los datos del sistema." name="guardarAsociacion" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="Identificador del Permiso" name="idPermiso" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="''" type="string" abstract="0" documentation="Observacion a agregar" name="observacion" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="313" type="bool" abstract="0" documentation="Elimina una asociacion de la base, y actualiza los datos del sistema." name="eliminarAsociacion" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="Identificador del permiso a borrar" name="idPermiso" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="''" type="string" abstract="0" documentation="Observacion de la asociacion a borrar (Puede ser vacia)" name="observacion" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="314" type="bool" abstract="0" documentation="Actualiza los datos de la asociacion en la base de datos." name="modificarAsociacion" static="0" scope="200" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="Identificador del permiso" name="idPermiso" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="int" abstract="0" documentation="Identificador del permiso anterior" name="idPermiso_ant" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="3" value="''" type="string" abstract="0" documentation="Observacion a insertar" name="observacion" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="4" value="''" type="string" abstract="0" documentation="Observacion anterior" name="obs_ant" static="0" scope="200" />
+    </UML:Operation>
+    <UML:Operation stereotype="" package="" xmi.id="315" type="bool" abstract="0" documentation="Chequea si existe la asociacion" name="existeAsociacion" static="0" scope="201" >
+     <UML:Parameter stereotype="" package="" xmi.id="1" value="" type="int" abstract="0" documentation="Id del permiso a chequear" name="idPermiso" static="0" scope="200" />
+     <UML:Parameter stereotype="" package="" xmi.id="2" value="" type="string" abstract="0" documentation="Observacion a chequear" name="observacion" 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="201" />
     <UML:Attribute stereotype="" package="" xmi.id="237" value="" type="string" abstract="0" documentation="Nombre del sistema." name="nombre" static="0" scope="201" />
@@ -120,6 +139,8 @@
     <UML:Attribute stereotype="" package="" xmi.id="272" value="" type="Samurai_DB" abstract="0" documentation="Objeto Samurai_DB" name="db" static="0" scope="201" />
     <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="201" />
     <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="201" />
+    <UML:Attribute stereotype="" package="" xmi.id="310" value="" type="array" abstract="0" documentation="Array con los permisos asociados al sistema
+x2c:get set" name="asociaciones" static="0" scope="201" />
    </UML:Class>
    <UML:Class stereotype="" package="" xmi.id="210" abstract="0" documentation="Clase para el manejo de los Permisos." name="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="Permiso" static="0" scope="200" >
@@ -163,70 +184,70 @@ x2c:include: DB.php" name="DB" static="0" scope="200" />
    </UML:Class>
   </umlobjects>
   <diagrams>
-   <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="206" documentation="" type="402" showops="1" showpackage="0" name="Clases" localid="30000" showstereotype="0" showscope="1" font="helvetica,7,-1,0,50,0,0,0,0,0" linecolor="#ff0000" >
+   <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" showgrid="1" showopsig="0" usefillcolor="1" snapx="10" snapy="10" showatts="1" xmi.id="206" documentation="" type="402" showops="1" showpackage="0" name="Clases" localid="30000" showstereotype="0" showscope="1" font="helvetica,7,-1,0,50,0,0,0,0,0" linecolor="#ff0000" >
     <widgets>
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="230" showattsigs="601" usesdiagramusefillcolour="0" x="510" linecolour="#ff0000" y="160" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="165" usefillcolor="1" showattributes="1" xmi.id="207" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="208" showattsigs="601" usesdiagramusefillcolour="0" x="380" linecolour="#ff0000" y="0" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" usefillcolor="1" showattributes="1" xmi.id="208" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="266" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="280" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="407" usefillcolor="1" showattributes="1" xmi.id="209" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="208" showattsigs="601" usesdiagramusefillcolour="0" x="10" linecolour="#ff0000" y="10" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="132" usefillcolor="1" showattributes="1" xmi.id="210" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="40" showattsigs="601" usesdiagramusefillcolour="0" x="230" linecolour="#ff0000" y="10" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="21" usefillcolor="1" showattributes="1" xmi.id="264" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="78" showattsigs="601" usesdiagramusefillcolour="0" x="270" linecolour="#ff0000" y="120" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" xmi.id="265" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
-     <UML:ConceptWidget usesdiagramfillcolour="0" width="240" showattsigs="601" usesdiagramusefillcolour="0" x="350" linecolour="#ff0000" y="450" showopsigs="601" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" usefillcolor="1" showattributes="1" xmi.id="274" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="86" showattsigs="601" usesdiagramusefillcolour="0" x="660" linecolour="#ff0000" y="320" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="165" usefillcolor="1" showattributes="1" xmi.id="207" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="94" showattsigs="601" usesdiagramusefillcolour="0" x="660" linecolour="#ff0000" y="70" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" usefillcolor="1" showattributes="1" xmi.id="208" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="132" showattsigs="601" usesdiagramusefillcolour="0" x="60" linecolour="#ff0000" y="190" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="462" usefillcolor="1" showattributes="1" xmi.id="209" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="95" showattsigs="601" usesdiagramusefillcolour="0" x="230" linecolour="#ff0000" y="20" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="132" usefillcolor="1" showattributes="1" xmi.id="210" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="40" showattsigs="601" usesdiagramusefillcolour="0" x="490" linecolour="#ff0000" y="30" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="21" usefillcolor="1" showattributes="1" xmi.id="264" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="64" showattsigs="601" usesdiagramusefillcolour="0" x="400" linecolour="#ff0000" y="250" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="27" usefillcolor="1" showattributes="1" xmi.id="265" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
+     <UML:ConceptWidget usesdiagramfillcolour="0" width="111" showattsigs="601" usesdiagramusefillcolour="0" x="360" linecolour="#ff0000" y="420" showopsigs="600" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="121" usefillcolor="1" showattributes="1" xmi.id="274" showoperations="1" showpackage="0" showscope="1" showstereotype="0" font="helvetica,7,-1,0,50,0,0,0,0,0" />
     </widgets>
     <messages/>
     <associations>
      <UML:AssocWidget totalcounta="4" indexa="2" totalcountb="2" indexb="1" widgetbid="264" widgetaid="265" documentation="" type="500" >
       <linepath>
-       <startpoint startx="309" starty="120" />
-       <endpoint endx="250" endy="31" />
+       <startpoint startx="432" starty="250" />
+       <endpoint endx="510" endy="51" />
       </linepath>
      </UML:AssocWidget>
      <UML:AssocWidget totalcounta="4" indexa="1" totalcountb="2" indexb="1" widgetbid="210" widgetaid="265" documentation="" type="501" >
       <linepath>
-       <startpoint startx="289" starty="120" />
-       <endpoint endx="218" endy="76" />
+       <startpoint startx="416" starty="250" />
+       <endpoint endx="325" endy="86" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="209" widgetaid="265" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="209" widgetaid="265" documentation="" type="501" >
       <linepath>
-       <startpoint startx="309" starty="147" />
-       <endpoint endx="143" endy="280" />
+       <startpoint startx="400" starty="263" />
+       <endpoint endx="192" endy="344" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="4" indexa="3" totalcountb="2" indexb="1" widgetbid="208" widgetaid="265" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="4" indexa="3" totalcountb="3" indexb="1" widgetbid="208" widgetaid="265" documentation="" type="501" >
       <linepath>
-       <startpoint startx="328" starty="120" />
-       <endpoint endx="380" endy="60" />
+       <startpoint startx="448" starty="250" />
+       <endpoint endx="660" endy="110" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="207" widgetaid="265" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="207" widgetaid="265" documentation="" type="501" >
       <linepath>
-       <startpoint startx="348" starty="133" />
-       <endpoint endx="510" endy="242" />
+       <startpoint startx="464" starty="263" />
+       <endpoint endx="660" endy="375" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" widgetbid="274" widgetaid="209" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" widgetbid="274" widgetaid="209" documentation="" type="501" >
       <linepath>
-       <startpoint startx="276" starty="483" />
-       <endpoint endx="350" endy="510" />
+       <startpoint startx="192" starty="498" />
+       <endpoint endx="360" endy="480" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="3" widgetbid="274" widgetaid="207" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" widgetbid="274" widgetaid="207" documentation="" type="501" >
       <linepath>
-       <startpoint startx="625" starty="325" />
-       <endpoint endx="530" endy="450" />
+       <startpoint startx="660" starty="430" />
+       <endpoint endx="471" endy="480" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="2" widgetbid="274" widgetaid="208" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="3" indexa="2" totalcountb="3" indexb="2" widgetbid="274" widgetaid="208" documentation="" type="501" >
       <linepath>
-       <startpoint startx="484" starty="121" />
-       <endpoint endx="470" endy="450" />
+       <startpoint startx="660" starty="150" />
+       <endpoint endx="434" endy="420" />
       </linepath>
      </UML:AssocWidget>
-     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="4" indexb="1" widgetbid="274" widgetaid="210" documentation="" type="501" >
+     <UML:AssocWidget totalcounta="2" indexa="1" totalcountb="3" indexb="1" widgetbid="274" widgetaid="210" documentation="" type="501" >
       <linepath>
-       <startpoint startx="114" starty="142" />
-       <endpoint endx="410" endy="450" />
+       <startpoint startx="277" starty="152" />
+       <endpoint endx="397" endy="420" />
       </linepath>
      </UML:AssocWidget>
     </associations>
@@ -279,11 +300,14 @@ x2c:include: DB.php" name="DB" static="0" scope="200" />
        <listitem open="0" type="815" id="269" label="connect" />
       </listitem>
       <listitem open="1" type="813" id="209" label="Sistema" >
+       <listitem open="0" type="814" id="310" label="asociaciones" />
        <listitem open="0" type="815" id="305" label="borrarDb" />
        <listitem open="0" type="815" id="309" label="borrarPermisosDb" />
        <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="815" id="313" label="eliminarAsociacion" />
+       <listitem open="0" type="815" id="315" label="existeAsociacion" />
        <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" />
@@ -299,8 +323,10 @@ x2c:include: DB.php" name="DB" static="0" scope="200" />
        <listitem open="0" type="815" id="290" label="getResponsable" />
        <listitem open="0" type="815" id="304" label="grabarDb" />
        <listitem open="0" type="815" id="308" label="grabarPermisosDb" />
+       <listitem open="0" type="815" id="312" label="guardarAsociacion" />
        <listitem open="0" type="815" id="288" label="guardarDatos" />
        <listitem open="0" type="814" id="235" label="id" />
+       <listitem open="0" type="815" id="314" label="modificarAsociacion" />
        <listitem open="0" type="815" id="306" label="modificarDb" />
        <listitem open="0" type="814" id="237" label="nombre" />
        <listitem open="0" type="815" id="263" label="obtenerDatosDb" />