- Alba-desarrollo - lists.ourproject.org

SVN Alba r4148 - in prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision: . validate
by commits＠pressenter.com.ar 02 Feb '07

02 Feb '07

Author: ftoledo Date: 2007-02-02 11:23:03 -0300 (Fri, 02 Feb 2007) New Revision: 4148 Added: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/validate/ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/validate/edit.yml Log: validacion en la relacion alumno division Added: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/validate/edit.yml 2007-02-02 13:46:57 UTC (rev 4147) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/validate/edit.yml 2007-02-02 14:23:03 UTC (rev 4148) @@ -0,0 +1,22 @@ +methods: + post: + - "rel_alumno_division{fk_alumno_id}" + - "rel_alumno_division{fk_division_id}" + +fillin: + enabled: on + +names: + rel_alumno_division{fk_alumno_id}: + required: Yes + required_msg: El campo alumno es obligatorio + validators: IdValido + rel_alumno_division{fk_division_id}: + required: Yes + required_msg: El campo división es obligatorio + validators: IdValido +IdValido: + class: sfNumberValidator + param: + nan_error: Seleccione una de las opciones + Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/validate/edit.yml ___________________________________________________________________ Name: svn:keywords + Id Date Author Rev URL

1 0

SVN Alba r4147 - in prosistem/alba/trunk: alba/apps/principal/config dist/symfony-0.6.3/lib/vendor/creole
by commits＠pressenter.com.ar 02 Feb '07

02 Feb '07

Author: josx Date: 2007-02-02 10:46:57 -0300 (Fri, 02 Feb 2007) New Revision: 4147 Modified: prosistem/alba/trunk/alba/apps/principal/config/settings.yml prosistem/alba/trunk/dist/symfony-0.6.3/lib/vendor/creole/CreoleTypes.php Log: Puse i18n en off en la parte de DEV, y on en PROD. Adem?\195?\131?\194?\161as arregle un problema del Creole. Modified: prosistem/alba/trunk/alba/apps/principal/config/settings.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/config/settings.yml 2007-01-31 20:21:51 UTC (rev 4146) +++ prosistem/alba/trunk/alba/apps/principal/config/settings.yml 2007-02-02 13:46:57 UTC (rev 4147) @@ -1,6 +1,7 @@ prod: .settings: no_script_name: on + i18n: on dev: .settings: @@ -11,6 +12,7 @@ stats: off no_script_name: off etag: off + i18n: off test: .settings: @@ -58,7 +60,7 @@ # # tidy: on # - i18n: on +# i18n: off # # timeout (60 * 60 * 3Hs) timeout: 10800 Modified: prosistem/alba/trunk/dist/symfony-0.6.3/lib/vendor/creole/CreoleTypes.php =================================================================== --- prosistem/alba/trunk/dist/symfony-0.6.3/lib/vendor/creole/CreoleTypes.php 2007-01-31 20:21:51 UTC (rev 4146) +++ prosistem/alba/trunk/dist/symfony-0.6.3/lib/vendor/creole/CreoleTypes.php 2007-02-02 13:46:57 UTC (rev 4147) @@ -121,7 +121,13 @@ * @param string $nativeType DB native type (e.g. 'TEXT', 'byetea', etc.). * @return int Creole native type (e.g. Types::LONGVARCHAR, Types::BINARY, etc.). */ - abstract static function getType($nativeType); +# abstract static function getType($nativeType); + + public static function getType($nativeType) { + throw new Exception('This method must be overriden in subclasses!'); // abstract static not allowed since PHP 5.2 + } + + /** * This method will return a native type that corresponds to the specified @@ -130,8 +136,13 @@ * native type will be returned. * @return string Native type string. */ - abstract static function getNativeType($creoleType); - +# abstract static function getNativeType($creoleType); + + public static function getNativeType($creoleType) { + throw new Exception('This method must be overriden in subclasses!'); // abstract static not allowed since PHP 5.2 + } + + /** * Gets the "affix" to use for ResultSet::get*() and PreparedStatement::set*() methods. * <code>

1 0

SVN Alba r4146 - prosistem/alba/trunk/alba/apps/principal/modules/alumno/config
by commits＠pressenter.com.ar 31 Jan '07

31 Jan '07

Author: josx Date: 2007-01-31 17:21:51 -0300 (Wed, 31 Jan 2007) New Revision: 4146 Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml Log: Arregle un texto en alumno Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml 2007-01-31 20:17:59 UTC (rev 4145) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml 2007-01-31 20:21:51 UTC (rev 4146) @@ -4,7 +4,7 @@ model_class: Alumno theme: default fields: - nombre: { name: Nombre , params: size=64 } + nombre: { name: Nombres , params: size=64 } apellido: { name: Apellido , params: size=64} fk_provincia_id: { name: Provincia } fk_establecimiento_id: { name: Establecimiento } @@ -14,16 +14,16 @@ fecha_nacimiento: { name: Fecha Nacimiento} direccion: { name: Dirección , params: size=64} ciudad: { name: Ciudad, params: size=64 } - codio_postal: { name: CP, params: size=20} + codigo_postal: { name: CP, params: size=20} telefono: { name: Teléfono, params: size=20 } sexo: { name: Sexo } email: { name: Email , params: size=64 } nro_documento: { name: Nro. Documento, params: size=16 } - distancia_escuela: { name: Distancia a la escuela (cuadras) } - hermanos_escuela: { name: �h�ermanos en la escuela? } - hijo_maestro_escuela: { name: ¿Algunos de sus padres es Maestro? } - certificado_medico: { name: ¿trajo el certificado édico? } - activo: { name: ¿esta activo? } + distancia_escuela: { name: Distancia de la escuela (cuadras) } + hermanos_escuela: { name: ¿Hermanos en la escuela? } + hijo_maestro_escuela: { name: ¿Alguno de sus padres es Maestro? } + certificado_medico: { name: ¿Trajo el certificado médico? } + activo: { name: ¿Está activo? } nombre_apellido: { name: Nombre } division: { name: División }

1 0

Re: [Pressenter - SVN Alba] #84: Cambiar esquema al del PROPEL
by Pressenter - SVN Alba 31 Jan '07

31 Jan '07

#84: Cambiar esquema al del PROPEL ----------------------------+----------------------------------------------- Reporter: josx | Owner: josx Type: defecto | Status: closed Priority: normal | Milestone: version 1.0rc Component: alba-installer | Version: Severity: normal | Resolution: fixed Keywords: | ----------------------------+----------------------------------------------- Changes (by ftoledo): * milestone: => version 1.0rc -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/84#comment:2> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 0

Re: [Pressenter - SVN Alba] #84: Cambiar esquema al del PROPEL
by Pressenter - SVN Alba 31 Jan '07

31 Jan '07

#84: Cambiar esquema al del PROPEL ----------------------------+----------------------------------------------- Reporter: josx | Owner: josx Type: defecto | Status: closed Priority: normal | Milestone: Component: alba-installer | Version: Severity: normal | Resolution: fixed Keywords: | ----------------------------+----------------------------------------------- Changes (by ftoledo): * status: new => closed * resolution: => fixed -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/84#comment:1> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 0

SVN Alba r4145 - prosistem/alba/trunk/alba/apps/principal/modules/alumno/config
by commits＠pressenter.com.ar 31 Jan '07

31 Jan '07

Author: josx Date: 2007-01-31 17:17:59 -0300 (Wed, 31 Jan 2007) New Revision: 4145 Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml Log: Arregle un horror ortografico Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml 2007-01-31 20:10:12 UTC (rev 4144) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/config/generator.yml 2007-01-31 20:17:59 UTC (rev 4145) @@ -20,7 +20,7 @@ email: { name: Email , params: size=64 } nro_documento: { name: Nro. Documento, params: size=16 } distancia_escuela: { name: Distancia a la escuela (cuadras) } - hermanos_escuela: { name: ¿ermanos en la escuela? } + hermanos_escuela: { name: �h�ermanos en la escuela? } hijo_maestro_escuela: { name: ¿Algunos de sus padres es Maestro? } certificado_medico: { name: ¿trajo el certificado édico? } activo: { name: ¿esta activo? }

1 0

SVN Alba r4144 - in prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision: config templates
by commits＠pressenter.com.ar 31 Jan '07

31 Jan '07

Author: ftoledo Date: 2007-01-31 17:10:12 -0300 (Wed, 31 Jan 2007) New Revision: 4144 Added: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/security.yml Log: los alumnos y divisiones corresponden al cliclo y establecimiento actual Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/generator.yml 2007-01-31 19:12:30 UTC (rev 4143) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/generator.yml 2007-01-31 20:10:12 UTC (rev 4144) @@ -9,10 +9,7 @@ division: { name: División} edit: title: Asignar alumno a grado y sección - fields: - fk_alumno_id: { params: include_custom=>>Seleccione un Alumno<<} - fk_division_id: { params: include_custom=>>Seleccione una División<<} - display: [ fk_alumno_id, fk_division_id] + display: [ _fk_alumno_id, _fk_division_id] list: title: Listado de alumnos por grado y sección display: [ alumno, division ] Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/security.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/security.yml 2007-01-31 19:12:30 UTC (rev 4143) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/security.yml 2007-01-31 20:10:12 UTC (rev 4144) @@ -1,4 +1,3 @@ all: is_secure: on - credentials: relAlumnoDivision - \ No newline at end of file + credentials:[ division , alumno ] \ No newline at end of file Added: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php 2007-01-31 19:12:30 UTC (rev 4143) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php 2007-01-31 20:10:12 UTC (rev 4144) @@ -0,0 +1,13 @@ +<?php + $c = new Criteria(); + $c->add(AlumnoPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); + $c->addAscendingOrderByColumn(AlumnoPeer::APELLIDO); + $c->addAscendingOrderByColumn(AlumnoPeer::NOMBRE); + $alumnos = AlumnoPeer::doSelect($c); + $optionsAlumnos = array(); + $optionsAlumnos[""] = ">>Seleccione un Alumno<<"; + foreach ($alumnos as $alumno) { + $optionsAlumnos[$alumno->getId()] = $alumno->getApellido() . ", " . $alumno->getNombre(); + } + echo select_tag('rel_alumno_division[fk_alumno_id]', options_for_select($optionsAlumnos, $rel_alumno_division->getFkAlumnoId()) ) ; +?> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_alumno_id.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Added: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php 2007-01-31 19:12:30 UTC (rev 4143) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php 2007-01-31 20:10:12 UTC (rev 4144) @@ -0,0 +1,17 @@ +<?php + $c = new Criteria(); + $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); + $c->add(TurnosPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribute('fk_ciclolectivo_id')); + $c->addJoin(AnioPeer::ID,DivisionPeer::FK_ANIO_ID); + $c->addJoin(TurnosPeer::ID,DivisionPeer::FK_TURNOS_ID); + + //$c->addAscendingOrderByColumn(AlumnoPeer::APELLIDO); + //$c->addAscendingOrderByColumn(AlumnoPeer::NOMBRE); + $divisiones = DivisionPeer::doSelect($c); + $optionsDivisiones = array(); + $optionsDivisiones[""] = ">>Seleccione una División<<"; + foreach ($divisiones as $division) { + $optionsDivisiones[$division->getId()] = $division->getAnio()->getDescripcion(). " / " . $division->getDescripcion(); + } + echo select_tag('rel_alumno_division[fk_division_id]', options_for_select($optionsDivisiones, $rel_alumno_division->getFkDivisionId()) ) ; +?> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/_fk_division_id.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev"

1 0

SVN Alba r4143 - in prosistem/alba/trunk/alba/apps/principal/modules: feriado/actions feriado/config feriado/templates turnos/actions
by commits＠pressenter.com.ar 31 Jan '07

31 Jan '07

Author: josx Date: 2007-01-31 16:12:30 -0300 (Wed, 31 Jan 2007) New Revision: 4143 Removed: prosistem/alba/trunk/alba/apps/principal/modules/feriado/templates/editSuccess.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php Log: En feriado saque el combo de ciclo lectivo y ahora lo toma automaticamente Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php 2007-01-31 19:01:23 UTC (rev 4142) +++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/actions/actions.class.php 2007-01-31 19:12:30 UTC (rev 4143) @@ -94,6 +94,13 @@ $c->add(FeriadoPeer::FK_CICLOLECTIVO_ID,$this->getUser()->getAttribute('fk_ciclolectivo_id')); } + + function saveFeriado($feriado) { + $feriado->setFkCiclolectivoId($this->getUser()->getAttribute('fk_ciclolectivo_id')); + $feriado->save(); + } + + } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/generator.yml 2007-01-31 19:01:23 UTC (rev 4142) +++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/config/generator.yml 2007-01-31 19:12:30 UTC (rev 4143) @@ -9,6 +9,11 @@ repeticion_anual: { name: Anual, type: checkbox_tag } inamovible: { name: Inamovible, type: checkbox_tag } + edit: + title: Modificar Feriado + display: [ nombre, fecha, repeticion_anual, inamovible ] + + list: title: Listado de Feriados y días no laborales display: [ =nombre, fecha, repeticion_anual, inamovible] @@ -19,6 +24,5 @@ actions: _create : - link_ministerio: { name: Listado oficial, action: LinkMinisterio, icon: small/url.png } - edit: - title: Modificar Feriado + Deleted: prosistem/alba/trunk/alba/apps/principal/modules/feriado/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/feriado/templates/editSuccess.php 2007-01-31 19:01:23 UTC (rev 4142) +++ prosistem/alba/trunk/alba/apps/principal/modules/feriado/templates/editSuccess.php 2007-01-31 19:12:30 UTC (rev 4143) @@ -1,128 +0,0 @@ -<?php -// Necesito el template para que el combo de -// los Cliclos lectivos dependa del esteablecimiento donde estoy -// date: 2006/10/09 16:36:25 -?> -<?php use_helpers('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date') ?> - -<h1><?php echo __('Modificar Feriado', -array()) ?></h1> - -<div id="sf_admin_header"> -<?php include_partial('feriado/edit_header', array('feriado' => $feriado)) ?> -</div> - -<div id="sf_admin_content"> - -<?php if ($sf_request->hasErrors()): ?> -<div class="form-errors"> -<h2><?php echo __('There are some errors that prevent the form to validate') ?></h2> -<ul> -<?php foreach ($sf_request->getErrorNames() as $name): ?> - <li><?php echo $sf_request->getError($name) ?></li> -<?php endforeach; ?> -</ul> -</div> -<?php elseif ($sf_flash->has('notice')): ?> -<div class="save-ok"> -<h2><?php echo __($sf_flash->get('notice')) ?></h2> -</div> -<?php endif; ?> - -<?php echo form_tag('feriado/edit', 'id=sf_admin_edit_form name=sf_admin_edit_form multipart=true') ?> - -<?php echo object_input_hidden_tag($feriado, 'getId') ?> - -<fieldset id="sf_fieldset_none" class=""> -<div class="form-row"> - <?php echo label_for('feriado[nombre]', __('Nombre:'), 'class="required" ') ?> - <div class="content<?php if ($sf_request->hasError('feriado{nombre}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->hasError('feriado{nombre}')): ?> - <?php echo form_error('feriado{nombre}', array('class' => 'form-error-msg')) ?> - <?php endif; ?> - - <?php echo object_input_tag($feriado, 'getNombre', array ( - 'size' => 20, - 'control_name' => 'feriado[nombre]', -)) ?> - </div> -</div> - -<div class="form-row"> - <?php echo label_for('feriado[fecha]', __('Fecha:'), 'class="required" ') ?> - <div class="content<?php if ($sf_request->hasError('feriado{fecha}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->hasError('feriado{fecha}')): ?> - <?php echo form_error('feriado{fecha}', array('class' => 'form-error-msg')) ?> - <?php endif; ?> - - <?php echo object_input_date_tag($feriado, 'getFecha', array ( - 'rich' => true, - 'withtime' => true, - 'calendar_button_img' => '/sf/images/sf_admin/date.png', - 'control_name' => 'feriado[fecha]', - 'date_format' => 'dd/MM/yy', -)) ?> - </div> -</div> - -<div class="form-row"> - <?php echo label_for('feriado[repeticion_anual]', __('Anual:'), 'class="required" ') ?> - <div class="content<?php if ($sf_request->hasError('feriado{repeticion_anual}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->hasError('feriado{repeticion_anual}')): ?> - <?php echo form_error('feriado{repeticion_anual}', array('class' => 'form-error-msg')) ?> - <?php endif; ?> - - <?php echo object_checkbox_tag($feriado, 'getRepeticionAnual', array ( - 'control_name' => 'feriado[repeticion_anual]', -)) ?> - </div> -</div> - -<div class="form-row"> - <?php echo label_for('feriado[inamovible]', __('Inamovible:'), 'class="required" ') ?> - <div class="content<?php if ($sf_request->hasError('feriado{inamovible}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->hasError('feriado{inamovible}')): ?> - <?php echo form_error('feriado{inamovible}', array('class' => 'form-error-msg')) ?> - <?php endif; ?> - - <?php echo object_checkbox_tag($feriado, 'getInamovible', array ( - 'control_name' => 'feriado[inamovible]', -)) ?> - </div> -</div> - -<div class="form-row"> - <?php echo label_for('feriado[fk_ciclolectivo_id]', __('Ciclo Lectivo:'), 'class="required" ') ?> - <div class="content<?php if ($sf_request->hasError('feriado{fk_ciclolectivo_id}')): ?> form-error<?php endif; ?>"> - <?php if ($sf_request->hasError('feriado{fk_ciclolectivo_id}')): ?> - <?php echo form_error('feriado{fk_ciclolectivo_id}', array('class' => 'form-error-msg')) ?> - <?php endif; ?> - - <?php echo object_select_tag($feriado, 'getFkCiclolectivoId', array ( - 'related_class' => 'Ciclolectivo', - 'control_name' => 'feriado[fk_ciclolectivo_id]', -)) ?> - </div> -</div> - -</fieldset> - -<?php echo include_partial('edit_actions', array('feriado' => $feriado)) ?> - -</form> - -<ul class="sf_admin_actions"> - <li class="float-left"><?php if ($feriado->getId()): ?> -<?php echo button_to(__('delete'), 'feriado/delete?id='.$feriado->getId(), array ( - 'post' => true, - 'confirm' => __('Are you sure?'), - 'class' => 'sf_admin_action_delete', -)) ?><?php endif; ?> -</li> - </ul> - -</div> - -<div id="sf_admin_footer"> -<?php include_partial('feriado/edit_footer', array('feriado' => $feriado)) ?> -</div> Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-01-31 19:01:23 UTC (rev 4142) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-01-31 19:12:30 UTC (rev 4143) @@ -22,8 +22,8 @@ * Turnos Acciones * * @package alba - * @author Jos� Luis Di Biase <josx(a)interorganic.com.ar> - * @author H�ctor Sanchez <hsanchez(a)pressenter.com.ar> + * @author José Luis Di Biase <josx(a)interorganic.com.ar> + * @author Héctor Sanchez <hsanchez(a)pressenter.com.ar> * @author Fernando Toledo <ftoledo(a)pressenter.com.ar> * @version SVN: $Id$ * @filesource

1 0

SVN Alba r4142 - prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions
by commits＠pressenter.com.ar 31 Jan '07

31 Jan '07

Author: ftoledo Date: 2007-01-31 16:01:23 -0300 (Wed, 31 Jan 2007) New Revision: 4142 Modified: prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php Log: cambia el ciclo lectivo actual de acuerdo al cambio de establecimiento Modified: prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php 2007-01-31 18:57:54 UTC (rev 4141) +++ prosistem/alba/trunk/alba/apps/principal/modules/establecimiento/actions/actions.class.php 2007-01-31 19:01:23 UTC (rev 4142) @@ -96,6 +96,9 @@ $this->referer = $this->getRequest()->getReferer(); } + /** + * Cambiamos de establecimiento y pasamos al ciclo actual activo del mismo + */ public function executeActual() { $id = $this->getRequestParameter('establecimiento'); $c = new Criteria(); @@ -105,9 +108,22 @@ $this->getUser()->setAttribute('fk_establecimiento_id',$id); $this->getUser()->setAttribute('establecimiento_nombre',$establecimiento->getNombre()); // $this->setFlash('notice', 'Se ha cambiado de establecimiento'); + $c = new Criteria(); + $c->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID,$id); + $c->addDescendingOrderByColumn(CiclolectivoPeer::ACTUAL); + $cicloactual = CiclolectivoPeer::doSelectOne($c); + if ($cicloactual) { + $this->getUser()->setAttribute('fk_ciclolectivo_id',$cicloactual->getId()); + $this->getUser()->setAttribute('ciclolectivo_descripcion',$cicloactual->getDescripcion()); + return $this->redirect($this->getRequestParameter('referer', '@homepage')); + } + else { + setFlash('error', 'No se puede asignar un ciclo lectivo actual para este establecimiento'); + } + } + - return $this->redirect($this->getRequestParameter('referer', '@homepage')); }

1 0

SVN Alba r4141 - in prosistem/alba/trunk/alba/apps/principal/modules/division: actions config templates
by commits＠pressenter.com.ar 31 Jan '07

31 Jan '07

Author: ftoledo Date: 2007-01-31 15:57:54 -0300 (Wed, 31 Jan 2007) New Revision: 4141 Added: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php Log: filtros de division x establecimiento y ciclo Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-01-31 18:56:31 UTC (rev 4140) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-01-31 18:57:54 UTC (rev 4141) @@ -23,8 +23,8 @@ * division Acciones * * @package alba - * @author José Luis Di Biase <josx(a)interorganic.com.ar> - * @author Héctor Sanchez <hsanchez(a)pressenter.com.ar> + * @author Jos� Luis Di Biase <josx(a)interorganic.com.ar> + * @author H�ctor Sanchez <hsanchez(a)pressenter.com.ar> * @author Fernando Toledo <ftoledo(a)pressenter.com.ar> * @version SVN: $Id$ * @filesource @@ -39,9 +39,9 @@ protected function addFiltersCriteria(&$c) { - $c->addJoin(DivisionPeer::FK_TURNOS_ID, TurnosPeer::ID); - $c->addJoin(TurnosPeer::FK_CICLOLECTIVO_ID, CiclolectivoPeer::ID); - $c->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); + $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $this->getUser()->getAttribute('fk_establecimiento_id')); + $c->addJoin(DivisionPeer::FK_ANIO_ID,AnioPeer::ID); + } Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml 2007-01-31 18:56:31 UTC (rev 4140) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/config/generator.yml 2007-01-31 18:57:54 UTC (rev 4141) @@ -11,9 +11,7 @@ descripcion: { name: Descripción } edit: title: Editar División - fields: - fk_anio_id: { params: include_custom=>>Seleccione un Año<<} - display: [ fk_anio_id, descripcion, _fk_turnos_id ] + display: [ _fk_anio_id, descripcion, _fk_turnos_id ] list: title: Listado de Divisiones Added: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php 2007-01-31 18:56:31 UTC (rev 4140) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php 2007-01-31 18:57:54 UTC (rev 4141) @@ -0,0 +1,12 @@ +<?php + $c = new Criteria(); + $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); + $c->addAscendingOrderByColumn(AnioPeer::DESCRIPCION); + $anios = AnioPeer::doSelect($c); + $optionsAnios = array(); + $optionsAnios[""] = ">>Seleccione un Año<<"; + foreach ($anios as $anio) { + $optionsAnios[$anio->getId()] = $anio->getDescripcion(); + } + echo select_tag('division[fk_anio_id]', options_for_select($optionsAnios, $division->getFkAnioId()) ) ; +?> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_anio_id.php ___________________________________________________________________ Name: svn:keywords + "Id Author URL Date Rev" Modified: prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php 2007-01-31 18:56:31 UTC (rev 4140) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/templates/_fk_turnos_id.php 2007-01-31 18:57:54 UTC (rev 4141) @@ -1,7 +1,6 @@ <?php $criteriaT = new Criteria(); - $criteriaT->add(CiclolectivoPeer::FK_ESTABLECIMIENTO_ID, $sf_user->getAttribute('fk_establecimiento_id')); - $criteriaT->addJoin(TurnosPeer::FK_CICLOLECTIVO_ID, CiclolectivoPeer::ID); + $criteriaT->add(TurnosPeer::FK_CICLOLECTIVO_ID, $sf_user->getAttribute('fk_ciclolectivo_id')); $turnos = TurnosPeer::doSelect($criteriaT); $optionsTurnos = array(); $optionsTurnos[""] = ">>Seleccione un Turno<<";

1 0