Author: ftoledo Date: 2007-04-25 13:11:58 -0300 (Wed, 25 Apr 2007) New Revision: 4573 Added: prosistem/alba/trunk/alba/.htaccess.dist Removed: prosistem/alba/trunk/alba/.htaccess Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php prosistem/alba/trunk/alba/doc/DER.xmi Log: + leyenda de ciclo lectivo en el layout + agregando mas tablas al der + cambiando el htaccess para que sea opcional Deleted: prosistem/alba/trunk/alba/.htaccess =================================================================== --- prosistem/alba/trunk/alba/.htaccess 2007-04-25 16:07:13 UTC (rev 4572) +++ prosistem/alba/trunk/alba/.htaccess 2007-04-25 16:11:58 UTC (rev 4573) @@ -1,2 +0,0 @@ -order allow,deny -deny from all \ No newline at end of file Copied: prosistem/alba/trunk/alba/.htaccess.dist (from rev 4572, prosistem/alba/trunk/alba/.htaccess) Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-04-25 16:07:13 UTC (rev 4572) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-04-25 16:11:58 UTC (rev 4573) @@ -138,7 +138,7 @@ <?php if ($sf_user->isAuthenticated() && $sf_user->getAttribute('fk_ciclolectivo_id') == 0):?> <div class="form-errors"> <ul> - <li>No tiene un ciclo léctivo seleccionado. Éste valor es requerido para algunos módulos, por favor seleccione o ingrese uno <a href="ciclolectivo/list">aquí</a>. + <li>No tiene un ciclo lectivo seleccionado. Éste valor es requerido para algunos módulos, por favor seleccione o ingrese uno <?php echo link_to('aquí','ciclolectivo/list')?>. </li> </ul> </div> Modified: prosistem/alba/trunk/alba/doc/DER.xmi =================================================================== --- prosistem/alba/trunk/alba/doc/DER.xmi 2007-04-25 16:07:13 UTC (rev 4572) +++ prosistem/alba/trunk/alba/doc/DER.xmi 2007-04-25 16:11:58 UTC (rev 4573) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2007-01-24T17:21:15" xmi.version="1.2" > +<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2007-01-31T16:15:23" xmi.version="1.2" > <XMI.header> <XMI.documentation> <XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter> @@ -12,6 +12,9 @@ <UML:Model isSpecification="false" isLeaf="false" isRoot="false" xmi.id="m1" isAbstract="false" name="Modelo UML" > <UML:Namespace.ownedElement> <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> + <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> + <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> + <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2" isRoot="false" isAbstract="false" name="folder" /> <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="2211" isRoot="false" isAbstract="false" name="datatype" /> <UML:Model stereotype="2" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="1" isRoot="false" isAbstract="false" name="Logical View" > <UML:Namespace.ownedElement> @@ -385,6 +388,11 @@ <UML:EntityAttribute attributes="" values="255" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2481" auto_increment="0" xmi.id="2486" isRoot="false" initialValue="" type="2441" isAbstract="false" name="descripcion" /> <UML:EntityAttribute attributes="" values="1" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2481" auto_increment="0" xmi.id="2487" isRoot="false" initialValue="" type="2442" isAbstract="false" name="actual" /> </UML:Entity> + <UML:Entity isSpecification="false" isLeaf="false" visibility="public" namespace="6" xmi.id="2494" isRoot="false" isAbstract="false" name="relAlumnoDivision" > + <UML:EntityAttribute attributes="" values="" dbindex_type="1101" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2494" auto_increment="1" xmi.id="2495" isRoot="false" initialValue="" type="2210" isAbstract="false" name="id" /> + <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2494" auto_increment="0" xmi.id="2496" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_division_id" /> + <UML:EntityAttribute attributes="" values="" dbindex_type="1100" isSpecification="false" allow_null="0" isLeaf="false" visibility="private" namespace="2494" auto_increment="0" xmi.id="2497" isRoot="false" initialValue="" type="2210" isAbstract="false" name="fk_alumno_id" /> + </UML:Entity> <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2469" name="" > <UML:Association.connection> <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2470" aggregation="none" type="2465" name="" /> @@ -409,10 +417,16 @@ <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2493" aggregation="none" type="2475" name="" /> </UML:Association.connection> </UML:Association> + <UML:Association isSpecification="false" visibility="public" namespace="6" xmi.id="2498" name="" > + <UML:Association.connection> + <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2499" aggregation="none" type="2494" name="" /> + <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="2500" aggregation="none" type="2439" name="" /> + </UML:Association.connection> + </UML:Association> </UML:Namespace.ownedElement> <XMI.extension xmi.extender="umbrello" > <diagrams> - <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1369" snapy="10" showatts="1" xmi.id="2219" documentation="" type="9" showops="1" showpackage="0" name="DER - Alba" localid="900000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1318" > + <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1396" snapy="10" showatts="1" xmi.id="2219" documentation="" type="9" showops="1" showpackage="0" name="DER - Alba" localid="900000" showstereotype="0" showscope="1" snapcsgrid="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="1318" > <widgets> <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="597" y="358" linewidth="none" fillcolour="#ffffc0" height="270" usefillcolor="1" isinstance="0" xmi.id="2220" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="132" usesdiagramusefillcolour="0" x="965" y="277" linewidth="none" fillcolour="#ffffc0" height="144" usefillcolor="1" isinstance="0" xmi.id="2221" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> @@ -433,10 +447,11 @@ <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="845" y="1224" linewidth="none" fillcolour="#ffffc0" height="90" usefillcolor="1" isinstance="0" xmi.id="2236" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="82" usesdiagramusefillcolour="0" x="572" y="121" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2237" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> <entitywidget usesdiagramfillcolour="0" width="148" usesdiagramusefillcolour="0" x="961" y="703" linewidth="none" fillcolour="#ffffc0" height="234" usefillcolor="1" isinstance="0" xmi.id="2238" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" /> - <entitywidget usesdiagramfillcolour="1" width="87" usesdiagramusefillcolour="1" x="228" y="799" linewidth="none" fillcolour="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2439" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="1" width="87" usesdiagramusefillcolour="1" x="196" y="738" linewidth="none" fillcolour="none" height="90" usefillcolor="1" isinstance="0" xmi.id="2439" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="65" y="593" linewidth="none" fillcolour="none" height="72" usefillcolor="1" isinstance="0" xmi.id="2465" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> - <entitywidget usesdiagramfillcolour="1" width="115" usesdiagramusefillcolour="1" x="242" y="946" linewidth="none" fillcolour="none" height="108" usefillcolor="1" isinstance="0" xmi.id="2475" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="1" width="115" usesdiagramusefillcolour="1" x="191" y="887" linewidth="none" fillcolour="none" height="108" usefillcolor="1" isinstance="0" xmi.id="2475" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> <entitywidget usesdiagramfillcolour="1" width="148" usesdiagramusefillcolour="1" x="6" y="916" linewidth="none" fillcolour="none" height="126" usefillcolor="1" isinstance="0" xmi.id="2481" showstereotype="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" /> + <entitywidget usesdiagramfillcolour="0" width="146" usesdiagramusefillcolour="0" x="356" y="832" linewidth="none" fillcolour="#ffffc0" height="72" usefillcolor="1" isinstance="0" xmi.id="2494" showstereotype="1" font="Sans Serif,10,-1,0,75,1,0,0,0,0" linecolor="#ff0000" /> </widgets> <messages/> <associations> @@ -569,22 +584,28 @@ </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2465" widgetaid="2439" xmi.id="2472" linecolor="none" > <linepath> - <startpoint startx="271" starty="799" /> + <startpoint startx="239" starty="738" /> <endpoint endx="139" endy="665" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2439" widgetaid="2475" xmi.id="2488" linecolor="none" > <linepath> - <startpoint startx="299" starty="946" /> - <endpoint endx="271" endy="889" /> + <startpoint startx="248" starty="887" /> + <endpoint endx="239" endy="828" /> </linepath> </assocwidget> <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2475" widgetaid="2481" xmi.id="2491" linecolor="none" > <linepath> <startpoint startx="154" starty="979" /> - <endpoint endx="242" endy="1000" /> + <endpoint endx="191" endy="941" /> </linepath> </assocwidget> + <assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="2439" widgetaid="2494" xmi.id="2498" linecolor="none" > + <linepath> + <startpoint startx="356" starty="868" /> + <endpoint endx="283" endy="783" /> + </linepath> + </assocwidget> </associations> </diagram> </diagrams> @@ -594,7 +615,7 @@ </UML:Model> </XMI.content> <XMI.extensions xmi.extender="umbrello" > - <docsettings viewid="2219" documentation="" uniqueid="2493" /> + <docsettings viewid="2219" documentation="" uniqueid="2500" /> <listview> <listitem open="1" type="800" label="Vistas" > <listitem open="1" type="801" id="1" > @@ -756,6 +777,11 @@ <listitem open="0" type="833" id="2345" /> <listitem open="0" type="833" id="2346" /> </listitem> + <listitem open="1" type="832" id="2494" > + <listitem open="0" type="833" id="2495" /> + <listitem open="0" type="833" id="2496" /> + <listitem open="0" type="833" id="2497" /> + </listitem> <listitem open="0" type="832" id="2231" > <listitem open="0" type="833" id="2354" /> <listitem open="0" type="833" id="2355" />