Saque toda la funcionalidad relacionada con tipo perfil

diff --git a/doc/Samurai.xmi b/doc/Samurai.xmi
index 70c424315bdfb71cff6830f1a784781c69588ca2..57546fe223a5803335a356a2588b0d29214f7676 100644 (file)
--- a/doc/Samurai.xmi
+++ b/doc/Samurai.xmi
@@ -104,9 +104,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" />
 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.
     <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.


@@ -284,7 +282,7 @@ x2c:set" name="sistema" static="0" scope="202" />
    <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="658" >
     <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="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,0,0,0,0" />
    <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="658" >
     <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="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,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="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,0,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="644" 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="174" showattsigs="601" usesdiagramusefillcolour="0" x="200" linecolour="#ff0000" y="10" showopsigs="600" instancename="" usesdiagramlinecolour="0" fillcolour="#ffffc0" height="644" 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" />


@@ -330,14 +328,14 @@ x2c:set" name="sistema" static="0" scope="202" />
      <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: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="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="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="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="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: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" />

       <linepath>
        <startpoint startx="532" starty="120" />
       <linepath>
        <startpoint startx="532" starty="120" />

-       <endpoint endx="640" endy="164" />
+       <endpoint endx="640" endy="157" />

       </linepath>
      </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" >
       </linepath>
      </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" >


@@ -358,7 +356,7 @@ x2c:set" name="sistema" static="0" scope="202" />
    <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="1198" >
     <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" />
    <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="1198" >
     <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="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,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="644" 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="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="644" 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" />


@@ -404,14 +402,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="0" type="813" id="265" label="SAMURAI_DB" >
        <listitem open="0" type="815" id="269" label="connect" />
       </listitem>

-      <listitem open="0" type="813" id="208" label="SAMURAI_Perfil" >
+      <listitem open="1" 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="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" />
        <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" />


@@ -443,7 +440,7 @@ x2c:set" name="sistema" static="0" scope="202" />
        <listitem open="0" type="815" id="319" label="modificarDb" />
        <listitem open="0" type="815" id="295" label="obtenerDatosDb" />
       </listitem>
        <listitem open="0" type="815" id="319" label="modificarDb" />
        <listitem open="0" type="815" id="295" label="obtenerDatosDb" />
       </listitem>

-      <listitem open="1" type="813" id="209" label="SAMURAI_Sistema" >
+      <listitem open="0" type="813" id="209" label="SAMURAI_Sistema" >

        <listitem open="0" type="814" id="310" label="asociaciones" />
        <listitem open="0" type="814" id="242" label="contacto" />
        <listitem open="0" type="814" id="272" label="db" />
        <listitem open="0" type="814" id="310" label="asociaciones" />
        <listitem open="0" type="814" id="242" label="contacto" />
        <listitem open="0" type="814" id="272" label="db" />


@@ -490,7 +487,7 @@ x2c:set" name="sistema" static="0" scope="202" />
        <listitem open="0" type="815" id="302" label="setPermisos" />
        <listitem open="0" type="815" id="291" label="setResponsable" />
       </listitem>
        <listitem open="0" type="815" id="302" label="setPermisos" />
        <listitem open="0" type="815" id="291" label="setResponsable" />
       </listitem>

-      <listitem open="1" type="813" id="207" label="SAMURAI_Usuario" >
+      <listitem open="0" type="813" id="207" label="SAMURAI_Usuario" >

        <listitem open="0" type="814" id="273" label="db" />
        <listitem open="0" type="814" id="394" label="idSistema" />
        <listitem open="0" type="814" id="211" label="login" />
        <listitem open="0" type="814" id="273" label="db" />
        <listitem open="0" type="814" id="394" label="idSistema" />
        <listitem open="0" type="814" id="211" label="login" />

diff --git a/lib/SAMURAI/Perfil.php b/lib/SAMURAI/Perfil.php
index 1a0e20272bfe487dee271369df485220959f1c6e..6088ad610b8584ddb5e08ccc36c8b11f74017453 100644 (file)
--- a/lib/SAMURAI/Perfil.php
+++ b/lib/SAMURAI/Perfil.php
@@ -51,16 +51,6 @@ class SAMURAI_Perfil {
     var $_descripcion;
 
     /**
     var $_descripcion;
 
     /**

-     * Tipo de perfil. E = Externo. I = Interno. D = Dios.
-     *
-     * @var    string $tipo
-     * @access protected
-     */
-    var $_tipo;
-
-    /**
-     * Objeto Samurai_DB
-     *

      * @var    SAMURAI_DB $db
      * @access protected
      */
      * @var    SAMURAI_DB $db
      * @access protected
      */


@@ -136,29 +126,6 @@ class SAMURAI_Perfil {
         $this->_descripcion = $descripcion;
     }
 
         $this->_descripcion = $descripcion;
     }
 

-    /**
-     * Gets Tipo.
-     *
-     * @return string
-     * @access public
-     */
-    function getTipo()
-    {
-        return $this->_tipo;
-    }
-    /**
-     * Sets Tipo.
-     *
-     * @param  string $tipo Tipo.
-     *
-     * @return void
-     * @access public
-     */
-    function setTipo($tipo)
-    {
-        $this->_tipo = $tipo;
-    }
-

     /**
      * Gets Responsable.
      *
     /**
      * Gets Responsable.
      *


@@ -230,7 +197,6 @@ class SAMURAI_Perfil {
             //INICIALIZO LA VI
             $this->_id          = null;
             $this->_descripcion = null; 
             //INICIALIZO LA VI
             $this->_id          = null;
             $this->_descripcion = null; 

-            $this->_tipo        = null;

             $this->_permisos    = null;
         }
     }
             $this->_permisos    = null;
         }
     }


@@ -264,13 +230,6 @@ class SAMURAI_Perfil {
                 $this->setResponsable();
             }
         }
                 $this->setResponsable();
             }
         }

-        //OBTENGO EL TIPO DE PERFIL
-        $tmp = $sql['verificar_asociacion'];
-        $dbh = $this->_db->prepare($tmp);
-        $tmp = array ($this->getId(), $this->_idSistema);
-        $res = $this->_db->execute($dbh,$tmp);        
-        $re = $res->fetchrow(DB_FETCHMODE_ASSOC);
-        $this->setTipo($re['tipo_perfil']);

 
         //OBTENGO LOS PERMISOS QUE TIENE ASIGNADO EL PERFIL DESDE PERM_PERFIL_SIST
         $tmp = $sql['obtener_permisos'];
 
         //OBTENGO LOS PERMISOS QUE TIENE ASIGNADO EL PERFIL DESDE PERM_PERFIL_SIST
         $tmp = $sql['obtener_permisos'];


@@ -351,7 +310,6 @@ class SAMURAI_Perfil {
         //GRABO EN PERFIL_SIST
         $datos = array ('id_perfil'   => $this->getId(),
                         'id_sistema'  => $this->_idSistema,
         //GRABO EN PERFIL_SIST
         $datos = array ('id_perfil'   => $this->getId(),
                         'id_sistema'  => $this->_idSistema,

-                        'tipo_perfil' => $this->getTipo(),

                         'responsable' => $this->getResponsable(),
                     );
         $res = $this->_db->autoExecute('samurai.perfil_sist', $datos, DB_AUTOQUERY_INSERT);
                         'responsable' => $this->getResponsable(),
                     );
         $res = $this->_db->autoExecute('samurai.perfil_sist', $datos, DB_AUTOQUERY_INSERT);


@@ -419,7 +377,6 @@ class SAMURAI_Perfil {
     {
         //Modifico la tabla perfil_sist
         $datos = array (
     {
         //Modifico la tabla perfil_sist
         $datos = array (

-                    'tipo_perfil' => $this->getTipo(),

                     'responsable' => $this->getResponsable(),
         );
         $res = $this->_db->autoExecute('samurai.perfil_sist', $datos,
                     'responsable' => $this->getResponsable(),
         );
         $res = $this->_db->autoExecute('samurai.perfil_sist', $datos,


@@ -671,4 +628,4 @@ class SAMURAI_Perfil {
 
 } // -X2C Class :SAMURAI_Perfil
 
 
 } // -X2C Class :SAMURAI_Perfil
 

-?>
\ No newline at end of file
+?>

diff --git a/lib/SAMURAI/Perfil/consultas.ini b/lib/SAMURAI/Perfil/consultas.ini
index fba4c77d80fcdbae1964919bdce3360cbb39d935..7e28e3a44a236c00d2a9acc0cfe75dc792882918 100644 (file)
--- a/lib/SAMURAI/Perfil/consultas.ini
+++ b/lib/SAMURAI/Perfil/consultas.ini
@@ -16,7 +16,7 @@ borrar_perfil_sist     = " DELETE FROM samurai.perfil_sist WHERE id_perfil = ? A
 borrar_perfil          = " DELETE FROM samurai.perfil WHERE id_perfil = ?"
 
 ;VERIFICACIONES
 borrar_perfil          = " DELETE FROM samurai.perfil WHERE id_perfil = ?"
 
 ;VERIFICACIONES

-verificar_asociacion   = " SELECT ps.id_perfil, ps.tipo_perfil FROM samurai.perfil_sist as ps WHERE ps.id_perfil = ? AND ps.id_sistema = ?"
+verificar_asociacion   = " SELECT ps.id_perfil FROM samurai.perfil_sist as ps WHERE ps.id_perfil = ? AND ps.id_sistema = ?"

 verif_perfil_sist_usuario = "SELECT IF(0,0,count(*)) as cuenta FROM samurai.perfil_sist_usuario WHERE id_perfil = ? AND id_sistema = ? "
 verif_perfil_sist      = "SELECT IF(0,0,count(*)) as cuenta FROM samurai.perfil_sist WHERE id_perfil = ? "
 
 verif_perfil_sist_usuario = "SELECT IF(0,0,count(*)) as cuenta FROM samurai.perfil_sist_usuario WHERE id_perfil = ? AND id_sistema = ? "
 verif_perfil_sist      = "SELECT IF(0,0,count(*)) as cuenta FROM samurai.perfil_sist WHERE id_perfil = ? "
 

diff --git a/lib/SAMURAI/Permiso.php b/lib/SAMURAI/Permiso.php
index beba603809fbf5e86d0a0655d5f4d09d568b66ab..a6004e06f9286b84c4f6f26368158aab956d90b0 100644 (file)
--- a/lib/SAMURAI/Permiso.php
+++ b/lib/SAMURAI/Permiso.php
@@ -391,4 +391,4 @@ class SAMURAI_Permiso {
 
 } // -X2C Class :SAMURAI_Permiso
 
 
 } // -X2C Class :SAMURAI_Permiso
 

-?>
+?>
\ No newline at end of file

diff --git a/lib/SAMURAI/Usuario.php b/lib/SAMURAI/Usuario.php
index 90e814259a8faefbb543fb0290d2e683f4590dbd..8633bc2fd7a9a28ce81f7910bfe4cbee8c238f33 100644 (file)
--- a/lib/SAMURAI/Usuario.php
+++ b/lib/SAMURAI/Usuario.php
@@ -520,4 +520,4 @@ class SAMURAI_Usuario {
     // -X2C
 
 } // -X2C Class :SAMURAI_Usuario
     // -X2C
 
 } // -X2C Class :SAMURAI_Usuario

-?>
+?>
\ No newline at end of file

diff --git a/sistema/www/perfiles/perfiles-abm.php b/sistema/www/perfiles/perfiles-abm.php
index bb8d0bb289d27b99c209075c031a20a7372ee5c5..a4aad201372cee149148f85cbf1adf721a2f090e 100644 (file)
--- a/sistema/www/perfiles/perfiles-abm.php
+++ b/sistema/www/perfiles/perfiles-abm.php
@@ -80,9 +80,6 @@ $SAMURAI_PERM->chequear(SAMURAI_PERM_PERFIL_ALTA,SAMURAI_PERM_PERFIL_BAJA,SAMURA
         $FORM->addElement ('hidden', 'desc_ant'   , $descripcion);
         $FORM->addElement ('static', 'desc_perfil', 'Descripcion', $descripcion);
         $FORM->addElement ('select', 'permisos'   , 'Permisos'   , $PERMISOS, array('size' => '5', 'multiple' => 'true'));
         $FORM->addElement ('hidden', 'desc_ant'   , $descripcion);
         $FORM->addElement ('static', 'desc_perfil', 'Descripcion', $descripcion);
         $FORM->addElement ('select', 'permisos'   , 'Permisos'   , $PERMISOS, array('size' => '5', 'multiple' => 'true'));

-        if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_TIPO)) {
-            $FORM->addElement ('select', 'tipo_perfil', 'Tipo Perfil', array('E' => 'Externo', 'I' => 'Interno', 'D' => 'Dios'), array ('size' => '1'));
-        }

         $FORM->addElement ('hidden', 'responsable', $responsable);
         $group[] = HTML_QuickForm::createElement('submit', 'aceptar' , 'Grabar');
         $group[] = HTML_QuickForm::createElement('submit', 'cancelar', 'Cancelar', array ('onClick' => 'javascript:window.location=\'perfiles\';return false;'));
         $FORM->addElement ('hidden', 'responsable', $responsable);
         $group[] = HTML_QuickForm::createElement('submit', 'aceptar' , 'Grabar');
         $group[] = HTML_QuickForm::createElement('submit', 'cancelar', 'Cancelar', array ('onClick' => 'javascript:window.location=\'perfiles\';return false;'));


@@ -101,10 +98,6 @@ $SAMURAI_PERM->chequear(SAMURAI_PERM_PERFIL_ALTA,SAMURAI_PERM_PERFIL_BAJA,SAMURA
         $id_perfil    =& $FORM->getElement  ('id_perfil'  );
         $desc_perfil  =& $FORM->getElement  ('desc_perfil');
         $permisos     =& $FORM->getElement  ('permisos'   );
         $id_perfil    =& $FORM->getElement  ('id_perfil'  );
         $desc_perfil  =& $FORM->getElement  ('desc_perfil');
         $permisos     =& $FORM->getElement  ('permisos'   );

-        
-        if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_TIPO)) {
-            $tipo_perfil  =& $FORM->getElement  ('tipo_perfil');
-        }

         $responsable  =& $FORM->getElement  ('responsable');
         $group        =& $FORM->getElement  ('botones'    );
         $group        =& $group->getElements('aceptar'    );
         $responsable  =& $FORM->getElement  ('responsable');
         $group        =& $FORM->getElement  ('botones'    );
         $group        =& $group->getElements('aceptar'    );


@@ -112,10 +105,6 @@ $SAMURAI_PERM->chequear(SAMURAI_PERM_PERFIL_ALTA,SAMURAI_PERM_PERFIL_BAJA,SAMURA
 
         $permisos->setSelected($PERFIL->getPermisos());
         
 
         $permisos->setSelected($PERFIL->getPermisos());
         

-        if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_TIPO)) {
-            $tipo_perfil->setSelected($PERFIL->getTipo());
-        }
-

         if ($PERFIL->getResponsable() != '') {
             $responsable->setValue($PERFIL->getResponsable());
         }
         if ($PERFIL->getResponsable() != '') {
             $responsable->setValue($PERFIL->getResponsable());
         }


@@ -143,11 +132,6 @@ $SAMURAI_PERM->chequear(SAMURAI_PERM_PERFIL_ALTA,SAMURAI_PERM_PERFIL_BAJA,SAMURA
             $id_perfil    =& $FORM->getElement  ('id_perfil'  );
             $desc_perfil  =& $FORM->getElement  ('desc_perfil');
             $permisos     =& $FORM->getElement  ('permisos'   );
             $id_perfil    =& $FORM->getElement  ('id_perfil'  );
             $desc_perfil  =& $FORM->getElement  ('desc_perfil');
             $permisos     =& $FORM->getElement  ('permisos'   );

-            
-            if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_TIPO)) {
-                $tipo_perfil  =& $FORM->getElement  ('tipo_perfil');
-                $tipo_perfil_tmp  =  $tipo_perfil->getSelected();
-            }

             $responsable  =& $FORM->getElement  ('responsable');
             $group        =& $FORM->getElement  ('botones'    );
             $group        =& $group->getElements('aceptar'    );
             $responsable  =& $FORM->getElement  ('responsable');
             $group        =& $FORM->getElement  ('botones'    );
             $group        =& $group->getElements('aceptar'    );


@@ -157,10 +141,6 @@ $SAMURAI_PERM->chequear(SAMURAI_PERM_PERFIL_ALTA,SAMURAI_PERM_PERFIL_BAJA,SAMURA
             $PERFIL->setResponsable($responsable->getValue());
             $PERFIL->setPermisos   ($permisos->getSelected()); //Le asigno al perfil los permisos seleccionados
             
             $PERFIL->setResponsable($responsable->getValue());
             $PERFIL->setPermisos   ($permisos->getSelected()); //Le asigno al perfil los permisos seleccionados
             

-            if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_TIPO)) {
-                $PERFIL->setTipo       ($tipo_perfil_tmp['0']   );
-            }
-            

             //Grabo y verifico si se produjo algun error
             $res = $PERFIL->guardarDatos($aceptar->getValue());
 
             //Grabo y verifico si se produjo algun error
             $res = $PERFIL->guardarDatos($aceptar->getValue());
 

diff --git a/sistema/www/perfiles/perfiles-datos.php b/sistema/www/perfiles/perfiles-datos.php
index 982fd6e386ab3073721123fb99458209153c3afd..82ba011b4ee1ce607bcbd8fa153157ea9cfb4173 100644 (file)
--- a/sistema/www/perfiles/perfiles-datos.php
+++ b/sistema/www/perfiles/perfiles-datos.php
@@ -65,23 +65,10 @@ $SAMURAI_PERM->chequear(SAMURAI_PERM_PERFIL_ALTA,SAMURAI_PERM_PERFIL_BAJA,SAMURA
         $PERMISOS[$clave] = $texto;
     }
 // }}}
         $PERMISOS[$clave] = $texto;
     }
 // }}}

-//TRADUZCO EL TIPO DE PERFIL {{{
-    $TipoPerfil = $PERFIL->getTipo();
-    
-    switch ($TipoPerfil) {
-        case 'I':   $TipoPerfil = 'Interno';
-                    break;
-        case 'E':   $TipoPerfil = 'Externo';
-                    break;
-        case 'D':   $TipoPerfil = 'Dios';
-                    break;
-    }
-//}}}

 //AGREGO LOS ELEMENTOS AL FORM {{{
     $FORM->addElement         ('static', 'id_perfil'  , 'Id Perfil'    , $PERFIL->getId()              );
     $FORM->addElement         ('static', 'desc_perfil', 'Descricion'   , $PERFIL->getDescripcion()     );
     $perf =& $FORM->addElement('select', 'permisos'   , 'Permisos'     , $PERMISOS, array ('size'=>'5'));
 //AGREGO LOS ELEMENTOS AL FORM {{{
     $FORM->addElement         ('static', 'id_perfil'  , 'Id Perfil'    , $PERFIL->getId()              );
     $FORM->addElement         ('static', 'desc_perfil', 'Descricion'   , $PERFIL->getDescripcion()     );
     $perf =& $FORM->addElement('select', 'permisos'   , 'Permisos'     , $PERMISOS, array ('size'=>'5'));

-    $FORM->addElement         ('static', 'tipo_perfil', 'Tipo Perfil'  , $TipoPerfil                   );

     $perf->setSelected($PERFIL->getPermisos());
     $FORM->freeze();
 // }}}
     $perf->setSelected($PERFIL->getPermisos());
     $FORM->freeze();
 // }}}

diff --git a/sistema/www/perfiles/perfiles.php b/sistema/www/perfiles/perfiles.php
index ecebec76c87d2522b7b9c485be096e12e2edf824..ed342c0181e1b4444b710951421a9b93ae2920b9 100644 (file)
--- a/sistema/www/perfiles/perfiles.php
+++ b/sistema/www/perfiles/perfiles.php
@@ -61,9 +61,6 @@ if (!@$_SESSION['samurai']['id_sistema']) {
     }
     //Genero la cabecera de la tabla
     $row   = array ('Id','Descripcion');
     }
     //Genero la cabecera de la tabla
     $row   = array ('Id','Descripcion');

-    if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_TIPO)) {
-        $row[] = 'Tipo';
-    }    

     if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_MODIF)) {
         $row[] = 'Modif.';
     }    
     if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_MODIF)) {
         $row[] = 'Modif.';
     }    


@@ -81,9 +78,6 @@ if (!@$_SESSION['samurai']['id_sistema']) {
         $Elim  = ereg_replace('##ACCION##', 'e'             , $Elim      );
         $row = array ($perfil->getId(), $Popup);
         
         $Elim  = ereg_replace('##ACCION##', 'e'             , $Elim      );
         $row = array ($perfil->getId(), $Popup);
         

-        if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_TIPO)) {
-            $row[] = $perfil->getTipo();
-        }    

         if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_MODIF)) {
             $row[] = $Modif;
         }    
         if ($SAMURAI_PERM->tiene(SAMURAI_PERM_PERFIL_MODIF)) {
             $row[] = $Modif;
         }