]> git.llucax.com Git - mecon/samurai.git/commitdiff
Consultas -> Informacion y Estadisticas de los sistemas finalizada.
authorMartín Marrese <marrese@gmail.com>
Wed, 1 Oct 2003 22:30:10 +0000 (22:30 +0000)
committerMartín Marrese <marrese@gmail.com>
Wed, 1 Oct 2003 22:30:10 +0000 (22:30 +0000)
13 files changed:
doc/Samurai.xmi
doc/texto/SAMURAI_v1.rtf
lib/SAMURAI/Perfil.php
lib/SAMURAI/Permiso.php
lib/SAMURAI/Sistema.php
lib/SAMURAI/Sistema/consultas.ini
lib/SAMURAI/Usuario.php
sistema/conf/confSecciones.php
sistema/www/consultas/consultas.php
sistema/www/consultas/php-constantes.php
sistema/www/consultas/sistemas.php [new file with mode: 0644]
sistema/www/images/linea_separacion.gif [new file with mode: 0644]
sistema/www/sel-sistema.php

index 60d23dec48dceeae6dd77723dc07fd5afdce2e47..dc9ee0d5dfd143b3b364d81accd6b1f0f56f658a 100644 (file)
@@ -10,7 +10,7 @@
   <XMI.metamodel xmi.name="UML" href="UML.xml" xmi.version="1.3" />
  </XMI.header>
  <XMI.content>
   <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="395" />
   <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" >
   <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" >
@@ -185,25 +185,30 @@ 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: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: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: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: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="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" />
 x2c: get set" name="asociaciones" static="0" scope="202" />
+    <UML:Attribute stereotype="" package="" xmi.id="395" value="0" 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" >
    </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" >
@@ -279,7 +284,7 @@ x2c:set" name="sistema" static="0" scope="202" />
     <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" />
     <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="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="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="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" />
@@ -309,16 +314,16 @@ x2c:set" name="sistema" static="0" scope="202" />
       </linepath>
      </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" >
       </linepath>
      </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="10" 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="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="30" 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="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="30" 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="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:FloatingTextWidget usesdiagramfillcolour="1" width="0" usesdiagramusefillcolour="1" x="30" 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" />
       <linepath>
        <startpoint startx="480" starty="137" />
       <linepath>
        <startpoint startx="480" starty="137" />
-       <endpoint endx="348" endy="325" />
+       <endpoint endx="374" endy="332" />
       </linepath>
      </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" >
       </linepath>
      </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" >
@@ -349,13 +354,13 @@ x2c:set" name="sistema" static="0" scope="202" />
      </UML:AssocWidget>
     </associations>
    </diagram>
      </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,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="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" />
     <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="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="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" />
     </widgets>
      <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" />
     </widgets>
@@ -379,7 +384,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="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" />
        <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,7 +403,7 @@ 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="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="271" label="db" />
        <listitem open="0" type="814" id="226" label="descripcion" />
        <listitem open="0" type="814" id="225" label="id" />
@@ -438,6 +443,7 @@ x2c:set" name="sistema" static="0" scope="202" />
        <listitem open="0" type="815" id="295" label="obtenerDatosDb" />
       </listitem>
       <listitem open="1" type="813" id="209" label="SAMURAI_Sistema" >
        <listitem open="0" type="815" id="295" label="obtenerDatosDb" />
       </listitem>
       <listitem open="1" type="813" id="209" label="SAMURAI_Sistema" >
+       <listitem open="0" type="814" id="395" label="estado" />
        <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" />
index f6d0a3086c56fc8ef126594e7e8da8135f28cea7..25e359d86b7b6ee000482f0a00d3bbeaa103b38d 100644 (file)
@@ -24,7 +24,7 @@
 \fi-360\li5040\jclisttab\tx5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid201981955\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \r
 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li5760\jclisttab\tx5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid201981957\'01\u-3929 ?;}{\levelnumbers;}\f14\chbrdr\r
 \brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li6480\jclisttab\tx6480 }{\listname ;}\listid1648389061}}{\*\listoverridetable{\listoverride\listid1648389061\listoverridecount0\ls1}}{\info{\title ADMINISTRACI\'d3N DE USUARIOS}\r
 \fi-360\li5040\jclisttab\tx5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid201981955\'01o;}{\levelnumbers;}\f2\chbrdr\brdrnone\brdrcf1 \r
 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li5760\jclisttab\tx5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid201981957\'01\u-3929 ?;}{\levelnumbers;}\f14\chbrdr\r
 \brdrnone\brdrcf1 \chshdng0\chcfpat1\chcbpat1\fbias0 \fi-360\li6480\jclisttab\tx6480 }{\listname ;}\listid1648389061}}{\*\listoverridetable{\listoverride\listid1648389061\listoverridecount0\ls1}}{\info{\title ADMINISTRACI\'d3N DE USUARIOS}\r
-{\author Dir. Gral. de Inform\'e1tica}{\operator Dir. Gral. de Inform\'e1tica}{\creatim\yr2003\mo3\dy6\hr19\min20}{\revtim\yr2003\mo7\dy16\hr12\min54}{\printim\yr2003\mo2\dy6\hr11\min4}{\version27}{\edmins51}{\nofpages8}{\nofwords1101}{\nofchars6280}\r
+{\author Dir. Gral. de Inform\'e1tica}{\operator Dir. Gral. de Inform\'e1tica}{\creatim\yr2003\mo3\dy6\hr19\min20}{\revtim\yr2003\mo9\dy30\hr18\min56}{\printim\yr2003\mo2\dy6\hr11\min4}{\version29}{\edmins54}{\nofpages7}{\nofwords1101}{\nofchars6280}\r
 {\*\company Ministerio de Econom\'eda}{\nofcharsws0}{\vern8249}}\paperw11907\paperh16840\margl1134\margr1134\margt1134\margb1134 \r
 \deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1134\dgvorigin1134\dghshow1\dgvshow1\r
 \jexpand\viewkind1\viewscale75\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule \fet0\sectd \psz9\linex0\headery680\footery680\colsx708\endnhere\sectlinegrid360\sectdefaultcl \r
 {\*\company Ministerio de Econom\'eda}{\nofcharsws0}{\vern8249}}\paperw11907\paperh16840\margl1134\margr1134\margt1134\margb1134 \r
 \deftab708\widowctrl\ftnbj\aenddoc\hyphhotz425\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1134\dgvorigin1134\dghshow1\dgvshow1\r
 \jexpand\viewkind1\viewscale75\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule \fet0\sectd \psz9\linex0\headery680\footery680\colsx708\endnhere\sectlinegrid360\sectdefaultcl \r
@@ -39,7 +39,7 @@
 \cltxlrtb\clftsWidth3\clwWidth4889 \cellx4819\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrnone \clbrdrb\brdrnone \clbrdrr\brdrnone \cltxlrtb\clftsWidth3\clwWidth4890 \cellx9709\pard\plain \s16\qj \li0\ri0\widctlpar\intbl\r
 \tqc\tx4419\tqr\tx8838\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\fs18 16-07-2003\cell }\pard \s16\qr \li0\ri0\widctlpar\intbl\r
 \tqc\tx4419\tqr\tx8838\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\fs18 P\'e1gina }{\field{\*\fldinst {\fs18  PAGE }}{\fldrslt {\fs18\lang1024\langfe1024\noproof 1}}}{\fs18  de }{\field{\*\fldinst {\fs18  NUMPAGES }}{\fldrslt {\r
 \cltxlrtb\clftsWidth3\clwWidth4889 \cellx4819\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrnone \clbrdrb\brdrnone \clbrdrr\brdrnone \cltxlrtb\clftsWidth3\clwWidth4890 \cellx9709\pard\plain \s16\qj \li0\ri0\widctlpar\intbl\r
 \tqc\tx4419\tqr\tx8838\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\fs18 16-07-2003\cell }\pard \s16\qr \li0\ri0\widctlpar\intbl\r
 \tqc\tx4419\tqr\tx8838\aspalpha\aspnum\faauto\adjustright\rin0\lin0 {\fs18 P\'e1gina }{\field{\*\fldinst {\fs18  PAGE }}{\fldrslt {\fs18\lang1024\langfe1024\noproof 1}}}{\fs18  de }{\field{\*\fldinst {\fs18  NUMPAGES }}{\fldrslt {\r
-\fs18\lang1024\langfe1024\noproof 8}}}{\fs18 \cell }\pard\plain \qj \li0\ri0\widctlpar\intbl\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\trowd \trgaph70\trleft-70\trbrdrt\brdrs\brdrw10 \r
+\fs18\lang1024\langfe1024\noproof 7}}}{\fs18 \cell }\pard\plain \qj \li0\ri0\widctlpar\intbl\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\trowd \trgaph70\trleft-70\trbrdrt\brdrs\brdrw10 \r
 \trbrdrh\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrnone \clbrdrb\brdrnone \clbrdrr\brdrnone \cltxlrtb\clftsWidth3\clwWidth4889 \cellx4819\clvertalt\clbrdrt\brdrs\brdrw10 \r
 \clbrdrl\brdrnone \clbrdrb\brdrnone \clbrdrr\brdrnone \cltxlrtb\clftsWidth3\clwWidth4890 \cellx9709\row }\pard\plain \s16\qj \li0\ri0\widctlpar\tqc\tx4419\tqr\tx8838\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \r
 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\r
 \trbrdrh\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrnone \clbrdrb\brdrnone \clbrdrr\brdrnone \cltxlrtb\clftsWidth3\clwWidth4889 \cellx4819\clvertalt\clbrdrt\brdrs\brdrw10 \r
 \clbrdrl\brdrnone \clbrdrb\brdrnone \clbrdrr\brdrnone \cltxlrtb\clftsWidth3\clwWidth4890 \cellx9709\row }\pard\plain \s16\qj \li0\ri0\widctlpar\tqc\tx4419\tqr\tx8838\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \r
 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\r
 \par \r
 \par \r
 \par }{\pard\plain \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\object\objemb\objw11225\objh5284\objscalex85\objscaley85{\*\objclass Visio.Drawing.4}{\*\objdata 01050000\r
 \par \r
 \par \r
 \par }{\pard\plain \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\object\objemb\objw11225\objh5284\objscalex85\objscaley85{\*\objclass Visio.Drawing.4}{\*\objdata 01050000\r
-0200000010000000566973696f2e44726177696e672e3400000000000000000000380000\r
+0200000010000000566973696f2e44726177696e672e3400000000000000000000360000\r
 d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff0900060000000000000000000000010000000100000000000000001000000200000001000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff0900060000000000000000000000010000000100000000000000001000000200000001000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
-fffffffffffffffffdffffff04000000fefffffffefffffffeffffff060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f000000100000001100000012000000130000001400000015000000160000001700000018000000190000001a000000feffffffffffffffffffffffffff\r
+fffffffffffffffffdffffff04000000fefffffffefffffffeffffff060000000700000008000000090000000a0000000b0000000c0000000d0000000e0000000f00000010000000110000001200000013000000140000001500000016000000170000001800000019000000feffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
-ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffff02000000111a020000000000c000000000000046000000000000000000000000e06e\r
-9f80b24bc30103000000000200000000000001004f006c00650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000201ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000\r
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffff02000000111a020000000000c00000000000004600000000000000000000000060f9\r
+e2ab9d87c30103000000000200000000000001004f006c00650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000201ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000\r
 0000000000000000000000001400000000000000010043006f006d0070004f0062006a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000120002010100000004000000ffffffff0000000000000000000000000000000000000000000000000000\r
 0000000000000000000001000000690000000000000003004f0062006a0049006e0066006f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012000201ffffffffffffffffffffffff000000000000000000000000000000000000000000000000\r
 000000000000000000000000030000000400000000000000feffffff02000000fefffffffefffffffeffffff0600000007000000feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
 0000000000000000000000001400000000000000010043006f006d0070004f0062006a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000120002010100000004000000ffffffff0000000000000000000000000000000000000000000000000000\r
 0000000000000000000001000000690000000000000003004f0062006a0049006e0066006f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012000201ffffffffffffffffffffffff000000000000000000000000000000000000000000000000\r
 000000000000000000000000030000000400000000000000feffffff02000000fefffffffefffffffeffffff0600000007000000feffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff\r
@@ -79,10 +79,10 @@ ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0100000200000000
 000000000000000000000000000000000000000000000000000000000000000000000000feff0000040002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000feff000004000200000000000000000000000000000000000100\r
 0000e0859ff2f94f6810ab9108002b27b3d9300000008000000006000000040000003800000006000000440000000500000050000000030000005c000000070000006800000002000000740000001e00000001000000000000001e00000001000000000000001e00000001000000000000001e0000000100000000000000\r
 1e00000001000000000000001e00000001000000000000000000000000000000000000000000000056006900730069006f0044006f00630075006d0065006e00740000000000000000000000000000000000000000000000000000000000000000000000000000001c0002000300000005000000ffffffff000000000000\r
 000000000000000000000000000000000000000000000000000000000000000000000000feff0000040002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000feff000004000200000000000000000000000000000000000100\r
 0000e0859ff2f94f6810ab9108002b27b3d9300000008000000006000000040000003800000006000000440000000500000050000000030000005c000000070000006800000002000000740000001e00000001000000000000001e00000001000000000000001e00000001000000000000001e0000000100000000000000\r
 1e00000001000000000000001e00000001000000000000000000000000000000000000000000000056006900730069006f0044006f00630075006d0065006e00740000000000000000000000000000000000000000000000000000000000000000000000000000001c0002000300000005000000ffffffff000000000000\r
-00000000000000000000000000000000000000000000000000000000000005000000802a00000000000056006900730069006f0049006e0066006f0072006d006100740069006f006e00000000000000000000000000000000000000000000000000000000000000000022000201ffffffff06000000ffffffff00000000\r
+00000000000000000000000000000000000000000000000000000000000005000000442900000000000056006900730069006f0049006e0066006f0072006d006100740069006f006e00000000000000000000000000000000000000000000000000000000000000000022000201ffffffff06000000ffffffff00000000\r
 0000000000000000000000000000000000000000000000000000000000000000040000001c000000000000000500530075006d006d0061007200790049006e0066006f0072006d006100740069006f006e00000000000000000000000000000000000000000000000000000028000200ffffffffffffffffffffffff0000\r
 0000000000000000000000000000000000000000000000000000000000000000000005000000b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff\r
 0000000000000000000000000000000000000000000000000000000000000000040000001c000000000000000500530075006d006d0061007200790049006e0066006f0072006d006100740069006f006e00000000000000000000000000000000000000000000000000000028000200ffffffffffffffffffffffff0000\r
 0000000000000000000000000000000000000000000000000000000000000000000005000000b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff\r
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000566973696f2028544d292044726177696e670d0a0000000000000400802a00000084010014005200ec73d8004d2900003301000000000000ed64eaf10318e9f2ffffff8300fff6f2fff3fbf00701\r
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000566973696f2028544d292044726177696e670d0a0000000000000400442900000084010014005200ec73d800112800003301000000000000ed64eaf10318e9f2ffffff8300fff6f2fff3fbf00701\r
 f8f1008980eaf116048016002000190080ff00c0c0c000e6e6e6ff00cdcdcd00b3b3b3ef009a9a9a2100800066ff6666004d4d4d00337f3333001a1a1a0000000000000004000000000000000400ff1800ffff00d264007130dcff080fe1fa640019ebf0df015400000a250200205f417269616c2900022d06afe4000022\r
 3a050c2d0214fe33031254696d657320ff4e657720526f6d61036e003554ebf03fe8f3d03ff2ff0406daeaf120e8f359401a06000019012d00310f0000ff1a00ffff00d22c00b914dcffebf02c004aebf0012f54040020e9f2ff1c0ae0fbf7040068ebf002540000ebac02e8f3014a00000800bf0200620100fe4f0001f2\r
 5304025301ebf0307b14aeff47e17a843f0001401ce6f5430101000e50006a065603c9005d0784000375065601046255025502059604069604079601a08001d2034f0a97084f0003960404045304bb023fe6f50a1f1c16d2018401541c16a10101361a02361a03361708fa0dfaff8001004e0397039507970350f5079703\r
 f8f1008980eaf116048016002000190080ff00c0c0c000e6e6e6ff00cdcdcd00b3b3b3ef009a9a9a2100800066ff6666004d4d4d00337f3333001a1a1a0000000000000004000000000000000400ff1800ffff00d264007130dcff080fe1fa640019ebf0df015400000a250200205f417269616c2900022d06afe4000022\r
 3a050c2d0214fe33031254696d657320ff4e657720526f6d61036e003554ebf03fe8f3d03ff2ff0406daeaf120e8f359401a06000019012d00310f0000ff1a00ffff00d22c00b914dcffebf02c004aebf0012f54040020e9f2ff1c0ae0fbf7040068ebf002540000ebac02e8f3014a00000800bf0200620100fe4f0001f2\r
 5304025301ebf0307b14aeff47e17a843f0001401ce6f5430101000e50006a065603c9005d0784000375065601046255025502059604069604079601a08001d2034f0a97084f0003960404045304bb023fe6f50a1f1c16d2018401541c16a10101361a02361a03361708fa0dfaff8001004e0397039507970350f5079703\r
@@ -114,200 +114,172 @@ f7020504ebf00701f8fd021e100b100100321cc70d712d109c3f2c1f3e16f900090cfedb0002804c
 755d725f3000fe4283113af247cf6e756d62f5408a507065ef6f706c65b710717569ad720950746ffb406df55074bd6510537461736bc0106e44f9f02001842504cf43090c1ac411ff1225437573746f6d7d205c307065727469d4513d38831130536574f7434763f8165050648953652073656ccb6563085173ca12d902\r
 02607e1c330362200580826815fa2e6e14c4110c4c696e6bff20546f20506167659700fe1d831115c1620260613b6e6ff840722070ca608e68f9232951c06b60092f6472ff7073686477200080c1796811a56f1401c313c165446f5f63756d656ee9402183112519d56d643e748e68272951347f5e077f00a900f199707e\r
 997006091171016d62e3f8e8bfe8f3e03ff4f4fb3f02fdf3bf36d06903df9d36e8bf381502e03fce1c03e83f3a1d03fbf404c01a340bf8fbf4f8bfeb5f01eaf120f3f0000051feeff204fffdffff8300030101050f170f290f3b0f4d0f5f0f3e6d0987ff010f8f820f940ffe9a008aff01f7847701fd97b1007f85ff8400\r
 755d725f3000fe4283113af247cf6e756d62f5408a507065ef6f706c65b710717569ad720950746ffb406df55074bd6510537461736bc0106e44f9f02001842504cf43090c1ac411ff1225437573746f6d7d205c307065727469d4513d38831130536574f7434763f8165050648953652073656ccb6563085173ca12d902\r
 02607e1c330362200580826815fa2e6e14c4110c4c696e6bff20546f20506167659700fe1d831115c1620260613b6e6ff840722070ca608e68f9232951c06b60092f6472ff7073686477200080c1796811a56f1401c313c165446f5f63756d656ee9402183112519d56d643e748e68272951347f5e077f00a900f199707e\r
 997006091171016d62e3f8e8bfe8f3e03ff4f4fb3f02fdf3bf36d06903df9d36e8bf381502e03fce1c03e83f3a1d03fbf404c01a340bf8fbf4f8bfeb5f01eaf120f3f0000051feeff204fffdffff8300030101050f170f290f3b0f4d0f5f0f3e6d0987ff010f8f820f940ffe9a008aff01f7847701fd97b1007f85ff8400\r
-02ef09998400b701010f847fff019f83ff02f0c3028188cd0fdf0ff10f031ec808bb048b18c900990f3d1788ff7db8ebf025002d0002e9f2b74c0454ebf0ffffe2f901fcf5f4defd08004600c600ffccf0d800a3090000fd9debf0230042001cf27fd800400a000056ebf07d0a3b0004f3d8009643005d6647024000644f\r
-00fc4300f501ebf0482b009cf9d8007dfd43001c0400002b3b007d6c4f00190f000034160f2a3902d44f004d830070880002002700000032000200ff4600ffff00d602008520ebf002eff0fcf3dcfff8f168beebf001540000e8e7f441b6e8f308402a0dc03f3c05bfed49e8f3f03f4e0604000858f6f1660f780f0001ea\r
-f10ef9f02a2a06fe910001950a023c069e01fd034506fe0800020662bb0400c801076200cf02087b6208cf02096220009e01e9044e069e0105ed070092009d048b00df00658b001e0114aee7f4050048e9f28307120a0100eb3501eaf120f3f0000027feeff2ff0001008c3301ff3883888fff02f8f3fb8ebb0c0085bb01\r
-b3847b33841003840001031a044f010f83ff230f3509821300df050fff9fff4b050009f799000b4c0187bb01037d864d0086bb02b0006c01c06805790f8b0f9d0faf0f5000b33303933319005a064b0f450aef0fdd03f4210063028e18113301f38f07ff01f3fd63ebf055736520746fff2063726561746520ff65697468\r
-65722061ff2073747261696768ff74206f7220637572ff76656420636f6e6eff6563746f722e004df76f76651b0174726f6c3f2068616e646cf4f33400ff676520736861706537206f6614032e00006d62e3f8b0bce8f3e03fe6f5fbfcff0d01dfbfe0bc9aff785634d2bf38d069bf039d36e03fdc15033f05351d03bfe0\r
-fb020fff4800ffff00d60500d522ebf005ebf0fffef22600740401e2f901f9f001006813015f5400003404e8f340e8f3aff83f40fefef2f73405efd13f2c042a003603df460750177f2d4454fb21f9bf1500ff0100002100020275ff0c60750a6004e462ff020007750d60750bfe7a0403801140fe0e00fb02034706fe16\r
-000206fc81047504801240fe110053020078007500037c0106b501f10184008100c0041c0003025618010104faf109f9f209db00ff0000070012000204ef75026020e8f3e03f055ffe10000303dc0205e202dd03f400057503fa090800f70207629d0017000208faba0309cb03090b804140fa2711092c110a000307055f\r
-000c0001064f1008531699065313290fffff46053306ef073f0100d806db0366106c01dc028108d800ab139f1fb1110913bb190188ac16e313d71f0892002b07910101e447059002020a2a9505f03ffe17000008d900016e001005f1002f020361012711082c114712f5035e220a7d00fe0d0002ff0c744e600500807315\r
-406f210b74227a7a204b2348261c8f2828100162016624a920500fff32721cc7711cc7e1df3f329ff449d020cf3f9ac624d1ce25bf3f62074c221abe720062050072005010c0ff05754c6081012d40e781020990030730751f609f802e40fe0bb7000030096b00c0203101253101c0051120db005510e10055101511041a\r
-30fb08a84f100910551005161220fa091cfea10107607508608022f940a820a82013801640750706600589210a0b0610e31055107a3a3303281002804c400514ef1100010cbe320b00009ffdfffdfffecf300a0b41fec8006039436f707972ff6967687420a92031ff3939352056697369ff6f20436f72706f72ff617469\r
-6f6e2e2020ef416c6c20ec32732072ff657365727665642ef700fe18b70060105368ff6170652e686c7021ff23313730303500feff00a300a203840069ff039c008c02a00062ff02a40016029d0045ef019b0004f10013046c5e6b01550000e80f05015021b90055205120016100754102907a4047070e07f40000f807f8\r
-f0fe0d0cc8010360c2024e06450f570924e6f5fb04f09310984bf00310aa494a21300225370330349200049607fa920005e546fe90004e00f58a95108955400300d8008970b7002001c0c34f595fe3f8fda9ff6e002810045c24055c2406902c11984b02111429000511f9f00223000a3a335410730002b043aa40a103ae\r
-45a233cb505c3301a00008ef600e43751c4020506fd3736906413940aa5540010007b70071b31020011827520d964d3ab35f99156238006915612100bd30dffc10270032c8227153bc3febf04f1602ebf09415620325007d98ebf070002d0002e9f2ff785e3f001800ffffdee2f901000520dcff0000ff06004600c60004\r
-107fd900491000009bebf0ff23004200ec13d900d5e433008cebf00a3b0054117fd90070110000664702574000bc4f00d6530001ebf07d2b3b006c12d900d75300d532ebf0482b00f44f0009123f0000c6030000f534e9f204ebf0010d74daff40a70d1f401ae8b4df814e1b0d40ebf02700df280029002ae7f40b00fd22\r
-1900180002002600f52ce9f201f3f10d74da40ffa70d1f401ae8b481af4e1b0d40ebf032e9f20bfb001c110018000200200100fd3ce1fa030040004200ff6cf0d8004a160000f932dcfffdf20cf6d8007c0207002b0c00f97adcffe1fa020005001eff005300dcf8d800bdef0f000082ebf0c90040ff00eca6d8003f1000\r
-f3000aebf0120216d900cfef1500007bebf03f0052fb00ac2700a71600002400fcff0b026503000000000000000000000000ff1500ffff00d311007144ebf0f0f0fcff00f0bfe8f3771140551a01f51540feffeee6f5110046ebf00154038b0020ebf002eff04c032a0f00ef000300684701540000fbbc01e8f3490d74da\r
-40ffa70d1f40491ae8b4bf814e1b0d403fe8f3c02d3f8c05bf490a043f9e06730494b60fc80f0073020e49007a06fe92e100018306ee01028c06ee0103fe9506fe080002066201bd00181107620000ee0104749e06ee01052d1700202021060c481f210608085a1f771f73001910170062201f12019911fd012106940a12\r
-a91a04a91a05a917191208a01f14e210e1006d17ee0109a91a0afaa91a0ba91700b700cf00779200044900af0165db00aa6e01c8d50648e9f20243220aa467004421042b204c2305432212bb000643221a00074322225c941044212a00094322324f20ee44213a000b432242000c2e43224a000d432252e0004421775a00\r
-0f432262001043225f6a0083007ac12072c120aac02162c1205ac12052c1204aaac12042c1203ac12032c1202aaac12022c1201ac12012c1200a3ac12004b9208200c949006e015d52ebf0100027db002b4900552c67002d2b202e61202f692055307120319410328120334f205534912035992036a12037e000a538b120\r
-39b920defd48db00014b54087720008120da03044b04d2d00b08db006a05b4791534d0ff69039d36e03f400cee7c018d0a402104f03f408d04e9f2e43f2104a930be33d4033f50d10be101a236ee02ab36b213e8be35a419421108cf0c160003cb03092b2001812036400109fe3b00010b840081009bee2b22a8006c3321\r
-5500001588d40707801f017f15bb30704fe0bc3778467e10984f88198b0058eac94044c94030c9401c008aaa7120892b200651402807342c3cd905f64f00f83f02a0044c05e501e000036d0252395553553f4152494f00712b216f00045a45a24dd48c008e4d5a58a930e4f781106700344986503f403647c63de4ae8c00\r
-990060b9502cb95018dcb950582174006d712002544901513fdb00c965016f000e65025528db002949002a512202673aa00c51783f8a3d3a25a237188502fd00c535bb3fcd3fdf3ff1364c65024f14498ace0d283145023442334042400c61103542e662955042410400464701ba514f7300b64f784f8a4f9c4f4e7f40c0\r
-4fd24fe44b0c53ab7f0a5f021d56fd24e3f850455246494cff202f0a5349535445bf4d41202f200a325da820435f555f1b888651e66b039550e86700725f7059b0578656d9649656d964ba53854cc15894cd5fdf5ff15f432003c2673a03156f276f39677b03064000ab3f5d6f6f6f81682b95f43fa66fb86fb2ca670a35\r
-42bc92010a41420d0c3542ce92010df36f057f177f297f003b7f617f33af717f837fe14efc8191af0ebc7fffff031d5febf0ef74018f00138f258f3784ce999651ce995a8f845320bc999651bc996e8fb85180a58fb78f80c98fdb8f354169384691009f8a3dec00239e4c6f469f589f6a9f946f8e9fa09f8ad8034cb995\r
-02bc92bb90e2610b2c3542a2c2010b41420c3542b4c213010c4142e66202e6629180e26102e099deed9fff9f11af23af49af2bdf4059af6bafe14e1ac38bdfa6af04b9a61119db7fed763956e8dfaf318fcbc6004c84cbc4faaf8453b4c99651b4c92ebf008453a2c99651a2c962bf40b895c452b6ae95c49900a0b9506c\r
-b9503842c554d489bf9bbfadbf432005673ae105d1bfe3bf99372b9660a0d30f063a6dd40fcf21cf33cf719e2049f55ecf70cf264ba2c202a2c2d0f000e261464feccffecf10df51ff34df46dfc058df6adfe84711f1920f9cdfffff0505b9a60fbbde395fe8dff9af6f5f20698f7b88d1f973e6d6f4995200be5f28cdef\r
-dfeff1ef06673a0612ff24ff2300d855054cf04af014329f59ff806bff8069df157c9fa3ffb5ff80133a443140ce9202ce926f20dff10e3542968222010e41420f3542942201050f414ccceeff000f120f240f4a0f80f72f5a0f6c0fe14eb011553fa50fffebff06b9a61abbdb4d4953014fccdf3967e70f0db775241eb6\r
-752400fa0ff9d39429965194290e1ff9d382292096518229221fb851b9edb4691f7b1f148d1f00f007076a07b11fc31f396700df1608cffa1f0c2f1e2f50cf422f542f44ca67b4c202b4c27d507e2602822201038e22d7caec9fc22fd42fd05f0c3f800a3f1c3f2e3f403fbe41536f683fff53ff07d17f8f3a20e67520ce\r
-af00ae3f27ee83543fe68354e83f0c1f1e1f003017905940469554a287c1e588bf884f109a4fffe1eab0f18808bf4fd14f36f742df131de61f065f185f2a5f1d2f2f104f5f615fc6f894220294226580dfff00b25f146fd65fe85ffa5fcc8f1e6f306f7080aba671279f666fffff08b9af008f37d50fbd6ffb376b840c46\r
-6b84f06f00027f147f70b54e7d681f707f827fffe1a509b14006a712be4109e1c00590ab7f9480a210c376d095803bf2349fd069039d3669b0de7304d2e575ecb487e884dcb48750187f2d4454fb21f9bf94807e9580210002304f1bf741676b3f004f4526a0191dbd72bf0206621d00fed6a005fb6219dca204620300fe\r
-bb00e874ac0d0840f0ad012f4001001be1c0708680bd41fe1ab30100800b407a33cb40fe16b0011abf2cb502702102fee03ab151b228b90350bf2cb2cea4710302026c337ef30d00ff020b744e6001007a577340fe95b00c99b0029db24a0dac1c8dc0091142c2b201c2b2dd02c2b20300dc98af3272ff1cc7711cc7e13f\r
-32b79ff449f8b0cf3feeb4d1e6f6b5bf3faaa75be59c006aff0184003f01a40012ff019d007e008500495e7b820600b10184856413a507010007e88fbe868daf9fa95be5dd20488501009009980300a55443662ea9140cabfea9d2eff8e9905de3a8d5ffff0900704251943c73cff3cfc3ca5de3aa114241316b9695c40b\r
-df60e0f891015f10690e02f033f10b0fa8523100f0050a39aa0a47af59af6ba740f67eaf4004dfa2afb4a260e0bcafcea11cd3a50d1cdcaf0008b3dcffa130ec12b600529039b25ae228bb5aef48b6aac13ab1a090e25ebb90ef7ebf90b9039db904a4aabfbcb30a114201f20101f2020001f2d9bfebbffdbf0fcf21cf33\r
-cf45cb40e78f65cfd4df89cf9bcfadcc0abdcf04cfcf75340ae9cffbcf43df1fdf31dfa84c0f55df67d9339f100b39aa0b1086df98dfaadf4354f1f775aeffdedf4cf0dfc3ab1c19d3a5e3a30519e45a28ee17f742f83fb3d73276a280d08116b27e81afe325be991f48b605006db4cf125ebbcf1fbdef90b9e8e3a2b449\r
-05e9efbcb30b114240220140220102402218ff2aff3cff4eff60ff72ff0084ff96ff051f171fccffdeffb1c866d904070fdacb0b280f3a0f820f5e0f700fa88b3f940f67d934ad400c39aa0c50c50fd70f6ba7faa30ff44ef4803e40f67608381383371f0aef1cef0cb3d408e470f6461e8312f447921651c095e20051c0\r
-a61dda4f4ab450613ab10e525ebb100e5ffc1f0e2f202407282f3a23ea620cd363e36a00e4554f6c2f7e2f0a850180992fab2fbd2fcf2fbb894a4f5c4f88113f233fb7c20c3b3f4d3f47940c00673f386eb76f9c3fae3fc96fd23f66da053595700d39aa2020064f184f2a4e00de7c2c6f3e6f6e4f804f924fa44f797700\r
-c0462c8553e6f543178267ed198f4ab401062a544d825ebb4d8f3b5fcfef20244906675f3a230d4122be8201be820102be82965fa85fba5fcc5fde5ff05f80026f146f837f957f4a6f5c6fb1c80d087a6f8c6fe1c40da66fb86f007fdc6f50ee6f09af127f24793674d00e357a210e437f557fe907c04314bbdf803f201e\r
-1f301fc07fd27fe47415afac3ee1042cbc51e60676e456b2a61b56bf055800ade38cb21b5d8ebf7c8f4f57a5835f5f52322b0e4122fdb201fdb202fdb200572fe78ff98f8d2f1d9f2f9f419f539f20c2afd4af899f9b9ff0f80eb99fcb9f0220040ee59f793fc13f1baf2daf48df5451af247937b3000f357a0f82af0c94\r
-afa6ac8618787ffe9fbdcfae7fa8421f541fe47417bf4416f47e1b40068edad16c83e24e95ef0556082a5440cbe21b5bcbefb9bfcbbf202408e5bf523a230f41223cf2013cf2023cf200d58f26cf38cf0b9f5ccf6ecf80cf92cf2001ef13efc8cfdacf2f380ff8cf0adf025f340f24dff79f3faf5adf6cdf870f5490df24\r
-7938f23010357a10c1df34d3df67771aca42fa3f3a4f7d0fa8fdff2def3fe91d4cee1de078f4522d14f03518ae4302c74e02f44410d412e54bd41f0556042a540a221b5b880a2ff8ef4d5902d8b9595329ff032910a5027b22017b22027b2253ff0065ff77ff89ff9bffadffbfffd1ff401f10521f070f190f6e6810370f\r
-490f9e640110630f750fbd0f990fab0fc63fcf0f0624793200010000000000f554e9f214ebf0010d74daff40a70d1f401ae8b4df814e1b0d40e9f22700ff280029002a002b00ff2c002d002e002f00ff3000310032003300ff340035003600370077380039e7f40b004239003f180002004600fd1ce1fa010040004200ff\r
-54afd8005f2300000154dcf0fd3ee3f8010003001500ffc3005cb5d8002417ff0000350c0000c900ff400034afd8005923f7000006ebf03f0052001fe48fd800b3170007002c000000000000000400bd18ebf01c03c301dcff140100df500500003aebf00100ff506167652d310000fd06f5f0426c61636b207f66696c6c\r
-000012f5f05f576869746509040401027d751804010052656409047f0100477265656e0904dd2df5f043796140040100bf59656c6c6f77090347baf5f04df9f06e74613308613d79280531302520780914037f6c696e65000083f5f0fd33850c4c6f6e672064c761736831009a032204646125720805a04905cd08ad3906\r
-cd0781c06508cd072e030c195804cd0801ab0035850c37850c39850c314770786c9903a2006d18396d18ef486169727113010053ef686f7274b80a010041bf7269616c20636b00653f7265640000909910b013ff746f70206c656674e700009cc119f5f054696d0b6573b518bc9910e413de19ca17fde19910436f6e6e65\r
-63d7746f72f5f0465b014e6f7f726d616c0030022224ef20387074b5162000017c312018212e206172725c00a7656e644722242263192520ef746578744720020050ff726f636573730044bb75021720737400812044ff75726174696f6e007b65022f00736f75727b20acf5f179232e32a12833a12834aaa12835a12836\r
-a12837a12838cf0002004c9b0064270000734469b200f92a2e3130b1010a0d3c311d3f31ac210c3db8210c3dd0c4210c3dd0210c3d36ebf04c6f570000549d00460d00500530fd529d0041750000556e4a963069a6334e9930b4314399302553b53042c534d0355499319930f8cc31e435c831416e3300feaf033300faf9\r
-30f6f930f2aaf930eef930eaf930e6f930e2aaf930def930daf930d6f930d2aaf930cef930caf930c6f930c2aaf930bef930baf930b6f930b2aaf930aef930aaf930a6f930a4aaf93090f9307cf93068f93054aaf93040f9302cf93015f93004bef930f8023300ec7940e0aa7940d47940c87940bc7940b0aa7940a37940\r
-9779408e794082aa79406a79405679403e794030aa7940217940107940017940f0bb013313203300cdc140bcaac140a7c1409cc14090c14084aac14078c14068c14058c14047aac14034c14024c1400ec140f9af003300e5fd40d3fd40c0aafd40adfd40a0fd4090fd4083aafd4072fd4064fd4055fd4047aafd403cfd40\r
-2dfd401dfd400d7efd40040052000204ff0604000003000b00ff05003900ffff189931d9dcff100fe1faffff1e0f430fe0550f670f790f8b0f9d0f01000efef1f02500220028000fff0006002900240026bf002300090010f5f01aff00320033000d001170f9f0d90feb0ff0010a001dc3009f00004800429e0fe1fa052f\r
-0002000ac7000bf3f0371ffae2f903cd003000410044ead3003ad50008d100370043faebf035f7f02e003800273f003d003e00126510f00ffc931ffe030a0017000c00ff18001400150016009f19001c001ebd10b0032202bb0224c502981fe51ffc05ff1f112f00ac03292f3b2f4d2f5f2fe4f86a2f8e2f88a02fb22fe3\r
-f807be2fe22fe7f427bf002b002c002d73102ffa5910317d1004002a001bbf001f002000212d100b8b0013cf2007d31f343f3c34132ac50c346f1036691038f7f0d4014108691070333c3f893f90331013349f4c004b00401938b83f0400773fde3ff914fd7ce9f226000300010dff74da40a70d1f401a7fe8b4814e1b0d\r
-40ebf0f7010002f5f004000500ff0600070008000900ff0a000b000c000d00ff0e000f0010001100ff1200130014001500ff1600170018001900ff1a001b001c001d00ff1e001f00200021007f22002300240025f3f0bae8f30221000b00661f0018060d007000056ce1fa06dcff0e0f200f320fe5f6ff400042006402d9\r
-001f90280000813c0000000000000000000000000000001500000000001000000046bde300bbc401e0fb010003fff209e30067fcf10c0f1e0f000028ff7b1f6fa93663e2403f287b14aec74f3902350de73c71d80a02eff8bc75d8fee7f41400160052001caf78d80038ebf054ebf017aae7f48cebf0088308948f0418af\r
-00d200847b009cebf04caeebf0260002e9f2e8ebf021faebf01aa7000480d80009feeff0cb0700001b00463f00bcd94f00d492008e01fd1cd700ecbf4f006009d7000043ebf01d77009c777fd800cb1600004debf05524e7f41886000cebf0277700ff347fd800ca230000c93bbf04eaf1050610920129005742007c1b10\r
-0d06100da3014f016000f41b10e6f532d700df04b0d8001a06102603f70000cab70440270000f550eff03f77003cf6d8005f1129000020ebf03de7f4f9317f1012113c004000242fafd8003d7f100aebf0f2010aeaf1477f1006210000000000000000000000000000000000000000000000000000000000000000000000\r
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001050000050000000d0000004d45544146494c455049435400564d0000\r
-98dbffffbc1500000800564d68240000\r
-010009000003d90a00000800560000000000050000000b0200000000050000000c024d042209050000000902ffffff000500000001020000000004000000020102000500000001020000000007000000fc020000ffffff000000040000002d01000009000000fa02000001000000000000002200040000002d0101000e00\r
-0000240305000700c2003301c20033010700070007000700c20009000000fa02000000000000000000002200040000002d01020007000000fc020100000000000000040000002d01030004000000f001010010000000fb02d6ff13000000000090010000000000000020417269616c000000040000002d01010010000000\r
-fb021000070000000000bc02000000000102022253797374656d0000040000002d0104000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000a000000210507005553554152494f0071003d00040000002d010400050000000902ffffff00\r
-05000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e0000002403050007008402330184023301c9010700c90107008402040000002d010200040000002d01030004000000f0010500040000002d01010004000000\r
-2d0104000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000a0000002105080050455246494c202f010247000b0000002105090053495354454d41202f00330234000a000000210507005553554152494f0065023d00040000002d010400\r
-050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e00000024030500aa02c200d603c200d6030700aa020700aa02c200040000002d010200040000002d01030004000000f00105000400\r
-00002d010100040000002d0104000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000a0000002105070053495354454d41007100e302040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000\r
-010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e00000024030500aa028402d6038402d603c901aa02c901aa028402040000002d010200040000002d01030004000000f0010500040000002d010100040000002d0104000400000008010000050000000a0200000000\r
-0400000002010100040000002e01180005000000090200000000040000002d0101000a0000002105080050455246494c202f1a02ea020a0000002105070053495354454d41004c02e302040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01\r
-000009000000fa02000001000000000000002200040000002d0105000e00000024030500aa024604d6034604d6038b03aa028b03aa024604040000002d010200040000002d01030004000000f0010500040000002d010100040000002d0104000400000008010000050000000a0200000000040000000201010004000000\r
-2e01180005000000090200000000040000002d010100090000002105060050455246494cf503f602040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e0000002403\r
-05004d05c2007906c200790607004d0507004d05c200040000002d010200040000002d01030004000000f0010500040000002d010100040000002d0104000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000b000000210509005045524d\r
-49534f202f00580076050a0000002105070053495354454d41008a008605040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e000000240305004d05840279068402\r
-7906c9014d05c9014d058402040000002d010200040000002d01030004000000f0010500040000002d010100040000002d0104000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000b000000210509005045524d49534f202f0001027605\r
-0b000000210509002050455246494c202f00330287050a0000002105070053495354454d410065028605040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e000000\r
-24030500f007c2001c09c2001c090700f0070700f007c200040000002d010200040000002d01030004000000f0010500040000002d010100040000002d0104000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000a000000210507005045\r
-524d49534f0071002508040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d010500040000000201010008000000250302009d00c2009d009d01040000002d01020004000000f0010500040000002d01030009000000fa02\r
-000001000000000000002200040000002d01050004000000020101000800000025030200a800e3009200e3000800000025030200a800d8009200d80056000000250329009d00b3019b00b3019900b2019800b2019600b1019500b0019400ae019300ad019200ab019200aa019200a8019200a6019200a5019300a3019400\r
-a2019500a00196009f0198009e0199009e019b009d019d009d019e009d01a0009e01a2009e01a3009f01a400a001a500a201a600a301a700a501a700a601a800a801a700aa01a700ab01a600ad01a500ae01a400b001a300b101a200b201a000b2019e00b3019d00b30108000000250302009d00b3019d00c90108000000\r
-250302009d00b3019200c90108000000250302009d00b301a800c901040000002d01020004000000f001050010000000fb02dfff0f000000000090010000000000000020417269616c000000040000002d010500040000002d010400040000002d01000009000000fa02050000000000ffffff002200040000002d010600\r
-0c0000002403040085002e0185005c01b5005c01b5002e01040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010500070000002105020052314f018800040000002d010400050000000902ffffff000500\r
-0000010200000000040000002d01030009000000fa02000001000000000000002200040000002d010700040000000201010008000000250302004003c2004003b301040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800\r
-0000250302004b03e3003503e30008000000250302004b03d8003503d80008000000250302003503a8014b03a80108000000250302004003b3014003c90108000000250302004003b3013503c90108000000250302004003b3014b03c901040000002d01020004000000f0010700040000002d010500040000002d010400\r
-040000002d010000040000002d0106000c0000002403040028032e0128035c0158035c0158032e01040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010500070000002105020052334f012b0304000000\r
-2d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d0107000400000002010100080000002503020040039a0240038b03040000002d01020004000000f0010700040000002d01030009000000fa020000010000000000000022000400\r
-00002d010700040000000201010008000000250302004b03a5023503a502080000002503020040039a0240038402080000002503020040039a024b038402080000002503020040039a0235038402080000002503020035036a034b036a030800000025030200350375034b037503040000002d01020004000000f0010700\r
-040000002d010500040000002d010400040000002d010000040000002d0106000c000000240304002803f00228031e0358031e035803f002040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0105000700\r
-000021050200523411032b03040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200d603260237052602040000002d01020004000000f0010700040000002d01030009000000\r
-fa02000001000000000000002200040000002d01070004000000020101000800000025030200f6033102f6031c020800000025030200eb033102eb031c0208000000250302002c051c022c0531020800000025030200370526024d0526020800000025030200370526024d051c020800000025030200370526024d053102\r
-040000002d01020004000000f0010700040000002d010500040000002d010400040000002d010000040000002d0106000c0000002403040079040f0279043d02a9043d02a9040f02040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000\r
-090200000000040000002d0105000700000021050200523530027c04040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200d603640037056400040000002d01020004000000\r
-f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200f6036f00f6035a000800000025030200eb036f00eb035a0008000000250302002c055a002c056f000800000025030200370564004d0564000800000025030200370564004d055a00\r
-0800000025030200370564004d056f00040000002d01020004000000f0010700040000002d010500040000002d010400040000002d010000040000002d0106000c0000002403040079044d0079047b00a9047b00a9044d00040000002d010200040000002d0103000400000008010000050000000a020000000004000000\r
-02010100040000002e01180005000000090200000000040000002d010500070000002105020052366e007c04040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200e305c200\r
-e305b301040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200ee05e300d805e3000800000025030200ee05d800d805d8000800000025030200d805a801ee05a8010800000025030200e305b301e305c901\r
-0800000025030200e305b301d805c9010800000025030200e305b301ee05c901040000002d01020004000000f0010700040000002d010500040000002d010400040000002d010000040000002d0106000c00000024030400cb052e01cb055c01fb055c01fb052e01040000002d010200040000002d010300040000000801\r
-0000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010500070000002105020052374f01ce05040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000\r
-0201010008000000250302008e066400f0076400040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d0107000400000002010100080000002503020099066f0099065a0008000000250302008e0664007906640008000000250302008e06640079066f00\r
-08000000250302008e06640079065a000800000025030200cf075a00cf076f000800000025030200da075a00da076f00040000002d01020004000000f0010700040000002d010500040000002d010400040000002d010000040000002d0106000c000000240304001c074d001c077b004c077b004c074d00040000002d01\r
-0200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010500070000002105020052386e001f07040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa020000010000000000\r
-00002200040000002d010700040000000201010008000000250302005e012602aa022602040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101005600000025032900480126024901280249012a024a012b024b012d024c012e02\r
-4d012f024e0130025001310252013102530131025501310257013102580130025a012f025b012e025c012d025d012b025e012a025e0128025e0126025e0125025e0123025d0122025c0120025b011f025a011e0258011d0257011c0255011c0253011c0252011c0250011c024e011d024d011e024c011f024b0120024a01\r
-2202490123024901250248012602080000002503020048012602330126020800000025030200480126023301310208000000250302004801260233011c02080000002503020089021c0289023102080000002503020094021c0294023102040000002d01020004000000f0010700040000002d010500040000002d010400\r
-040000002d010000040000002d0106000c00000024030400d6010f02d6013d0206023d0206020f02040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010500070000002105020052323002d90104000000\r
-2d0104000300000000000000}{\result {{\pict{\*\picprop\shplid1025{\sp{\sn shapeType}{\sv 75}}{\sp{\sn fFlipH}{\sv 0}}{\sp{\sn fFlipV}{\sv 0}}{\sp{\sn pictureGray}{\sv 0}}{\sp{\sn pictureBiLevel}{\sv 0}}\r
-{\sp{\sn pictureActive}{\sv 0}}{\sp{\sn fFilled}{\sv 0}}{\sp{\sn fHitTestFill}{\sv 1}}{\sp{\sn fillShape}{\sv 1}}{\sp{\sn fillUseRect}{\sv 0}}{\sp{\sn fNoFillHitTest}{\sv 0}}\r
-{\sp{\sn fLine}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}{\sp{\sn fReallyHidden}{\sv 0}}{\sp{\sn fScriptAnchor}{\sv 0}}{\sp{\sn fFakeMaster}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}}\picscalex85\picscaley85\piccropl0\piccropr0\piccropt0\piccropb0\r
-\picw19798\pich9320\picwgoal11224\pichgoal5284\wmetafile8\bliptag1843078360\blipupi-109{\*\blipuid 6ddb24d87db18b846243dd1b056fb5e6}\r
-010009000003d90a00000800560000000000050000000b0200000000050000000c024d042209050000000902ffffff0005000000010200000000040000000201\r
+02ef09998400b701010f847fff019f83ff02f0c3028188cd0fdf0ff10f031ec808bb048b18c900990f3d1788ff7db8ebf025002d0002e9f2b74c0454ebf0ffffe2f901fcf5f4defd08004600c600ff6cf0d800a3090000fd9debf023004200bcf17fd800400a000056ebf07d0a3b00a4f2d800964300fd664702400004f3\r
+d800d5fc430001ebf0482b009cf9f7d800fd43001c040000f52b3b000c5f00190f0000a934160f3902745f004d83007000880002002700000032000200ff4600ffff00d602008520ebf002eff0fcf3dcfff8f168beebf001540000e8e7f441b6e8f308402a0dc03f3c05bfed49e8f3f03f4e0604000858f6f1660f780f00\r
+01eaf10ef9f02a2a06fe910001950a023c069e01fd034506fe0800020662bb0400c801076200cf02087b6208cf02096220009e01e9044e069e0105ed070092009d048b00df00658b001e0114aee7f4050048e9f28307120a0100eb3501eaf120f3f0000027feeff2ff0001008c3301ff3883888fff02f8f3fb8ebb0c0085\r
+bb01b3847b33841003840001031a044f010f83ff230f3509821300df050fff9fff4b050009f799000b4c0187bb01037d864d0086bb02b0006c01c06805790f8b0f9d0faf0f5000b33303933319005a064b0f450aef0fdd03f4210063028e18113301f38f07ff01f3fd63ebf055736520746fff2063726561746520ff6569\r
+746865722061ff2073747261696768ff74206f7220637572ff76656420636f6e6eff6563746f722e004df76f76651b0174726f6c3f2068616e646cf4f33400ff676520736861706537206f6614032e00006d62e3f8b0bce8f3e03fe6f5fbfcff0d01dfbfe0bc9aff785634d2bf38d069bf039d36e03fdc15033f05351d03\r
+bfe0fb020fff4800ffff00d60500d522ebf005ebf0fffef22600740401e2f901f9f001006813015f5400003404e8f340e8f3aff83f40fefef2f73405efd13f2c042a003603df460750177f2d4454fb21f9bf1500ff0100002100020275ff0c60750a6004e462ff020007750d60750bfe7a0403801140fe0e00fb02034706\r
+fe16000206fc81047504801240fe110053020078007500037c0106b501f10184008100c0041c0003025618010104faf109f9f209db00ff0000070012000204ef75026020e8f3e03f055ffe10000303dc0205e202dd03f400057503fa090800f70207629d0017000208faba0309cb03090b804140fa2711092c110a000307\r
+055f000c0001064f1008531699065313290fffff46053306ef073f0100d806db0366106c01dc028108d800ab139f1fb1110913bb190188ac16e313d71f0892002b07910101e447059002020a2a9505f03ffe17000008d900016e001005f1002f020361012711082c114712f5035e220a7d00fe0d0002ff0c744e60050080\r
+7315406f210b74227a7a204b2348261c8f2828100162016624a920500fff32721cc7711cc7e1df3f329ff449d020cf3f9ac624d1ce25bf3f62074c221abe720062050072005010c0ff05754c6081012d40e781020990030730751f609f802e40fe0bb7000030096b00c0203101253101c0051120db005510e10055101511\r
+041a30fb08a84f100910551005161220fa091cfea10107607508608022f940a820a82013801640750706600589210a0b0610e31055107a3a3303281002804c400514ef1100010cbe320b00009ffdfffdfffecf300a0b41fec8006039436f707972ff6967687420a92031ff3939352056697369ff6f20436f72706f72ff61\r
+74696f6e2e2020ef416c6c20ec32732072ff657365727665642ef700fe18b70060105368ff6170652e686c7021ff23313730303500feff00a300a203840069ff039c008c02a00062ff02a40016029d0045ef019b0004f10013046c5e6b01550000e80f05015021b90055205120016100754102907a4047070e07f40000f8\r
+07f8f0fe0d0cc8010360c2024e06450f570924e6f5fb04f09310984bf00310aa494a21300225370330349200049607fa920005e546fe90004e00f58a95108955400300d8008970b7002001c0c34f595fe3f8fda9ff6e002810045c24055c2406902c11984b02111429000511f9f00223000a3a335410730002b043aa40a1\r
+03ae45a233cb505c3301a00008ef600e43751c4020506fd3736906413940aa5540010007b70071b31020011827520d964d3ab35f99156238006915612100bd30dffc10270032c8227153bc3febf04f1602ebf09415620325007d98ebf070002d0002e9f2ff785e3f001800ffffdee2f901000520dcff0000ff06004600c6\r
+0004107fd9004b1000009bebf0ff23004200d414d900d5e633008cebf00a3b0054117fd90072110000664702574000bc4f00d8530001ebf07d2b3b006c12d900d95300d532ebf0482b00f44f000b123f0000c6030000f534e9f204ebf0010d74daff40a70d1f401ae8b4df814e1b0d40ebf02700df280029002ae7f40b00\r
+fd221900180002002600f52ce9f201f3f10d74da40ffa70d1f401ae8b481af4e1b0d40ebf032e9f20bfb001c110018000200200100fd3ce1fa030040004200ff9cbbd8004c160000f932dcfffdf2ecb9d8007e0207002b0c00f97adcffe1fa020005001eff005300dcf8d800bdef0f000084ebf0c90040ff00ec7fd80041\r
+1000f3000aebf0120216d900d1ef1500007bebf03f0052ff0034afd800a91600030024fcff0b026503000000000000000000000000ff1500ffff00d311007144ebf0f0f0fcff00f0bfe8f3771140551a01f51540feffeee6f5110046ebf00154038b0020ebf002eff04c032a0f00ef000300684701540000fbbc01e8f349\r
+0d74da40ffa70d1f40491ae8b4bf814e1b0d403fe8f3c02d3f8c05bf490a043f9e06730494b60fc80f0073020e49007a06fe92e100018306ee01028c06ee0103fe9506fe080002066201bd00181107620000ee0104749e06ee01052d1700202021060c481f210608085a1f771f73001910170062201f12019911fd012106\r
+940a12a91a04a91a05a917191208a01f14e210e1006d17ee0109a91a0afaa91a0ba91700b700cf00779200044900af0165db00ba6e01b0e7f4020048ebf00aa467004421042b20442305432212bb000643221a0007432222e4941044212a472044213a000bee432242000c43224a000d72432252e00044215a000f432277\r
+62001043226a0083af225562b1205ab12052b1204ab1205542b1203ab12032b1202ab1205522b1201ab12012b1200ab1209d04e0007200c949006e014aaade022b49002c67002d2b202eaa59202f612030692031941033aa4720348120358920369120374ae00038a12039a920defd484900770154086f20000009470254\r
+4e214e0f019410016906c87915ff34d069039d36e03fdb40188502fd3f2104f03f8b4004e9f2e4933589309e33d4033f50d10be1018236ee028b36b213f09e35a4194211ce0d28000303944c051447102b2001a920284001fd103b00010b040084007781009b2b22ba006c33214f55000088d408801f015945809b30644f\r
+9c376c4658408c4f88198bab0058bd4044bd4030bd401cab008a6920892b2006454028f2ef242c5134e94f0000f83f56e643f03f4c0502e000036d02fd24e3f850455246494cff202f0a5349535445ff4d41202f200a55537f554152494f00712b21826f00a8791eb03558469b36625110046700264b0331402847a637e4\r
+f7a63dd9e477541a4b0301144999005f600099004ce55018e5506e502194006d692002542a4152cc0fc965016f000e650228db00552949002a492203473a03553f78673f79377b030640400c7c01078d0a40824fa63fb83f6967d433907465e23ff43f064b0a2742fc6201650a33420d27420e72010d334f00454f574f69\r
+4f7b4fa14f737fb14fc34f70d54e3c61d17ffc4fffff03115600fe592f54415f535f655f77540e798a51800e799a5f7853fc698a51fc69ae5f0002e55080e55ff75f096f1b6f27414938088661406f526dec636e8c3f866f986fa0aa6fd43fce6fe06fd8034cf9650298fc62fb601c700c0b2742e29201650b1b720c2742\r
+f492010c1b72aa26420226420332420c2079de002d7f3f7f517f637f897f6baf997fab7f40d54e5a93cbafe67fe8211453191b5f042d561586e81f8f715f0ba68c540ba4003a8f7853f4998a51f4996e8f7853e299808a51e299a28f8088d5949286d59499ab00a0b9806cb98038c184d450c98fdb8fed8f432005473a05\r
+119ff6239f00b4636e60a0d306073a6dd44f9f619f739fb16e89c5489e9fb09fd407161140e29202e2920810d0de912277a825af37af49af5baf0081af74df91afa3afd54e51c1d2dfdcaf17ffff0511560ffbae158637d50027bf388f36e8a15fc8bfe79316d4b3b64a16d49992d099ff20be87740acf281ccf2ecf4320\r
+06473a0652cf64cf2300d879158cc08ac014726f99cf80abcfc0391ff5bc6fe3cff5cfd8033a4411400e72020e72aff0de910e274296c2f2010e1b720f2742d4f201090f1b722277cc2edf40df52df64df008adf370f9adfacdfd54ef0e1950fe5dfd7ffff0611561afbab4d4903534f0cbf793727ef4d87b5f45e8600b5\r
+f43aef7853d4f98a51d4f94eef785340c2f98a51c2f962efb481f9bdb4a9ef28bbefcdefdfe007473a07f1ef03ff0079371ff6489f3aff4cff5eff909f82ff8894ff0a47f49202f492bd20bef60202c2f203cef217aa2c7f020f140f103f004c0f4a0f5c0f6e0f800ffe11933fa80fa7ffff07115fcf0a20265520000e8f\r
+ee0f67bec3247fb6c324281f4cef005eefbc57d0298016d524e25701c5c88f20c81fda1fdee12a90316808ff1f112f8476c71ff31d26ff462f582f6a2f1d206fff8f2fa12f06d8d4f202d4f2a550001fdff22f543f163f283f3a3f0c6f5e3fe0703fc07be641676fa63fffff0800f97fcf0715effd3f3b17ab544c16ab54\r
+00304f424f544fb0858e4da8efb04fc24f4adee10af11006f512fe110a21a02105eb4fd450e2e00356d0d5507bcb4a1e53042555ecf4572864dcf457ff50182d4454fb21f9b9bfd450ad73304f1b37216bb33f005b156670191c152202df06621c00fe16800562fd191c8204620300fe00dd08b47c0d0840308d01401701\r
+001b21a070be30fd115a83ff0100800b407a3340e5fe5680015a8f6c8502700410dde07a819182688903908f6c82e441e7030202ac03bec30d0002ff0b744e6003007a732b40fed5800cd98004dd824d7cb11ccd95dab3eaba00dcd87f32ff721cc7711cc7e13f6f329ff4493890cf3f2e94cdd13695bf3fea779bb59c00\r
+ff6a0184003f01a400ff12019d007e008500bd49e7220600b101c45564405375d55fe759cd7fdf799bb5208855770100904968030054b9a6292e83724a7dfeb332ef29709db3beb235ffff0a0070bd343c50b39f33af03aa9db3aa51123116b650d5944baf6d109841019fe00e42c05a73c10b4f785233dfe00b797a210b\r
+877f997fab7f8324f13d25af9f98df7ff17f038b1c191385238305b41a84298e173722f83f7fc7321fd069039d3610615682be5110b083658e9abf888605ad84d0b29e8b20d0bfbe8fd089e983e28405ea8ffc830011d279e389ea1a9f2c9f3e9f509f629f00749f869f989f07bfbc9fce9fe09ff29708a6a908af1aab0b\r
+29af3baf83af5faf5071af8cdf95afa7a934dfe00c797aa10cc6afd8afeaa73a830f342ef48081de365609d8535338bf0b8f1d8f0c9081b4245036265e5312342793b60100af84dbe0a7bddbef8a84fe117a810ff2209e8b0ffffdbf0fcfe2840729cffc8318be221343234a00e456ef6dcf7fcf024a55809acfaccfbecf\r
+d0cfe7594bef105def12df24dff7920c3cdf4edfb334010c68df390eb80f9ddfafdfca0fd3df0aa6aa35ed100d797a60f007ef19ef002bee1e5c2d0f3f0f6fef81ef93efa5ef001d57c1e61e555486f6e31822688d1a2f028a84062bf44e229e8b4e2f3cffd08f9260f40668ff7af30d81f2bf220102bf2202bf2297ffa9\r
+ffbbffcdffdfff00f1ff030f150f841f961f4b0f5d0ff198110d7b0f8d0f9f040da70fb90f011fa0dd0fef0f0a4f131fa7a936d5400e20797a5951471f591f0e5a14bc7f81df201fbf31bfc11fd31f67b415b04c3f81042d5c52860677845752688b575f06f800ae838d521cfd8f5f7d2f50f7a62360ff5272fb0e81f2fe\r
+5201fe5202fe520058cfe82ffa2f8ecf1e3f303f423f543f00c34fd54f8a3f9c3ff1986471bd3fcf3f02a0010ee63f7adfc2df1c4f2e4f497f54524f644937b4a00f754a0f834f0c954fa74c8618791fff3fbe6faf1fa843bf55bf245417c0e416f51e1b40072edb716d23e3ee968f8456082bf440cc829a5bcc8fba5fcc\r
+5fde5408e65f527af30f81f23d92013d92023d9200d62f276f396f0c3f5d6f6f6f816f936f20028f148fc96fdb6f30d80ff96f0b7f029f040f257ff83f404f5b7f6d7f88af54917f644938f3d010754a10c27f34d47f68171acbe2fa3f3bef7eafa8fe9f2e8f40891d4d8e1de118f4522eb4f036b8afe302c8ee02f5e410\r
+d5b2252bd5bf8456042bf40bc29a5b880bcff98f4ef902d9595af32a9f03291081f27cc2017cc2027cc2549f00669f789f8a9f9c9fae9fc09fd29f41bf1053bf08af1aaf6f081038af4aaf9f04011064af76afbeaf9aafacafc7dfd0af0664493200010000000000f550e9f212ebf0010d74daff40a70d1f401ae8b4df81\r
+4e1b0d40e9f22800ff29002a002b002c00ff2d002e002f003000ff31003300340035007f36003700380039e7f4f70b003e350018000200034200fd1ce1fa010040004200ff44bbd8002e2200000150dcf0fd3ee3f8010003001500ffc3005cb5d8002717fef8f00b0000c9004000ffbcaed80028220000fd06ebf03f0052\r
+009c7f07d8007e170007002c000000000000000400bd18ebf01c03c301dcff140100df500500003aebf00100ff506167652d310000fd06f5f0426c61636b207f66696c6c000012f5f05f576869746509040401027d751804010052656409047f0100477265656e0904dd2df5f043796140040100bf59656c6c6f77090347\r
+baf5f04df9f06e74613308613d79280531302520780914037f6c696e65000083f5f0fd33850c4c6f6e672064c761736831009a032204646125720805a04905cd08ad3906cd0781c06508cd072e030c195804cd0801ab0035850c37850c39850c314770786c9903a2006d18396d18ef486169727113010053ef686f7274b8\r
+0a010041bf7269616c20636b00653f7265640000909910b013ff746f70206c656674e700009cc119f5f054696d0b6573b518bc9910e413de19ca17fde19910436f6e6e6563d7746f72f5f0465b014e6f7f726d616c0030022224ef20387074b5162000017c312018212e206172725c00a7656e644722242263192520ef74\r
+657874472250726fff6365737300447502ee17207374008120447572ff6174696f6e0065021e2f00736f75727b20f5f17923ab2e32a12833a12834a128352aa12836a12837a12838b1019b00de642700004469f62d2e315d30f52e2e31311d3f31ac21800c3db8210c3dc4210c3dd0210c3d36beebf04c6f0000549d0046\r
+ea0d00500530529d004175005700556e963069a6334e99302ab43143993053b53042c534d035c15499319930cc31e435c831416e7f3300fe033300faf93055f6f930f2f930eef930eaf93055e6f930e2f930def930daf93055d6f930d2f930cef930caf93055c6f930c2f930bef930baf93055b6f930b2f930aef930aaf9\r
+3055a6f930a4f93090f9307cf9305568f93054f93040f9302cf930f515f93004f930f802330055ec7940e07940d47940c8794055bc7940b07940a37940977940558e79408279406a7940567940553e7940307940217940107940dd017940f001331320330055cdc140bcc140a7c1409cc1405590c14084c14078c14068c1\r
+405558c14047c14034c14024c1407d0ec140f9003300e5fd4055d3fd40c0fd40adfd40a0fd405590fd4083fd4072fd4064fd405555fd4047fd403cfd402dfd40f51dfd400dfd4004005200030204ff0604000003000b00ff05003900ffff189931d9dcff100fe1faffff1e0f430fe0550f670f790f8b0f9d0f01000efef1\r
+f02500220028000fff0006002900240026bf002300090010f5f01aff00320033000d001170f9f0d90feb0ff0010a001dc3009f00004800429e0fe1fa052f0002000ac7000bf3f0371ffae2f903cd003000410044ead3003ad50008d100370043faebf035f7f02e003800273f003d003e00126510f00ffc931ffe030a0017\r
+000c00ff18001400150016009f19001c001ebd10b0032202bb0224c502981fe51ffc05ff1f112f00ac03292f3b2f4d2f5f2fe4f86a2f8e2f88a02fb22fe3f807be2fe22fe7f427bf002b002c002d73102ffa5910317d1004002a001bbf001f002000212d100b8b0013cf2007d31f343f3c34132ac50c346f1036691038f7\r
+f0d4014108691070333c3f893f90331013349f4c004b00401938b83f0400773fde3ff914fd7ce9f226000300010dff74da40a70d1f401a7fe8b4814e1b0d40ebf0f7010002f5f004000500ff0600070008000900ff0a000b000c000d00ff0e000f0010001100ff1200130014001500ff1600170018001900ff1a001b001c\r
+001d00ff1e001f00200021007f22002300240025f3f0bae8f30221000b00661f0018060d007000056ce1fa06dcff0e0f200f320fe5f6ff40004200d4bbd8001f54270000813c0000000000000000000000000000001500000000001000000046bde30073c401e6f5eff3010003fff2c7090067f6f5100fdefd287bff1f6f\r
+a93663e240283f8c30803ad9803a00340ee73c71d8f7f20b08bc75d8fee7f41400160052001caf78d80038ebf054ebf017aae7f48cebf0088308948f0418af00d200847b009cebf04caeebf0260002e9f2e8ebf021faebf01aa7000480d80009feeff0cb0700001b00423f00ecd94f00d492008e01fd1cd7001cc04f0060\r
+09d7000043ebf01d77009c777fd800cd1600004eebf05524e7f41b86000cebf0277700ff347fd80095220000493abf04eaf1cf1f10920129d700d57c1b10d71f100da3010160ef005404d9e5f6320046bf0004b0d800e41f1020ef030000cab704042600eb0050eff03f770054bad8a700d5276010ebf03de7f4f5fc7f10\r
+12113c004000acae1e59002800000aebf0f201eaf1050b9f100621000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000\r
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001050000050000000d0000004d45544146494c455049435400564d000098dbffffd8110000\r
+0800564d68240000\r
+010009000003e80800000800560000000000050000000b0200000000050000000c024d042209050000000902ffffff000500000001020000000004000000020102000500000001020000000007000000fc020000ffffff000000040000002d01000009000000fa02000001000000000000002200040000002d0101000e00\r
+00002403050007008402330184023301c9010700c9010700840209000000fa02000000000000000000002200040000002d01020007000000fc020100000000000000040000002d01030004000000f00101000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000\r
+10000000fb02d6ff13000000000090010000000000000020417269616c000000040000002d0101000a0000002105080050455246494c202f010247000b0000002105090053495354454d41202f00330234000a000000210507005553554152494f0065023d0010000000fb021000070000000000bc020000000001020222\r
+53797374656d0000040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e00000024030500aa02c200d603c200d6030700aa020700aa02c200040000002d0102000400\r
+00002d01030004000000f00105000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000a0000002105070053495354454d41007100e302040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000\r
+010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e00000024030500aa028402d6038402d603c901aa02c901aa028402040000002d010200040000002d01030004000000f00105000400000008010000050000000a02000000000400000002010100040000002e011800\r
+05000000090200000000040000002d0101000a0000002105080050455246494c202f1a02ea020a0000002105070053495354454d41004c02e302040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000fa020000010000000000\r
+00002200040000002d0105000e00000024030500aa024604d6034604d6038b03aa028b03aa024604040000002d010200040000002d01030004000000f00105000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d01010009000000210506005045\r
+5246494cf503f602040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e000000240305004d05c2007906c200790607004d0507004d05c200040000002d0102000400\r
+00002d01030004000000f00105000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000b000000210509005045524d49534f202f00580076050a0000002105070053495354454d41008a008605040000002d010400050000000902ffffff00\r
+05000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e000000240305004d058402790684027906c9014d05c9014d058402040000002d010200040000002d01030004000000f0010500040000000801000005000000\r
+0a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000b000000210509005045524d49534f202f00010276050b000000210509002050455246494c202f00330287050a0000002105070053495354454d410065028605040000002d010400050000000902ffffff0005000000\r
+010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e00000024030500f007c2001c09c2001c090700f0070700f007c200040000002d010200040000002d01030004000000f00105000400000008010000050000000a020000\r
+00000400000002010100040000002e01180005000000090200000000040000002d0101000a000000210507005045524d49534f0071002508040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d0105000400000002010100\r
+08000000250302004003c2004003b301040000002d01020004000000f0010500040000002d01030009000000fa02000001000000000000002200040000002d010500040000000201010008000000250302004b03e3003503e30008000000250302004b03d8003503d80008000000250302003503a8014b03a80108000000\r
+250302004003b3014003c90108000000250302004003b3013503c90108000000250302004003b3014b03c901040000002d01020004000000f0010500040000002d01000009000000fa02050000000000ffffff002200040000002d0105000c0000002403040028032e0128035c0158035c0158032e01040000002d010200\r
+040000002d0103000400000008010000050000000a02000000000400000002010100040000002e0118000500000009020000000010000000fb02dfff0f000000000090010000000000000020417269616c000000040000002d010600070000002105020052334f012b03040000002d010400050000000902ffffff000500\r
+0000010200000000040000002d01030009000000fa02000001000000000000002200040000002d0107000400000002010100080000002503020040039a0240038b03040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800\r
+0000250302004b03a5023503a502080000002503020040039a0240038402080000002503020040039a024b038402080000002503020040039a0235038402080000002503020035036a034b036a030800000025030200350375034b037503040000002d01020004000000f0010700040000002d010000040000002d010500\r
+0c000000240304002803f00228031e0358031e035803f002040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0106000700000021050200523411032b03040000002d010400050000000902ffffff000500\r
+0000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200d603260237052602040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800\r
+000025030200f6033102f6031c020800000025030200eb033102eb031c0208000000250302002c051c022c0531020800000025030200370526024d0526020800000025030200370526024d051c020800000025030200370526024d053102040000002d01020004000000f0010700040000002d010000040000002d010500\r
+0c0000002403040079040f0279043d02a9043d02a9040f02040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0106000700000021050200523530027c04040000002d010400050000000902ffffff000500\r
+0000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200d603640037056400040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800\r
+000025030200f6036f00f6035a000800000025030200eb036f00eb035a0008000000250302002c055a002c056f000800000025030200370564004d0564000800000025030200370564004d055a000800000025030200370564004d056f00040000002d01020004000000f0010700040000002d010000040000002d010500\r
+0c0000002403040079044d0079047b00a9047b00a9044d00040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010600070000002105020052366e007c04040000002d010400050000000902ffffff000500\r
+0000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200e305c200e305b301040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800\r
+000025030200ee05e300d805e3000800000025030200ee05d800d805d8000800000025030200d805a801ee05a8010800000025030200e305b301e305c9010800000025030200e305b301d805c9010800000025030200e305b301ee05c901040000002d01020004000000f0010700040000002d010000040000002d010500\r
+0c00000024030400cb052e01cb055c01fb055c01fb052e01040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010600070000002105020052374f01ce05040000002d010400050000000902ffffff000500\r
+0000010200000000040000002d01030009000000fa02000001000000000000002200040000002d010700040000000201010008000000250302008e066400f0076400040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800\r
+00002503020099066f0099065a0008000000250302008e0664007906640008000000250302008e06640079066f0008000000250302008e06640079065a000800000025030200cf075a00cf076f000800000025030200da075a00da076f00040000002d01020004000000f0010700040000002d010000040000002d010500\r
+0c000000240304001c074d001c077b004c077b004c074d00040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010600070000002105020052386e001f07040000002d010400050000000902ffffff000500\r
+0000010200000000040000002d01030009000000fa02000001000000000000002200040000002d010700040000000201010008000000250302005e012602aa022602040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101005600\r
+000025032900480126024901280249012a024a012b024b012d024c012e024d012f024e0130025001310252013102530131025501310257013102580130025a012f025b012e025c012d025d012b025e012a025e0128025e0126025e0125025e0123025d0122025c0120025b011f025a011e0258011d0257011c0255011c02\r
+53011c0252011c0250011c024e011d024d011e024c011f024b0120024a012202490123024901250248012602080000002503020048012602330126020800000025030200480126023301310208000000250302004801260233011c02080000002503020089021c0289023102080000002503020094021c02940231020400\r
+00002d01020004000000f0010700040000002d010000040000002d0105000c00000024030400d6010f02d6013d0206023d0206020f02040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d01060007000000\r
+2105020052323002d901040000002d010400030000000000}{\result {{\pict{\*\picprop\shplid1028{\sp{\sn shapeType}{\sv 75}}{\sp{\sn fFlipH}{\sv 0}}{\sp{\sn fFlipV}{\sv 0}}{\sp{\sn pictureGray}{\sv 0}}{\sp{\sn pictureBiLevel}{\sv 0}}\r
+{\sp{\sn fFilled}{\sv 0}}{\sp{\sn fHitTestFill}{\sv 1}}{\sp{\sn fillShape}{\sv 1}}{\sp{\sn fillUseRect}{\sv 0}}{\sp{\sn fNoFillHitTest}{\sv 0}}{\sp{\sn fLine}{\sv 0}}\r
+{\sp{\sn fReallyHidden}{\sv 0}}{\sp{\sn fScriptAnchor}{\sv 0}}{\sp{\sn fFakeMaster}{\sv 0}}{\sp{\sn fLayoutInCell}{\sv 1}}}\picscalex85\picscaley85\piccropl0\piccropr0\piccropt0\piccropb0\r
+\picw19798\pich9320\picwgoal11224\pichgoal5284\wmetafile8\bliptag247640012\blipupi-109{\*\blipuid 0ec2afccfbef80e063c48e96001446f3}\r
+010009000003e80800000800560000000000050000000b0200000000050000000c024d042209050000000902ffffff0005000000010200000000040000000201\r
 02000500000001020000000007000000fc020000ffffff000000040000002d01000009000000fa02000001000000000000002200040000002d0101000e000000\r
 02000500000001020000000007000000fc020000ffffff000000040000002d01000009000000fa02000001000000000000002200040000002d0101000e000000\r
-240305000700c2003301c20033010700070007000700c20009000000fa02000000000000000000002200040000002d01020007000000fc020100000000000000\r
-040000002d01030004000000f001010010000000fb02d6ff13000000000090010000000000000020417269616c000000040000002d01010010000000fb021000\r
-070000000000bc02000000000102022253797374656d0000040000002d0104000400000008010000050000000a02000000000400000002010100040000002e01\r
-180005000000090200000000040000002d0101000a000000210507005553554152494f0071003d00040000002d010400050000000902ffffff00050000000102\r
-00000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e00000024030500\r
-07008402330184023301c9010700c90107008402040000002d010200040000002d01030004000000f0010500040000002d010100040000002d01040004000000\r
-08010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000a0000002105080050455246494c202f\r
-010247000b0000002105090053495354454d41202f00330234000a000000210507005553554152494f0065023d00040000002d010400050000000902ffffff00\r
+2403050007008402330184023301c9010700c9010700840209000000fa02000000000000000000002200040000002d01020007000000fc020100000000000000\r
+040000002d01030004000000f00101000400000008010000050000000a02000000000400000002010100040000002e0118000500000009020000000010000000\r
+fb02d6ff13000000000090010000000000000020417269616c000000040000002d0101000a0000002105080050455246494c202f010247000b00000021050900\r
+53495354454d41202f00330234000a000000210507005553554152494f0065023d0010000000fb021000070000000000bc02000000000102022253797374656d\r
+0000040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000fa020000\r
+01000000000000002200040000002d0105000e00000024030500aa02c200d603c200d6030700aa020700aa02c200040000002d010200040000002d0103000400\r
+0000f00105000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000a0000002105\r
+070053495354454d41007100e302040000002d010400050000000902ffffff000500000001020000000004000000020102000500000001020000000004000000\r
+2d01000009000000fa02000001000000000000002200040000002d0105000e00000024030500aa028402d6038402d603c901aa02c901aa028402040000002d01\r
+0200040000002d01030004000000f00105000400000008010000050000000a02000000000400000002010100040000002e011800050000000902000000000400\r
+00002d0101000a0000002105080050455246494c202f1a02ea020a0000002105070053495354454d41004c02e302040000002d010400050000000902ffffff00\r
 05000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e00\r
 05000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e00\r
-000024030500aa02c200d603c200d6030700aa020700aa02c200040000002d010200040000002d01030004000000f0010500040000002d010100040000002d01\r
-04000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000a000000210507005349\r
-5354454d41007100e302040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d010000\r
-09000000fa02000001000000000000002200040000002d0105000e00000024030500aa028402d6038402d603c901aa02c901aa028402040000002d0102000400\r
-00002d01030004000000f0010500040000002d010100040000002d0104000400000008010000050000000a02000000000400000002010100040000002e011800\r
-05000000090200000000040000002d0101000a0000002105080050455246494c202f1a02ea020a0000002105070053495354454d41004c02e302040000002d01\r
-0400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000fa0200000100000000000000\r
-2200040000002d0105000e00000024030500aa024604d6034604d6038b03aa028b03aa024604040000002d010200040000002d01030004000000f00105000400\r
-00002d010100040000002d0104000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d01\r
-0100090000002105060050455246494cf503f602040000002d010400050000000902ffffff000500000001020000000004000000020102000500000001020000\r
-0000040000002d01000009000000fa02000001000000000000002200040000002d0105000e000000240305004d05c2007906c200790607004d0507004d05c200\r
-040000002d010200040000002d01030004000000f0010500040000002d010100040000002d0104000400000008010000050000000a0200000000040000000201\r
-0100040000002e01180005000000090200000000040000002d0101000b000000210509005045524d49534f202f00580076050a0000002105070053495354454d\r
-41008a008605040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000\r
-fa02000001000000000000002200040000002d0105000e000000240305004d058402790684027906c9014d05c9014d058402040000002d010200040000002d01\r
-030004000000f0010500040000002d010100040000002d0104000400000008010000050000000a02000000000400000002010100040000002e01180005000000\r
-090200000000040000002d0101000b000000210509005045524d49534f202f00010276050b000000210509002050455246494c202f00330287050a0000002105\r
-070053495354454d410065028605040000002d010400050000000902ffffff000500000001020000000004000000020102000500000001020000000004000000\r
-2d01000009000000fa02000001000000000000002200040000002d0105000e00000024030500f007c2001c09c2001c090700f0070700f007c200040000002d01\r
-0200040000002d01030004000000f0010500040000002d010100040000002d0104000400000008010000050000000a0200000000040000000201010004000000\r
-2e01180005000000090200000000040000002d0101000a000000210507005045524d49534f0071002508040000002d010400050000000902ffffff0005000000\r
-010200000000040000002d01030009000000fa02000001000000000000002200040000002d010500040000000201010008000000250302009d00c2009d009d01\r
-040000002d01020004000000f0010500040000002d01030009000000fa02000001000000000000002200040000002d0105000400000002010100080000002503\r
-0200a800e3009200e3000800000025030200a800d8009200d80056000000250329009d00b3019b00b3019900b2019800b2019600b1019500b0019400ae019300\r
-ad019200ab019200aa019200a8019200a6019200a5019300a3019400a2019500a00196009f0198009e0199009e019b009d019d009d019e009d01a0009e01a200\r
-9e01a3009f01a400a001a500a201a600a301a700a501a700a601a800a801a700aa01a700ab01a600ad01a500ae01a400b001a300b101a200b201a000b2019e00\r
-b3019d00b30108000000250302009d00b3019d00c90108000000250302009d00b3019200c90108000000250302009d00b301a800c901040000002d0102000400\r
-0000f001050010000000fb02dfff0f000000000090010000000000000020417269616c000000040000002d010500040000002d010400040000002d0100000900\r
-0000fa02050000000000ffffff002200040000002d0106000c0000002403040085002e0185005c01b5005c01b5002e01040000002d010200040000002d010300\r
-0400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010500070000002105020052314f01\r
-8800040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d010700\r
-040000000201010008000000250302004003c2004003b301040000002d01020004000000f0010700040000002d01030009000000fa0200000100000000000000\r
-2200040000002d010700040000000201010008000000250302004b03e3003503e30008000000250302004b03d8003503d80008000000250302003503a8014b03\r
-a80108000000250302004003b3014003c90108000000250302004003b3013503c90108000000250302004003b3014b03c901040000002d01020004000000f001\r
-0700040000002d010500040000002d010400040000002d010000040000002d0106000c0000002403040028032e0128035c0158035c0158032e01040000002d01\r
-0200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0105000700\r
-00002105020052334f012b03040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa0200000100000000000000\r
-2200040000002d0107000400000002010100080000002503020040039a0240038b03040000002d01020004000000f0010700040000002d01030009000000fa02\r
-000001000000000000002200040000002d010700040000000201010008000000250302004b03a5023503a502080000002503020040039a024003840208000000\r
-2503020040039a024b038402080000002503020040039a0235038402080000002503020035036a034b036a030800000025030200350375034b03750304000000\r
-2d01020004000000f0010700040000002d010500040000002d010400040000002d010000040000002d0106000c000000240304002803f00228031e0358031e03\r
-5803f002040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000\r
-040000002d0105000700000021050200523411032b03040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02\r
-000001000000000000002200040000002d01070004000000020101000800000025030200d603260237052602040000002d01020004000000f001070004000000\r
-2d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200f6033102f6031c020800000025030200eb03\r
-3102eb031c0208000000250302002c051c022c0531020800000025030200370526024d0526020800000025030200370526024d051c0208000000250302003705\r
-26024d053102040000002d01020004000000f0010700040000002d010500040000002d010400040000002d010000040000002d0106000c000000240304007904\r
-0f0279043d02a9043d02a9040f02040000002d010200040000002d0103000400000008010000050000000a02000000000400000002010100040000002e011800\r
-05000000090200000000040000002d0105000700000021050200523530027c04040000002d010400050000000902ffffff000500000001020000000004000000\r
-2d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200d603640037056400040000002d0102000400\r
-0000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200f6036f00f6035a00\r
-0800000025030200eb036f00eb035a0008000000250302002c055a002c056f000800000025030200370564004d0564000800000025030200370564004d055a00\r
-0800000025030200370564004d056f00040000002d01020004000000f0010700040000002d010500040000002d010400040000002d010000040000002d010600\r
-0c0000002403040079044d0079047b00a9047b00a9044d00040000002d010200040000002d0103000400000008010000050000000a0200000000040000000201\r
-0100040000002e01180005000000090200000000040000002d010500070000002105020052366e007c04040000002d010400050000000902ffffff0005000000\r
-010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200e305c200e305b301\r
-040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d0107000400000002010100080000002503\r
-0200ee05e300d805e3000800000025030200ee05d800d805d8000800000025030200d805a801ee05a8010800000025030200e305b301e305c901080000002503\r
-0200e305b301d805c9010800000025030200e305b301ee05c901040000002d01020004000000f0010700040000002d010500040000002d010400040000002d01\r
-0000040000002d0106000c00000024030400cb052e01cb055c01fb055c01fb052e01040000002d010200040000002d0103000400000008010000050000000a02\r
-000000000400000002010100040000002e01180005000000090200000000040000002d010500070000002105020052374f01ce05040000002d01040005000000\r
-0902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d0107000400000002010100080000002503\r
-02008e066400f0076400040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d01070004000000\r
-02010100080000002503020099066f0099065a0008000000250302008e0664007906640008000000250302008e06640079066f0008000000250302008e066400\r
-79065a000800000025030200cf075a00cf076f000800000025030200da075a00da076f00040000002d01020004000000f0010700040000002d01050004000000\r
-2d010400040000002d010000040000002d0106000c000000240304001c074d001c077b004c077b004c074d00040000002d010200040000002d01030004000000\r
-08010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010500070000002105020052386e001f070400\r
+000024030500aa024604d6034604d6038b03aa028b03aa024604040000002d010200040000002d01030004000000f00105000400000008010000050000000a02\r
+000000000400000002010100040000002e01180005000000090200000000040000002d010100090000002105060050455246494cf503f602040000002d010400\r
+050000000902ffffff0005000000010200000000040000000201020005000000010200000000040000002d01000009000000fa02000001000000000000002200\r
+040000002d0105000e000000240305004d05c2007906c200790607004d0507004d05c200040000002d010200040000002d01030004000000f001050004000000\r
+08010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0101000b000000210509005045524d49534f20\r
+2f00580076050a0000002105070053495354454d41008a008605040000002d010400050000000902ffffff000500000001020000000004000000020102000500\r
+0000010200000000040000002d01000009000000fa02000001000000000000002200040000002d0105000e000000240305004d058402790684027906c9014d05\r
+c9014d058402040000002d010200040000002d01030004000000f00105000400000008010000050000000a02000000000400000002010100040000002e011800\r
+05000000090200000000040000002d0101000b000000210509005045524d49534f202f00010276050b000000210509002050455246494c202f00330287050a00\r
+00002105070053495354454d410065028605040000002d010400050000000902ffffff0005000000010200000000040000000201020005000000010200000000\r
+040000002d01000009000000fa02000001000000000000002200040000002d0105000e00000024030500f007c2001c09c2001c090700f0070700f007c2000400\r
+00002d010200040000002d01030004000000f00105000400000008010000050000000a02000000000400000002010100040000002e0118000500000009020000\r
+0000040000002d0101000a000000210507005045524d49534f0071002508040000002d010400050000000902ffffff0005000000010200000000040000002d01\r
+030009000000fa02000001000000000000002200040000002d010500040000000201010008000000250302004003c2004003b301040000002d01020004000000\r
+f0010500040000002d01030009000000fa02000001000000000000002200040000002d010500040000000201010008000000250302004b03e3003503e3000800\r
+0000250302004b03d8003503d80008000000250302003503a8014b03a80108000000250302004003b3014003c90108000000250302004003b3013503c9010800\r
+0000250302004003b3014b03c901040000002d01020004000000f0010500040000002d01000009000000fa02050000000000ffffff002200040000002d010500\r
+0c0000002403040028032e0128035c0158035c0158032e01040000002d010200040000002d0103000400000008010000050000000a0200000000040000000201\r
+0100040000002e0118000500000009020000000010000000fb02dfff0f000000000090010000000000000020417269616c000000040000002d01060007000000\r
+2105020052334f012b03040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200\r
+040000002d0107000400000002010100080000002503020040039a0240038b03040000002d01020004000000f0010700040000002d01030009000000fa020000\r
+01000000000000002200040000002d010700040000000201010008000000250302004b03a5023503a502080000002503020040039a0240038402080000002503\r
+020040039a024b038402080000002503020040039a0235038402080000002503020035036a034b036a030800000025030200350375034b037503040000002d01\r
+020004000000f0010700040000002d010000040000002d0105000c000000240304002803f00228031e0358031e035803f002040000002d010200040000002d01\r
+03000400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d01060007000000210502005234\r
+11032b03040000002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01\r
+070004000000020101000800000025030200d603260237052602040000002d01020004000000f0010700040000002d01030009000000fa020000010000000000\r
+00002200040000002d01070004000000020101000800000025030200f6033102f6031c020800000025030200eb033102eb031c0208000000250302002c051c02\r
+2c0531020800000025030200370526024d0526020800000025030200370526024d051c020800000025030200370526024d053102040000002d01020004000000\r
+f0010700040000002d010000040000002d0105000c0000002403040079040f0279043d02a9043d02a9040f02040000002d010200040000002d01030004000000\r
+08010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d0106000700000021050200523530027c040400\r
 00002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000\r
 00002d010400050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000\r
-0201010008000000250302005e012602aa022602040000002d01020004000000f0010700040000002d01030009000000fa020000010000000000000022000400\r
-00002d01070004000000020101005600000025032900480126024901280249012a024a012b024b012d024c012e024d012f024e01300250013102520131025301\r
-31025501310257013102580130025a012f025b012e025c012d025d012b025e012a025e0128025e0126025e0125025e0123025d0122025c0120025b011f025a01\r
-1e0258011d0257011c0255011c0253011c0252011c0250011c024e011d024d011e024c011f024b0120024a012202490123024901250248012602080000002503\r
-020048012602330126020800000025030200480126023301310208000000250302004801260233011c02080000002503020089021c0289023102080000002503\r
-020094021c0294023102040000002d01020004000000f0010700040000002d010500040000002d010400040000002d010000040000002d0106000c0000002403\r
-0400d6010f02d6013d0206023d0206020f02040000002d010200040000002d0103000400000008010000050000000a0200000000040000000201010004000000\r
-2e01180005000000090200000000040000002d010500070000002105020052323002d901040000002d0104000300000000000000000000000000000000000000000000000000000000000000000000000000000000000000}}}}}{\r
+020101000800000025030200d603640037056400040000002d01020004000000f0010700040000002d01030009000000fa020000010000000000000022000400\r
+00002d01070004000000020101000800000025030200f6036f00f6035a000800000025030200eb036f00eb035a0008000000250302002c055a002c056f000800\r
+000025030200370564004d0564000800000025030200370564004d055a000800000025030200370564004d056f00040000002d01020004000000f00107000400\r
+00002d010000040000002d0105000c0000002403040079044d0079047b00a9047b00a9044d00040000002d010200040000002d01030004000000080100000500\r
+00000a02000000000400000002010100040000002e01180005000000090200000000040000002d010600070000002105020052366e007c04040000002d010400\r
+050000000902ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800\r
+000025030200e305c200e305b301040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d010700\r
+04000000020101000800000025030200ee05e300d805e3000800000025030200ee05d800d805d8000800000025030200d805a801ee05a8010800000025030200\r
+e305b301e305c9010800000025030200e305b301d805c9010800000025030200e305b301ee05c901040000002d01020004000000f0010700040000002d010000\r
+040000002d0105000c00000024030400cb052e01cb055c01fb055c01fb052e01040000002d010200040000002d0103000400000008010000050000000a020000\r
+00000400000002010100040000002e01180005000000090200000000040000002d010600070000002105020052374f01ce05040000002d010400050000000902\r
+ffffff0005000000010200000000040000002d01030009000000fa02000001000000000000002200040000002d01070004000000020101000800000025030200\r
+8e066400f0076400040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d010700040000000201\r
+0100080000002503020099066f0099065a0008000000250302008e0664007906640008000000250302008e06640079066f0008000000250302008e0664007906\r
+5a000800000025030200cf075a00cf076f000800000025030200da075a00da076f00040000002d01020004000000f0010700040000002d010000040000002d01\r
+05000c000000240304001c074d001c077b004c077b004c074d00040000002d010200040000002d0103000400000008010000050000000a020000000004000000\r
+02010100040000002e01180005000000090200000000040000002d010600070000002105020052386e001f07040000002d010400050000000902ffffff000500\r
+0000010200000000040000002d01030009000000fa02000001000000000000002200040000002d010700040000000201010008000000250302005e012602aa02\r
+2602040000002d01020004000000f0010700040000002d01030009000000fa02000001000000000000002200040000002d010700040000000201010056000000\r
+25032900480126024901280249012a024a012b024b012d024c012e024d012f024e0130025001310252013102530131025501310257013102580130025a012f02\r
+5b012e025c012d025d012b025e012a025e0128025e0126025e0125025e0123025d0122025c0120025b011f025a011e0258011d0257011c0255011c0253011c02\r
+52011c0250011c024e011d024d011e024c011f024b0120024a012202490123024901250248012602080000002503020048012602330126020800000025030200\r
+480126023301310208000000250302004801260233011c02080000002503020089021c0289023102080000002503020094021c0294023102040000002d010200\r
+04000000f0010700040000002d010000040000002d0105000c00000024030400d6010f02d6013d0206023d0206020f02040000002d010200040000002d010300\r
+0400000008010000050000000a02000000000400000002010100040000002e01180005000000090200000000040000002d010600070000002105020052323002d901040000002d010400030000000000}}}}}{\r
 \par \r
 \par \r
 \par }{\ul \r
 \par \r
 \par \r
 \par }{\ul \r
@@ -326,7 +298,6 @@ a80108000000250302004003b3014003c90108000000250302004003b3013503c901080000002503
 \par }{Asociaci\'f3n entre los perfiles y el sistema al cual corresponden.\r
 \par }{\ul R3\r
 \par R4\r
 \par }{Asociaci\'f3n entre los perfiles y el sistema al cual corresponden.\r
 \par }{\ul R3\r
 \par R4\r
-\par }{tipo_perfil *}{\ul \r
 \par }\pard\plain \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {fecha\r
 \par responsable\r
 \par }\pard\plain \s15\qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\r
 \par }\pard\plain \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {fecha\r
 \par responsable\r
 \par }\pard\plain \s15\qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\r
@@ -368,31 +339,6 @@ a80108000000250302004003b3014003c90108000000250302004003b3013503c901080000002503
 \par }\pard\plain \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {responsable\r
 \par }{\ul \r
 \par \r
 \par }\pard\plain \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {responsable\r
 \par }{\ul \r
 \par \r
-\par }\pard\plain \s2\qj \li0\ri0\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \b\f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {R1 }{\b0 (REL)}{\r
-\par }\trowd \trgaph70\trleft-70\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalc\clbrdrt\r
-\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \clcbpat17\cltxlrtb\clftsWidth3\clwWidth2590 \cellx2520\clvertalc\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \r
-\clcbpat17\cltxlrtb\clftsWidth3\clwWidth2340 \cellx4860\pard \s2\qc \li0\ri0\keepn\widctlpar\intbl\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0 {\b0 USUARIO\cell PERFIL / SISTEMA / USUARIO\cell }\pard\plain \r
-\qj \li0\ri0\widctlpar\intbl\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\trowd \trgaph70\trleft-70\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \r
-\trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalc\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \r
-\clcbpat17\cltxlrtb\clftsWidth3\clwWidth2590 \cellx2520\clvertalc\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \clcbpat17\cltxlrtb\clftsWidth3\clwWidth2340 \cellx4860\row }\trowd \trgaph70\trleft-70\trbrdrt\r
-\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \r
-\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2590 \cellx2520\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2340 \cellx4860\pard\plain \r
-\s2\qc \li0\ri0\keepn\widctlpar\intbl\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0 \b\f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\b0 Tiene \cell Pertenece a\cell }\pard\plain \r
-\qj \li0\ri0\widctlpar\intbl\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\trowd \trgaph70\trleft-70\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \r
-\trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2590 \r
-\cellx2520\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2340 \cellx4860\row }\pard\plain \r
-\s2\qc \li0\ri0\keepn\widctlpar\intbl\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0 \b\f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\b0 Muchos \cell Uno\cell }\pard\plain \r
-\qj \li0\ri0\widctlpar\intbl\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\trowd \trgaph70\trleft-70\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \r
-\trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2590 \r
-\cellx2520\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2340 \cellx4860\row }\trowd \trgaph70\trleft-70\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\r
-\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \r
-\cltxlrtb\clftsWidth3\clwWidth2590 \cellx2520\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2340 \cellx4860\pard\plain \r
-\s2\qc \li0\ri0\keepn\widctlpar\intbl\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0 \b\f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\b0 Opcional \cell Obligatorio\cell }\pard\plain \r
-\qj \li0\ri0\widctlpar\intbl\aspalpha\aspnum\faauto\adjustright\rin0\lin0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\trowd \trgaph70\trleft-70\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \r
-\trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2590 \r
-\cellx2520\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb\clftsWidth3\clwWidth2340 \cellx4860\row }\pard\plain \r
-\s2\qj \li0\ri0\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \b\f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\r
-\par }\pard\plain \s15\qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\r
 \par }\pard\plain \s2\qj \li0\ri0\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \b\f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {R2 }{\b0 (REL)}{\r
 \par }\trowd \trgaph70\trleft-70\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalc\clbrdrt\r
 \brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \clcbpat17\cltxlrtb\clftsWidth3\clwWidth2590 \cellx2520\clvertalc\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \r
 \par }\pard\plain \s2\qj \li0\ri0\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \b\f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {R2 }{\b0 (REL)}{\r
 \par }\trowd \trgaph70\trleft-70\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \trftsWidth1\trautofit1\trpaddl70\trpaddr70\trpaddfl3\trpaddfr3 \clvertalc\clbrdrt\r
 \brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \clcbpat17\cltxlrtb\clftsWidth3\clwWidth2590 \cellx2520\clvertalc\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10 \clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \r
@@ -585,43 +531,17 @@ a80108000000250302004003b3014003c90108000000250302004003b3013503c901080000002503
 \par estado *\r
 \par }{\ul \r
 \par \r
 \par estado *\r
 \par }{\ul \r
 \par \r
-\par }\pard\plain \s2\qj \li0\ri0\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin0\itap0 \b\f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {USUARIO }{\b0 (ENT)}{\r
-\par }\pard\plain \s4\qj \li0\ri0\keepn\widctlpar\aspalpha\aspnum\faauto\outlinelevel3\adjustright\rin0\lin0\itap0 \i\f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {Fundamental\r
-\par }\pard\plain \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {Cada uno de los usuarios administrados. *\r
-\par }{\ul login\r
-\par }{nrodoc\r
-\par nombre\r
-\par fecha\r
-\par \r
-\par \r
-\par \r
+\par }{\page \r
 \par * }{\ul Observaciones:\r
 \par \r
 \par \r
 \par * }{\ul Observaciones:\r
 \par \r
 \par \r
-\par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {La entidad }{\i USUARIO}{ obtiene los datos autom\'e1\r
-ticamente a partir de los usuarios que se loguean en Intranet.\r
-\par }\pard \qj \li708\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin708\itap0 {El atributo }{\i login}{ corresponde a }{\i nick@organismo.}{  \r
-\par El atributo }{\i nombre }{es necesario, dado que existen agentes cuyo nombre y apellido no pueden localizarse en ninguna de las bases de datos provistas por Recursos Humanos.\r
-\par El tipo de documento no se considera, dado que no es posible obtenerse a partir del directorio }{\i LDAP}{.\r
-\par De esta forma, la descentralizaci\'f3n de la asignaci\'f3n de permisos, permite que el usuario administrador de un determinado sistema asigne permisos a nuevos usuarios sin necesidad de conocer otra dato m\'e1\r
-s que el login del usuario. (el resto de los datos son obtenidos de la entidad }{\i USUARIO}{, previamente cargada)\r
-\par }\pard\plain \s17\qj \li708\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin708\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {Obviamente esto implica que los usuarios a los que s\r
-e le asignen permisos deben haberse logueado previamente en Intranet.\r
-\par }\pard\plain \qj \li708\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin708\itap0 \f28\fs20\lang3082\langfe3082\cgrid\langnp3082\langfenp3082 {\r
 \par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {El atributo }{\i observaciones }{de la entidad }{\i PERMISO / SISTEMA}{\r
  contiene opcionalmente cualquier comentario o valor extra asociado con el permiso en cuesti\'f3n.\r
 \par }\pard \qj \li708\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin708\itap0 {(Por ejemplo, para el caso de Ver Bandas Horarias de una determinada dependencia, se obtiene el c\'f3\r
 digo de dependencia deseado, permitiendo que un mismo usuario pueda ver las bandas horarias de diferentes dependencias, a partir de la asignaci\'f3n de los respectivos permisos)\r
 \par }\pard \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\r
 \par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {El atributo }{\i observaciones }{de la entidad }{\i PERMISO / SISTEMA}{\r
  contiene opcionalmente cualquier comentario o valor extra asociado con el permiso en cuesti\'f3n.\r
 \par }\pard \qj \li708\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin708\itap0 {(Por ejemplo, para el caso de Ver Bandas Horarias de una determinada dependencia, se obtiene el c\'f3\r
 digo de dependencia deseado, permitiendo que un mismo usuario pueda ver las bandas horarias de diferentes dependencias, a partir de la asignaci\'f3n de los respectivos permisos)\r
 \par }\pard \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 {\r
-\par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {Los datos del personal de la \lquote Coordinaci\'f3n de Operaci\'f3n y \r
-Administraci\'f3n de Sistemas Inform\'e1ticos\rquote  involucrado en el desarrollo de cada uno de los sistemas, forman parte de la entidad }{\i USUARIO,}{ relacionada al sistema correspondiente mediante la asignaci\'f3\r
-n de un perfil, identificando el rol que desempe\'f1\'f3 la persona (ejs.: programador, dise\'f1ador gr\'e1fico, analista de sistemas, etc.).\r
-\par }\pard \qj \li360\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 {\r
-\par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {El atributo }{\i tipo_perfil}{ de la entidad }{\i PERFIL/SISTEMA}{\r
- diferencia perfiles internos y externos, es decir, si se trata de perfiles definidos para usuarios de los sistemas, o bien de roles desempe\'f1ados durante el desarrollo del proyecto (perfiles privados).\r
-\par }\pard \qj \li360\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 {\r
-\par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {El atributo }{\i contacto}{ de la entidad }{\i SISTEMA}{\r
- contiene todos los datos necesarios a fin de poder identificar a las personas que solicitaron el sistema.\r
+\par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {El atributo }{\i contacto}{ de la entidad }{\i SISTEMA}{ contiene todos los\r
+ datos necesarios a fin de poder identificar a las personas que solicitaron el sistema.\r
 \par }\pard \qj \li708\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin708\itap0 {Se trata de un campo texto que contendr\'e1 b\'e1sicamente los siguientes datos, para cada uno de los contactos correspondientes al sistema:\r
 \par Nombre: -----\r
 \par Interno: -----\r
 \par }\pard \qj \li708\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin708\itap0 {Se trata de un campo texto que contendr\'e1 b\'e1sicamente los siguientes datos, para cada uno de los contactos correspondientes al sistema:\r
 \par Nombre: -----\r
 \par Interno: -----\r
@@ -629,12 +549,11 @@ n de un perfil, identificando el rol que desempe\'f1\'f3 la persona (ejs.: progr
 \par \'c1rea: -----\r
 \par }\pard \qj \li360\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 {\r
 \par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {Cada una de las entidades contiene los atributos }{\i fecha}{ y }{\i responsable}{\r
 \par \'c1rea: -----\r
 \par }\pard \qj \li360\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 {\r
 \par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {Cada una de las entidades contiene los atributos }{\i fecha}{ y }{\i responsable}{\r
- que representan el momento en que se realiz\'f3 el \'faltimo cambio en el registro y el usuario que lo llev\'f3 a cabo.  Estos dos campos sirven para llevar un control de qui\'e9n y en qu\'e9 momento se asignan nuevos permisos, se crean n\r
-uevos perfiles, etc. \r
-\par }\pard \qj \li708\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin708\itap0 {La entidad }{\i USUARIO}{ no tiene el atributo }{\i responsable}{, dado que los datos son obtenidos autom\'e1ticamente.\r
-\par \r
-\par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {El atributo }{\i estado}{ de la entidad }{\i SISTEMA}{\r
- indica el estado en que se encuentra el sistema (activo o no).  Los sistemas no pueden ser eliminados de la base de datos, sino que son dados de baja.   Al dar de baja un sistema, \'e9ste deja de estar activo.\r
+ que representan el momento en que se realiz\'f3 el \'faltimo cambio en el registro y el usuario que lo llev\'f3 a cabo.  Estos dos campos sirven para llevar un control de qui\'e9n y en qu\'e9\r
+ momento se asignan nuevos permisos, se crean nuevos perfiles, etc. \r
+\par }\pard \qj \li708\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin708\itap0 {\r
+\par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {El atributo }{\i estado}{ de la entidad }{\i SISTEMA}{ indica el estado en que se\r
+ encuentra el sistema (activo o no).  Los sistemas no pueden ser eliminados de la base de datos, sino que son dados de baja.   Al dar de baja un sistema, \'e9ste deja de estar activo.\r
 \par }\pard \qj \li360\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 {\r
 \par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {Tanto los nombres de sistemas, como los nombres de permisos no pueden repetirse.\r
 \r
 \par }\pard \qj \li360\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin360\itap0 {\r
 \par {\listtext\pard\plain\fs20 \hich\af0\dbch\af0\loch\f0 -\tab}}\pard \qj \fi-360\li720\ri0\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin720\itap0 {Tanto los nombres de sistemas, como los nombres de permisos no pueden repetirse.\r
 \r
index 9a56e538c4fd8168fced19a14d75829734e14dae..1a0e20272bfe487dee271369df485220959f1c6e 100644 (file)
@@ -671,4 +671,4 @@ class SAMURAI_Perfil {
 
 } // -X2C Class :SAMURAI_Perfil
 
 
 } // -X2C Class :SAMURAI_Perfil
 
-?>
+?>
\ No newline at end of file
index beba603809fbf5e86d0a0655d5f4d09d568b66ab..a6004e06f9286b84c4f6f26368158aab956d90b0 100644 (file)
@@ -391,4 +391,4 @@ class SAMURAI_Permiso {
 
 } // -X2C Class :SAMURAI_Permiso
 
 
 } // -X2C Class :SAMURAI_Permiso
 
-?>
+?>
\ No newline at end of file
index 1b0b90a17e1bc48dfb9839f92d22f9c44a7a3666..8124a37d97349bc60da2b4abf39b94fe240f6105 100644 (file)
@@ -41,7 +41,7 @@ class SAMURAI_Sistema {
      * @var    int $id
      * @access protected
      */
      * @var    int $id
      * @access protected
      */
-    var $_id;
+    var $_id = null;
 
     /**
      * Nombre del sistema.
 
     /**
      * Nombre del sistema.
@@ -49,7 +49,7 @@ class SAMURAI_Sistema {
      * @var    string $nombre
      * @access protected
      */
      * @var    string $nombre
      * @access protected
      */
-    var $_nombre;
+    var $_nombre = null;
 
     /**
      * Descripcion del sistema.
 
     /**
      * Descripcion del sistema.
@@ -57,7 +57,7 @@ class SAMURAI_Sistema {
      * @var    string $descripcion
      * @access protected
      */
      * @var    string $descripcion
      * @access protected
      */
-    var $_descripcion;
+    var $_descripcion = null;
 
     /**
      * Fecha en la cual se inicio el sistema.
 
     /**
      * Fecha en la cual se inicio el sistema.
@@ -65,7 +65,7 @@ class SAMURAI_Sistema {
      * @var    date $fecha_inicio
      * @access protected
      */
      * @var    date $fecha_inicio
      * @access protected
      */
-    var $_fecha_inicio;
+    var $_fecha_inicio = null;
 
     /**
      * Fecha en la cual se dio por terminado el desarrollo del sistema.
 
     /**
      * Fecha en la cual se dio por terminado el desarrollo del sistema.
@@ -73,7 +73,7 @@ class SAMURAI_Sistema {
      * @var    date $fecha_fin
      * @access protected
      */
      * @var    date $fecha_fin
      * @access protected
      */
-    var $_fecha_fin;
+    var $_fecha_fin = null;
 
     /**
      * Fecha de implementacion del sistema.
 
     /**
      * Fecha de implementacion del sistema.
@@ -81,7 +81,7 @@ class SAMURAI_Sistema {
      * @var    date $fecha_implementacion
      * @access protected
      */
      * @var    date $fecha_implementacion
      * @access protected
      */
-    var $_fecha_implementacion;
+    var $_fecha_implementacion = null;
 
     /**
      * Texto con los datos del o de los contacto/s en el area usuario.
 
     /**
      * Texto con los datos del o de los contacto/s en el area usuario.
@@ -89,7 +89,7 @@ class SAMURAI_Sistema {
      * @var    string $contacto
      * @access protected
      */
      * @var    string $contacto
      * @access protected
      */
-    var $_contacto;
+    var $_contacto = null;
 
     /**
      * Objeto Samurai_DB
 
     /**
      * Objeto Samurai_DB
@@ -105,7 +105,7 @@ class SAMURAI_Sistema {
      * @var    string $responsable
      * @access protected
      */
      * @var    string $responsable
      * @access protected
      */
-    var $_responsable;
+    var $_responsable = null;
 
     /**
      * Array asociativo (id - descripcion) con los permisos asociados al sistema.
 
     /**
      * Array asociativo (id - descripcion) con los permisos asociados al sistema.
@@ -113,7 +113,7 @@ class SAMURAI_Sistema {
      * @var    array $permisos
      * @access protected
      */
      * @var    array $permisos
      * @access protected
      */
-    var $_permisos;
+    var $_permisos = null;
 
     /**
      * Array con los permisos asociados al sistema
 
     /**
      * Array con los permisos asociados al sistema
@@ -121,7 +121,15 @@ class SAMURAI_Sistema {
      * @var    array $asociaciones
      * @access protected
      */
      * @var    array $asociaciones
      * @access protected
      */
-    var $_asociaciones;
+    var $_asociaciones = null;
+
+    /**
+     * indica si el sistema esta activo o no.
+     *
+     * @var    int $estado
+     * @access protected
+     */
+    var $_estado = 0;
 
     /**
      * Gets Asociaciones.
 
     /**
      * Gets Asociaciones.
@@ -146,6 +154,29 @@ class SAMURAI_Sistema {
         $this->_asociaciones = $asociaciones;
     }
 
         $this->_asociaciones = $asociaciones;
     }
 
+    /**
+     * Gets Estado.
+     *
+     * @return int
+     * @access public
+     */
+    function getEstado()
+    {
+        return $this->_estado;
+    }
+    /**
+     * Sets Estado.
+     *
+     * @param  int $estado Estado.
+     *
+     * @return void
+     * @access public
+     */
+    function setEstado($estado)
+    {
+        $this->_estado = $estado;
+    }
+
     // ~X2C
 
     // +X2C Operation 243
     // ~X2C
 
     // +X2C Operation 243
@@ -165,16 +196,6 @@ class SAMURAI_Sistema {
         if (!is_null($id)) {
             $this->_obtenerDatosDb();
         }
         if (!is_null($id)) {
             $this->_obtenerDatosDb();
         }
-        else {
-            $this->setNombre();
-            $this->setDescripcion(); 
-            $this->setFechaInicio();
-            $this->setFechaFin();
-            $this->setFechaImplementacion();
-            $this->setContacto();
-            $this->setResponsable();
-            $this->setPermisos();
-        }
     }
     // -X2C
 
     }
     // -X2C
 
@@ -409,44 +430,26 @@ class SAMURAI_Sistema {
             if (isset($re['nombre_sistema'])) {
                 $this->setNombre($re['nombre_sistema']);
             }
             if (isset($re['nombre_sistema'])) {
                 $this->setNombre($re['nombre_sistema']);
             }
-            else {
-                $this->setNombre();
-            }
             if (isset($re['desc_sistema'])) {
                $this->setDescripcion($re['desc_sistema']);
             }
             if (isset($re['desc_sistema'])) {
                $this->setDescripcion($re['desc_sistema']);
             }
-            else {
-                $this->setDescripcion();
-            }
             if (isset($re['fecha_inicio'])) {
                 $this->setFechaInicio($re['fecha_inicio']);
             }
             if (isset($re['fecha_inicio'])) {
                 $this->setFechaInicio($re['fecha_inicio']);
             }
-            else {
-                $this->setFechaInicio();
-            }
             if (isset($re['fecha_fin'])) {
                 $this->setFechaFin($re['fecha_fin']);
             }
             if (isset($re['fecha_fin'])) {
                 $this->setFechaFin($re['fecha_fin']);
             }
-            else {
-                $this->setFechaFin();
-            }
             if (isset($re['fecha_implementacion'])) {
                 $this->setFechaImplementacion($re['fecha_implementacion']);
             }
             if (isset($re['fecha_implementacion'])) {
                 $this->setFechaImplementacion($re['fecha_implementacion']);
             }
-            else {
-                $this->setFechaImplementacion();
-            }
             if (isset($re['contacto'])) {
                 $this->setContacto($re['contacto']);
             }
             if (isset($re['contacto'])) {
                 $this->setContacto($re['contacto']);
             }
-            else {
-                $this->setContacto();
-            }
             if (isset($re['responsable'])) {
                 $this->setResponsable($re['responsable']);
             }
             if (isset($re['responsable'])) {
                 $this->setResponsable($re['responsable']);
             }
-            else {
-                $this->setResponsable();
+            if (isset($re['estado'])) {
+                $this->setEstado($re['estado']);
             }
         }
         $tmp = $sql['obtener_permisos'];
             }
         }
         $tmp = $sql['obtener_permisos'];
@@ -930,15 +933,16 @@ class SAMURAI_Sistema {
      * Devuelve el array de sistemas
      *
      * @param  SAMURAI_DB &$db Base de Datos
      * Devuelve el array de sistemas
      *
      * @param  SAMURAI_DB &$db Base de Datos
+     * @param  bool $activos Indica si se deben buscar solamente los sistemas activos
      *
      * @return array(Sistema)
      * @access public
      * @static
      */
      *
      * @return array(Sistema)
      * @access public
      * @static
      */
-    function getSistemas(&$db) // ~X2C
+    function getSistemas(&$db, $activos = true) // ~X2C
     {
         $rta = array ();
     {
         $rta = array ();
-        foreach (SAMURAI_Sistema::_getIdSistemas($db) as $id) {
+        foreach (SAMURAI_Sistema::_getIdSistemas($db, $activos) as $id) {
             $tmp = new SAMURAI_Sistema($db,$id);
             array_push($rta, $tmp);
         }
             $tmp = new SAMURAI_Sistema($db,$id);
             array_push($rta, $tmp);
         }
@@ -951,17 +955,23 @@ class SAMURAI_Sistema {
      * Devuleve un array con los identificadores de todos los sistemas.
      *
      * @param  SAMURAI_DB &$db Base de Datos
      * Devuleve un array con los identificadores de todos los sistemas.
      *
      * @param  SAMURAI_DB &$db Base de Datos
+     * @param  bool $activos Indica si se deben buscar solamente los sistemas activos
      *
      * @return array(int)
      * @access protected
      * @static
      */
      *
      * @return array(int)
      * @access protected
      * @static
      */
-    function _getIdSistemas(&$db) // ~X2C
+    function _getIdSistemas(&$db, $activos = true) // ~X2C
     {
         //OBTENGO LOS ID DE LA BASE
         $rta = array();
         $sql = parse_ini_file(dirname(__FILE__) . '/Sistema/consultas.ini', true);
     {
         //OBTENGO LOS ID DE LA BASE
         $rta = array();
         $sql = parse_ini_file(dirname(__FILE__) . '/Sistema/consultas.ini', true);
-        $dbh = $db->prepare($sql['obtener_datos_sistema'].$sql['obtener_datos_sistema3'].$sql['obtener_datos_sistema4']);
+        $consulta = $sql['obtener_datos_sistema']; 
+        if (@$activos) {
+            $consulta.= $sql['obtener_datos_sistema3'];
+        }
+        $consulta.= $sql['obtener_datos_sistema4'];
+        $dbh = $db->prepare($consulta);
         $res = $db->execute($dbh);
         while ($re = $res->fetchrow(DB_FETCHMODE_ASSOC)) {
             array_push($rta,$re['id_sistema']);
         $res = $db->execute($dbh);
         while ($re = $res->fetchrow(DB_FETCHMODE_ASSOC)) {
             array_push($rta,$re['id_sistema']);
@@ -976,15 +986,16 @@ class SAMURAI_Sistema {
      * Devuelve un array asociativo en donde la clave es el identificador y el valor es el nombre del sistema
      *
      * @param  SAMURAI_DB &$db Base de Datos
      * Devuelve un array asociativo en donde la clave es el identificador y el valor es el nombre del sistema
      *
      * @param  SAMURAI_DB &$db Base de Datos
+     * @param  bool $activos Indica si se deben buscar solamente los sistemas activos
      *
      * @return array()
      * @access public
      * @static
      */
      *
      * @return array()
      * @access public
      * @static
      */
-    function getArraySistemas(&$db) // ~X2C
+    function getArraySistemas(&$db, $activos = true) // ~X2C
     {
         $rta = array ();
     {
         $rta = array ();
-        foreach (SAMURAI_Sistema::getSistemas($db) as $sistema) {
+        foreach (SAMURAI_Sistema::getSistemas($db, $activos) as $sistema) {
             $rta[$sistema->getId()] = $sistema->getNombre();
         }
         return $rta;
             $rta[$sistema->getId()] = $sistema->getNombre();
         }
         return $rta;
index 012b672fe6c399835f5940f0f7696d8ab8f4e77e..d6345cd161650fdd727a41f7deb1fa54cdaa9976 100644 (file)
@@ -1,7 +1,7 @@
 ; Configuración de la base de datos.
 ; $Id$
 
 ; Configuración de la base de datos.
 ; $Id$
 
-obtener_datos_sistema   = " SELECT s.id_sistema as id_sistema, s.nombre_sistema as nombre_sistema, s.desc_sistema as desc_sistema, s.fecha_inicio as fecha_inicio, s.fecha_fin as fecha_fin, s.fecha_implementacion as fecha_implementacion, s.contacto as contacto, s.responsable as responsable FROM samurai.sistema as s "
+obtener_datos_sistema   = " SELECT s.id_sistema as id_sistema, s.nombre_sistema as nombre_sistema, s.desc_sistema as desc_sistema, s.fecha_inicio as fecha_inicio, s.fecha_fin as fecha_fin, s.fecha_implementacion as fecha_implementacion, s.contacto as contacto, s.responsable as responsable, s.estado as estado FROM samurai.sistema as s "
 obtener_datos_sistema2  = " WHERE s.id_sistema = ? "
 obtener_datos_sistema3  = " WHERE s.estado = 1"
 obtener_datos_sistema4  = " ORDER BY s.nombre_sistema"
 obtener_datos_sistema2  = " WHERE s.id_sistema = ? "
 obtener_datos_sistema3  = " WHERE s.estado = 1"
 obtener_datos_sistema4  = " ORDER BY s.nombre_sistema"
index d629eeab0006c5cc5f0943ca522d73385eafd98a..91ce6c50a102ffb6ca19f37fa093cda509bd1ee8 100644 (file)
@@ -487,4 +487,4 @@ class SAMURAI_Usuario {
     // -X2C
 
 } // -X2C Class :SAMURAI_Usuario
     // -X2C
 
 } // -X2C Class :SAMURAI_Usuario
-?>
+?>
\ No newline at end of file
index 6d056169e5fe38dbc64c935b6899ef8cd779cd67..8412fef595941ddc376b9b878b5615c97a7cbb17 100644 (file)
@@ -27,7 +27,7 @@
 //SAMURAI {{{
         'titulo_sistema'    => 'SAMURAI',
         'pie_sistema'       => 'Samurai',
 //SAMURAI {{{
         'titulo_sistema'    => 'SAMURAI',
         'pie_sistema'       => 'Samurai',
-        'id_sistema'        => '44',
+        'id_sistema'        => SAMURAI_PERM,
 //}}}
 //DIRECTORIOS {{{
         //Directorios web del sistema, salvo el root, todos son opcionales
 //}}}
 //DIRECTORIOS {{{
         //Directorios web del sistema, salvo el root, todos son opcionales
             'tipoMenu'      => 'oculto',    
             'permisos'      => array (SAMURAI_PERM_DEVELOPER),
             'hijos'         => array (       
             'tipoMenu'      => 'oculto',    
             'permisos'      => array (SAMURAI_PERM_DEVELOPER),
             'hijos'         => array (       
-                                    array ( 'nombre'        => 'Definicion de Constantes',   
-                                            'link'          => 'consultas/php-constantes',  
+                                    array ( 'nombre'   => 'Definicion de Constantes',   
+                                            'link'     => 'consultas/php-constantes',  
                                     ),
                                     ),
+                                    array ( 'nombre'   => 'Sistemas',   
+                                            'link'     => 'consultas/sistemas',  
+                                    ),
+                                    array ( 'nombre'   => 'Ver Informacion Usuarios',   
+                                            'link'     => 'consultas/info-usuarios',  
+                                    ),
+
                                ),
         ),
         //}}}
                                ),
         ),
         //}}}
index 4d2cfab1afb58d185138ed3edc02b32e12abcb97..e6baaaf388c813d989ac867007ac599040e58e9a 100644 (file)
@@ -29,14 +29,29 @@ $SAMURAI_PERM->chequear(SAMURAI_PERM_DEVELOPER);
     }
     // }}}  
 //REQUIRE ONCE {{{
     }
     // }}}  
 //REQUIRE ONCE {{{
+    require_once 'MECON/HTML/Tabla.php';
     require_once 'MECON/HTML/Link.php';
     require_once 'MECON/HTML/Link.php';
+    require_once 'MECON/HTML/Image.php';
 // }}}
 //CREO LOS OBJETOS NECESARIOS {{{
 // }}}
 //CREO LOS OBJETOS NECESARIOS {{{
-    $LINK_PHP_CONSTANTES = new MECON_HTML_Link ('php-constantes',
+    $TABLA =& new MECON_HTML_Tabla ('width="500"', 'claro');
+    $LINK_PHP_CONSTANTES =& new MECON_HTML_Link ('php-constantes',
             'Bajar la definicion de constantes de un sistema.');
             'Bajar la definicion de constantes de un sistema.');
+    $LINK_INFO_SISTEMAS =& new MECON_HTML_Link('sistemas', 'Ver informacion
+            de los sistemas.', array('accion'=>'info_listado'));
+    $LINK_ACTIVAR_SISTEMAS =& new MECON_HTML_Link('sistemas', 'Activar
+            Sistemas.', array('accion'=>'activar_sistema'));
+    $LINK_INFO_USUARIOS =& new MECON_HTML_Link('info-usuarios', 'Ver informacion
+            de los usuarios.');
 //}}}    
 //}}}    
+//AGREGO LA INFO A LAS TABLAS {{{
+    $TABLA->addRow(array($LINK_PHP_CONSTANTES->toHtml()), 'align="center"');
+    $TABLA->addRow(array($LINK_INFO_SISTEMAS->toHtml()) , 'align="center"');
+    $TABLA->addRow(array($LINK_ACTIVAR_SISTEMAS->toHtml()) , 'align="center"');
+    $TABLA->addRow(array($LINK_INFO_USUARIOS->toHtml()) , 'align="center"');
+//}}}
 //DIBUJO LA PAGINA {{{
 //DIBUJO LA PAGINA {{{
-    $MARCO->addBodyContent($LINK_PHP_CONSTANTES);
+    $MARCO->addBodyContent($TABLA);
     $MARCO->display();
 // }}}
 //FIN
     $MARCO->display();
 // }}}
 //FIN
index 350a3cdab6d9c15c72135dc38aeb4dd391be12d9..f155e49102ab304c0be13df0627be7f57df455fc 100644 (file)
@@ -21,7 +21,7 @@
 // 
 
 //VERIFICO SI SE TIENE ACCESO A LA PAGINA{{{
 // 
 
 //VERIFICO SI SE TIENE ACCESO A LA PAGINA{{{
-$SAMURAI_PERM->chequear(SAMURAI_DEVELOPER);
+$SAMURAI_PERM->chequear(SAMURAI_PERM_DEVELOPER);
 //}}}
 //REQUIRE ONCE {{{
     require_once 'MECON/HTML/QuickForm.php';
 //}}}
 //REQUIRE ONCE {{{
     require_once 'MECON/HTML/QuickForm.php';
diff --git a/sistema/www/consultas/sistemas.php b/sistema/www/consultas/sistemas.php
new file mode 100644 (file)
index 0000000..e3ecfdd
--- /dev/null
@@ -0,0 +1,279 @@
+<?php
+// vim: set expandtab tabstop=4 softtabstop=4 shiftwidth=4 foldmethod=marker:
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Created: mié oct  1 15:17:35 ART 2003
+// | Author:  Martin Marrese <mmarre@mecon.gov.ar>
+// +----------------------------------------------------------------------+
+//
+// $Id$
+// 
+
+//Require_once {{{
+    //PEAR{{{
+    require_once 'HTML/Table.php';
+    //}}}
+    //Mecon {{{
+    require_once 'MECON/HTML/Tabla.php';
+    require_once 'MECON/HTML/Image.php';
+    require_once 'MECON/HTML/Link.php';
+    //}}}
+    //Samurai {{{
+    require_once 'SAMURAI/Sistema.php';
+    require_once 'SAMURAI/Usuario.php';
+    require_once 'SAMURAI/Perfil.php';
+    require_once 'SAMURAI/Permiso.php';
+    //}}}
+//}}}
+
+//Verifico si se tiene acceso a la pagina {{{
+    $SAMURAI_PERM->chequear(SAMURAI_PERM_DEVELOPER);
+//}}}
+
+//Obtengo la accion y el id del sistema {{{
+    $accion    = (@$_REQUEST['accion'])    ? $_REQUEST['accion']    : 'listado';
+    $subaccion = (@$_REQUEST['subaccion']) ? $_REQUEST['subaccion'] : null;
+    $id_sist   = (@$_REQUEST['id_sist'])   ? $_REQUEST['id_sist']   : null; 
+//}}}
+
+//Creo la tabla volver {{{
+    $T_VOLVER     =& new HTML_Table('width="760"');
+    $IMG_VOLVER   =& new MECON_HTML_Image('/MECON/images/general_anterior.gif');
+    $LINK_VOLVER  =& new MECON_HTML_Link('', $IMG_VOLVER);
+//}}}
+    
+//ESTADISTICAS_SISTEMAS = LISTADO DE SISTEMAS {{{
+if (@!$accion || $accion == 'info_listado') {
+    //Creo los objetos necesarios {{{
+        $T_SISTEMAS =& new MECON_HTML_Tabla();
+        $IMG_ACTIVO  =& new MECON_HTML_Image('/MECON/images/general_tilde_azul.gif');
+        $IMG_NACTIVO =& new MECON_HTML_Image('/MECON/images/general_cruz_roja.gif');
+        $LINK_SEL =& new MECON_HTML_Link('sistemas');
+    //}}}
+    
+    //Obtengo la lista de sistemas (habilitados y no habilitados) {{{
+        $sistemas = SAMURAI_Sistema::getSistemas($DB, false);
+    //}}}
+        
+    //Agrego la informacion a la tabla de sistemas {{{
+        $T_SISTEMAS->addRow(array('Listado de Sistemas'), 'cabecera
+                colspan="4"');
+        $T_SISTEMAS->addRow(array('Id', 'Nombre', 'Descripcion', 'Activo'), 
+                'titulo');
+        //Agrego la info de los sistemas
+        foreach ($sistemas as $sistema) {
+            $LINK_SEL->setContents(($sistema->getEstado()) ? $IMG_ACTIVO : $IMG_NACTIVO);
+            $LINK_SEL->setGetVars(
+                        array(
+                            'accion'  => 'info_informacion',
+                            'id_sist' => $sistema->getId(),
+                        )
+                       );
+            $row = array (  $sistema->getId(),
+                            $sistema->getNombre(),
+                            $sistema->getDescripcion(),
+                            $LINK_SEL->toHtml()
+                    );
+            $T_SISTEMAS->addRow($row);
+        } 
+        $T_SISTEMAS->updateColAttributes(0, 'width="5%" align="center"');
+        $T_SISTEMAS->updateColAttributes(1, 'width="20%" align="center"');
+        $T_SISTEMAS->updateColAttributes(3, 'width="5%" align="center"');
+        $T_SISTEMAS->updateRowAttributes(0, 'align="left"');
+    //}}}
+    
+    //Agrego la informacion al marco {{{
+        $LINK_VOLVER->setHref('consultas');
+        $MARCO->addBodyContent($T_SISTEMAS);
+        $MARCO->addTitle('Estadisticas de Sistemas');
+        $MARCO->addBodyContent('<BR>');
+        $T_VOLVER->addRow(array($LINK_VOLVER->toHtml()), 'align="left"');
+        $MARCO->addBodyContent($T_VOLVER);
+  //}}}
+}
+//}}}
+
+//ESTADISTICAS_SISTEMAS = INFORMACION DE UN SISTEMA {{{
+elseif (@!$accion || $accion == 'info_informacion') {
+    //Creo los objetos necesarios {{{
+        $T_SISTEMA  =& new MECON_HTML_Tabla();
+        $T_SISTEMA2 =& new MECON_HTML_Tabla();
+        $T_EST =& new MECON_HTML_Tabla('width="300"');
+        $SISTEMA =& new SAMURAI_Sistema($DB, $id_sist);
+        $IMG_ACTIVO  =& new MECON_HTML_Image('/MECON/images/general_tilde_azul.gif');
+        $IMG_NACTIVO =& new MECON_HTML_Image('/MECON/images/general_cruz_roja.gif');
+        $IMG_SEP =& new MECON_HTML_Image('../images/linea_separacion.gif');
+        
+        $LINK_USUARIOS =& new MECON_HTML_Link('sistemas', '', array('accion' =>
+                    'info_informacion', 'subaccion' => 'info_usuarios',
+                    'id_sist' => $id_sist));
+        $LINK_PERFILES =& new MECON_HTML_Link('sistemas', '', array('accion' =>
+                    'info_informacion', 'subaccion' => 'info_perfiles',
+                    'id_sist' => $id_sist));
+        $LINK_PERMISOS =& new MECON_HTML_Link('sistemas', '', array('accion' =>
+                    'info_informacion', 'subaccion' => 'info_permisos',
+                    'id_sist' => $id_sist));
+    //}}}
+
+    //Agrego la informacion del sistema seleccionado {{{
+        $T_SISTEMA->addRow(array('Datos del Sistema Seleccionado'),'cabecera
+                colspan="4"');
+        $T_SISTEMA->addRow(array('Id', 'Nombre', 'Descripcion', 'Activo'), 
+                'titulo');
+        $T_SISTEMA->addRow(array(
+                            $SISTEMA->getId(),
+                            $SISTEMA->getNombre(),
+                            $SISTEMA->getDescripcion(),
+                           ($SISTEMA->getEstado()) ? $IMG_ACTIVO : $IMG_NACTIVO,
+                           )
+                    );
+        $T_SISTEMA->updateColAttributes(0, 'width="5%" align="center"');
+        $T_SISTEMA->updateColAttributes(1, 'width="20%" align="center"');
+        $T_SISTEMA->updateColAttributes(3, 'width="5%" align="center"');
+        $T_SISTEMA->updateRowAttributes(0, 'align="left"');
+
+        $fch_ini =& $SISTEMA->getFechaInicio();
+        $fch_fin =& $SISTEMA->getFechaFin();
+        $fch_imp =& $SISTEMA->getFechaImplementacion();
+        
+        $T_SISTEMA2->addRow(array('Fecha Inicio', 'Fecha Fin', ' Fecha
+                    Imp', 'Contacto'), 'titulo');
+        $T_SISTEMA2->addRow(array(
+                                ($fch_ini) ? $fch_ini->format("%d-%m-%Y") : '--',
+                                ($fch_fin) ? $fch_fin->format("%d-%m-%Y") : '--',
+                                ($fch_imp) ? $fch_imp->format("%d-%m-%Y") : '--',
+                                $SISTEMA->getContacto()
+                            )
+                           );
+        $T_SISTEMA2->updateColAttributes(0, 'width="15%" align="center"');
+        $T_SISTEMA2->updateColAttributes(1, 'width="15%" align="center"');
+        $T_SISTEMA2->updateColAttributes(2, 'width="15%" align="center"');
+    //}}}
+
+    //Obtengo la info necesaria {{{
+        $usuarios = SAMURAI_Usuario::_getLoginUsuarios($DB, $id_sist);
+        $perfiles = SAMURAI_Perfil::_getIdPerfiles($DB, null, $id_sist);
+        $permisos = SAMURAI_Permiso::_getIdPermisos($DB, $id_sist);
+    //}}}
+        
+    //Agrego la informacion {{{
+        $T_EST->addRow(array('Estadisticas'), 'cabecera colspan="3"');
+        $T_EST->addRow(array('Usuarios', 'Perfiles', 'Permisos'), 'titulo');
+        $T_EST->updateColAttributes(0, 'width="33%" align="center"');
+        $T_EST->updateColAttributes(1, 'width="33%" align="center"');
+        $T_EST->updateColAttributes(2, 'width="33%" align="center"');
+
+        if (count($usuarios)) {
+            $LINK_USUARIOS->setContents(count($usuarios));
+        }
+        else {
+            $LINK_USUARIOS->setContents('0');
+            $LINK_USUARIOS->setGetVars(array());
+            $LINK_USUARIOS->setHref('#');
+        }
+        if (count($perfiles)) {
+            $LINK_PERFILES->setContents(count($perfiles));
+        }
+        else {
+            $LINK_PERFILES->setContents('0');
+            $LINK_PERFILES->setGetVars(array());
+            $LINK_PERFILES->setHref('#');
+        }
+        if (count($permisos)) {
+            $LINK_PERMISOS->setContents(count($permisos));
+        }
+        else {
+            $LINK_PERMISOS->setContents('0');
+            $LINK_PERMISOS->setHref('#');
+            $LINK_PERMISOS->setGetVars(array());
+        }
+        
+
+        
+        $T_EST->addRow(array(
+                        $LINK_USUARIOS->toHtml(),
+                        $LINK_PERFILES->toHtml(),
+                        $LINK_PERMISOS->toHtml(),
+                       )
+                      );
+    //}}}
+    
+    //Actuo segun la subaccion {{{
+        if (@$subaccion == 'info_usuarios') {
+            $T_SUBACCION =& new MECON_HTML_Tabla();
+            
+            $usu = SAMURAI_Usuario::getUsuarios($DB, $id_sist);
+            $T_SUBACCION->addRow(array('Datos de los Usuarios'), 'colspan="2"
+                    cabecera');
+            $T_SUBACCION->addRow(array('Login', 'Nombre'), 'titulo');
+            foreach ($usu as $u) {
+                $T_SUBACCION->addRow(array($u->getLogin(), $u->getNombre()));
+            }
+            
+            $T_SUBACCION->updateRowAttributes(0, 'align="left"');
+        }
+        elseif (@$subaccion == 'info_perfiles') {
+            $T_SUBACCION =& new MECON_HTML_Tabla();
+            
+            $usu = SAMURAI_Perfil::getPerfiles($DB, '', $id_sist);
+            $T_SUBACCION->addRow(array('Datos de los Perfiles'), 'colspan="2"
+                    cabecera');
+            $T_SUBACCION->addRow(array('Id', 'Descripcion'), 'titulo');
+            foreach ($usu as $u) {
+                $T_SUBACCION->addRow(array($u->getId(), $u->getDescripcion()));
+            }
+            
+            $T_SUBACCION->updateRowAttributes(0, 'align="left"');
+        }
+        elseif (@$subaccion == 'info_permisos') {
+            $T_SUBACCION =& new MECON_HTML_Tabla();
+            
+            $T_SUBACCION->addRow(array('Datos de los Permisos'), 'colspan="3"
+                    cabecera');
+            $T_SUBACCION->addRow(array('Id', 'Descripcion', 'Observacion'), 'titulo');
+            foreach ($SISTEMA->getAsociaciones() as $asoc) {
+                $T_SUBACCION->addRow(array($asoc['id'], $asoc['desc'],
+                            $asoc['obs']));
+            }
+            $T_SUBACCION->updateRowAttributes(0, 'align="left"');
+        }
+    //}}}
+        
+    //Agrego la informacion al marco {{{
+        $LINK_VOLVER->setHref('sistemas');
+        $LINK_VOLVER->setGetVars(array('accion' => 'info_listado'));
+        $MARCO->addBodyContent($T_SISTEMA);
+        $MARCO->addBodyContent($T_SISTEMA2);
+        $MARCO->addBodyContent($IMG_SEP);
+        $MARCO->addBodyContent($T_EST);
+
+        if (@$subaccion) {
+            $MARCO->addBodyContent($IMG_SEP);
+            $MARCO->addBodyContent($T_SUBACCION);
+        }
+        
+        $MARCO->addTitle('Estadisticas de Sistemas');
+        $MARCO->addBodyContent('<BR>');
+        $T_VOLVER->addRow(array($LINK_VOLVER->toHtml()), 'align="left"');
+        $MARCO->addBodyContent($T_VOLVER);
+    //}}}
+}
+//}}}
+
+//MUESTRO LA INFORMACION {{{
+    $MARCO->display();
+    exit;
+//}}}
+
+?>
diff --git a/sistema/www/images/linea_separacion.gif b/sistema/www/images/linea_separacion.gif
new file mode 100644 (file)
index 0000000..2d57392
Binary files /dev/null and b/sistema/www/images/linea_separacion.gif differ
index 36e9f28c3a23b700f7b8fb7adb4e96a1c4a62746..6a3e77691d1be64e7bbffcca5a079cd8106d15aa 100644 (file)
@@ -28,6 +28,8 @@
 
 //CREO LOS OBJETOS NECESARIOS {{{
     $FORM     = new MECON_HTML_QuickForm ('sel_sistema','post','sel-sistema');
 
 //CREO LOS OBJETOS NECESARIOS {{{
     $FORM     = new MECON_HTML_QuickForm ('sel_sistema','post','sel-sistema');
+    $TABLAFORM =& new MECON_HTML_Tabla ('width="400"', 'comun');
+    $FORM->renderer->setTable($TABLAFORM);
     $SISTEMAS = SAMURAI_Sistema::getArraySistemas($DB);
 // }}}
 //AGREGO LOS ELEMENTOS DEL FORM {{{
     $SISTEMAS = SAMURAI_Sistema::getArraySistemas($DB);
 // }}}
 //AGREGO LOS ELEMENTOS DEL FORM {{{