Author: ftoledo Date: 2009-09-16 17:45:31 -0300 (Wed, 16 Sep 2009) New Revision: 6259 Removed: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/editSuccess.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/generator.yml Log: rollback de la pantalla de asignar alumnos a division Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php 2009-09-16 18:50:23 UTC (rev 6258) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/actions/actions.class.php 2009-09-16 20:45:31 UTC (rev 6259) @@ -180,7 +180,7 @@ } - +/* function executeEdit($request) { //Listado de alumnos $c = new Criteria(); @@ -190,9 +190,9 @@ $this->optionsDivision = $this->getDivisionesDeEstablecimiento(); $this->alumnoDivision = $this->getAlumnosPorDivision(); } +*/ - function getAlumnosPorDivision() { // Alumnos por division $aAlumnoDivision = array(); Modified: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/generator.yml 2009-09-16 18:50:23 UTC (rev 6258) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/config/generator.yml 2009-09-16 20:45:31 UTC (rev 6259) @@ -9,7 +9,7 @@ division: { name: División} edit: title: Asignar alumno a grado y sección - display: [ _fk_alumno_id, _fk_division_id] + # display: [ alumno, _fk_division_id] list: title: Listado de alumnos por grado y sección display: [ alumno, division ] Deleted: prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/editSuccess.php 2009-09-16 18:50:23 UTC (rev 6258) +++ prosistem/alba/trunk/alba/apps/principal/modules/relAlumnoDivision/templates/editSuccess.php 2009-09-16 20:45:31 UTC (rev 6259) @@ -1,68 +0,0 @@ -<?php use_helper('Object', 'Validation', 'ObjectAdmin', 'I18N', 'Date','Form', 'Javascript') ?> -<?php use_stylesheet('/sf/sf_admin/css/main') ?> -<?php use_stylesheet('cart') ?> -<div id="sf_admin_container"> -<h1><?php echo __('Asignar alumno a grado y sección', array()) ?></h1> -<!-- Filtro Alumnos --> -<?php echo form_remote_tag(array( - 'update' => 'alumnos', - 'url' => 'relAlumnoDivision/busqueda', - 'script' => true -)) ?> - <div id="filtros_alumnos">Apellido: - <?php echo input_tag("filtro_nombre_alumnos", '', array ( 'size' => 20, 'class'=>'text' )) ?> - <?php echo select_tag('filtro_alumnos', options_for_select(array('Todos', 'No Asignados',), 0)) ?> - <ul class="sf_admin_actions"> - <li><?php echo submit_tag(__('Buscar'), array ( 'class' => 'sf_admin_action_save',)) ?></li> - </ul> - </div> -</form> - - -<!-- Alumnos --> -<div id="alumnos"> -<?php include_partial('relAlumnoDivision/listado_alumnos', array('optionsAlumno' => $optionsAlumno)) ?> -</div> - - -<!-- Filtro Divisiones --> -<br/> -<?php echo form_remote_tag(array( 'update' => 'divisiones', 'url' => 'relAlumnoDivision/busquedaDivision', 'script' => true )) ?> - <div id="filtros_secciones">Divisiones: - <?php echo input_tag("filtro_nombre_divisiones", '', array ('size' => 20, 'class'=>'text')) ?> - -  Orientación: - <?php $value = object_select_tag($division, 'getFkOrientacionId', array ( - 'related_class' => 'Orientacion', - 'control_name' => 'fk_orientacion_id', - 'include_blank' => true, -)); echo $value ? $value : ' ' ?> - -  Año: - <?php $value = object_select_tag($division, 'getFkAnioId', array ( - 'related_class' => 'Anio', - 'control_name' => 'fk_anio_id', - 'include_blank' => true, -)); echo $value ? $value : ' ' ?> - -  Turno: - <?php $value = object_select_tag($division, 'getFkTurnoId', array ( - 'related_class' => 'Turno', - 'control_name' => 'fk_turno_id', - 'include_blank' => true, -)); echo $value ? $value : ' ' ?> - - - </div> - <ul class="sf_admin_actions"> - <li><?php echo submit_tag(__('Buscar'), array ( 'class' => 'sf_admin_action_save',)) ?></li> - </ul> -</form> - - -<!-- Divisiones--> -<div id="divisiones"> -<?php include_partial('relAlumnoDivision/listado_divisiones', array('optionsDivision' => $optionsDivision, 'alumnoDivision' => $alumnoDivision )) ?> -</div> - -</div>