Author: josx Date: 2007-01-29 15:59:24 -0300 (Mon, 29 Jan 2007) New Revision: 4099 Modified: prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/anio/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/ayuda/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/calendariovacunacion/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/concepto/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/creditos/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/cuenta/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/distritoescolar/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/templates/layout.php Log: Agregue posibilidad de imprimir cualquier pantalla desde el menu Modified: prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -22,8 +22,8 @@ * actividades actions * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author Jos�Luis Di Biase <[email protected]> + * @author H�tor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -31,6 +31,11 @@ */ class actividadActions extends autoactividadActions { + + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + protected function addFiltersCriteria (&$c) { $c->add(ActividadPeer::FK_ESTABLECIMIENTO_ID,$this->getUser()->getAttribute('fk_establecimiento_id')); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -23,8 +23,8 @@ * alumno actions. * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -33,6 +33,10 @@ class alumnoActions extends autoalumnoActions { + + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } /** * Ir a la cuenta del alumno Modified: prosistem/alba/trunk/alba/apps/principal/modules/anio/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/anio/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/anio/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -22,8 +22,8 @@ * anio actions. * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author Jos�Luis Di Biase <[email protected]> + * @author H�tor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -32,6 +32,11 @@ class anioActions extends autoanioActions { + + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + protected function addFiltersCriteria (&$c) { $c->add(AnioPeer::FK_ESTABLECIMIENTO_ID,$this->getUser()->getAttribute('fk_establecimiento_id')); Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -22,8 +22,8 @@ * asistencia actions. * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -32,6 +32,11 @@ class asistenciaActions extends sfActions { + + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + /** * Executes index action @@ -195,7 +200,7 @@ $this->aFeriado = $aFeriado; $this->alumno_id = $alumno_id; $this->cuenta_id = $cuenta_id; - //Verifico si muestro versi�n para imprimir + //Verifico si muestro versi� para imprimir if ($this->getRequestParameter('vista')) $this->vista = $this->getRequestParameter('vista'); else Modified: prosistem/alba/trunk/alba/apps/principal/modules/ayuda/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ayuda/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/ayuda/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -22,8 +22,8 @@ * ayuda actions * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id: MiscHelper.php 3895 2006-12-18 17:53:19Z josx $ * @filesource @@ -32,6 +32,11 @@ class ayudaActions extends sfActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + + public function executeIndex() { } Modified: prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/boletin/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -22,8 +22,8 @@ * boletin actions * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -33,6 +33,11 @@ class boletinActions extends sfActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + + public function executeGrabarNotas() { // inicializando variables Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -22,8 +22,8 @@ * calendario actions * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -33,10 +33,10 @@ class calendarioActions extends sfActions { - public function preExecute() { - - } - + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + private function getHorasMaterias($anio_id) { // traigo todos las materias/actividades para un año determinado $criteria = new Criteria(); Modified: prosistem/alba/trunk/alba/apps/principal/modules/calendariovacunacion/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/calendariovacunacion/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendariovacunacion/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -22,8 +22,8 @@ * calendariovacunacion actions * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -32,4 +32,9 @@ class calendariovacunacionActions extends autocalendariovacunacionActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + + } Modified: prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -22,8 +22,8 @@ * cargobaja actions * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -32,4 +32,9 @@ class cargobajaActions extends autocargobajaActions { + + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + } Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -22,8 +22,8 @@ * ciclolectivo actions * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -33,6 +33,9 @@ class ciclolectivoActions extends autociclolectivoActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } public function executeAgregarTurnosYPeriodos() { Modified: prosistem/alba/trunk/alba/apps/principal/modules/concepto/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/concepto/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/concepto/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -22,8 +22,8 @@ * concepto actions * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -32,6 +32,12 @@ class conceptoActions extends autoconceptoActions { + + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + + } -?> +?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -23,8 +23,8 @@ * conceptobaja Acciones * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -33,4 +33,9 @@ class conceptobajaActions extends autoconceptobajaActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + + } Modified: prosistem/alba/trunk/alba/apps/principal/modules/creditos/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/creditos/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/creditos/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -23,8 +23,8 @@ * creditos Acciones * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -33,6 +33,12 @@ class creditosActions extends sfActions { + + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + + /** * Executes index action * Modified: prosistem/alba/trunk/alba/apps/principal/modules/cuenta/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cuenta/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/cuenta/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -23,8 +23,8 @@ * cuenta Acciones * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -33,6 +33,11 @@ class cuentaActions extends autocuentaActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + + /** * Muestra la cuenta, los alumnos y los responsables **/ Modified: prosistem/alba/trunk/alba/apps/principal/modules/distritoescolar/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/distritoescolar/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/distritoescolar/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -23,8 +23,8 @@ * distritoescolar Acciones * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -33,4 +33,8 @@ class distritoescolarActions extends autodistritoescolarActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } + } 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-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/division/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -23,8 +23,8 @@ * division Acciones * * @package alba - * @author Jos�Luis Di Biase <[email protected]> - * @author H�tor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -33,6 +33,9 @@ class divisionActions extends autodivisionActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } protected function addFiltersCriteria(&$c) { Modified: prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/docente/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -23,8 +23,8 @@ * docente Acciones * * @package alba - * @author Jos� Luis Di Biase <[email protected]> - * @author H�ctor Sanchez <[email protected]> + * @author José Luis Di Biase <[email protected]> + * @author Héctor Sanchez <[email protected]> * @author Fernando Toledo <[email protected]> * @version SVN: $Id$ * @filesource @@ -33,6 +33,9 @@ class docenteActions extends autodocenteActions { + public function preExecute() { + $this->vista = $this->getRequestParameter('vista'); + } function executeActividadesPorDocente() { $this->redirect('relActividadDocente/list?filters%5Bfk_docente_id%5D='.$this->getRequestParameter('id').'&filter=filtrar'); Modified: prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/modules/docenteHorario/actions/actions.class.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -36,6 +36,7 @@ public function preExecute () { $this->getResponse()->addStylesheet('/sf/css/sf_admin/main', 'first'); + $this->vista = $this->getRequestParameter('vista'); } public function executeIndex () Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-01-29 18:57:34 UTC (rev 4098) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-01-29 18:59:24 UTC (rev 4099) @@ -2,7 +2,7 @@ if(!isset($vista)){ $vista=""; } - + if($vista == "noMuestraMenu") { echo $content; } else { ?> @@ -104,8 +104,21 @@ if($sf_user->isAuthenticated() == true) { include("menu.php"); } - ?></td> - <td><?=image_tag("gui/index_2x2.png", array ( 'width' => '17' , 'heigth' => '35' ) )?></td> + ?> + <div id="menu" align="right"> + <? $uri = sfRouting::getInstance()->getCurrentInternalUri(); + $vista_var = "vista=noMuestraMenu"; + $separador = (strstr($uri,'?'))?'&':'?'; + $vista_var = $separador.$vista_var; + echo link_to(image_tag(sfContext::getInstance()->getRequest()->getRelativeUrlRoot().'/images/small/print.png'),$uri.$vista_var,'popup=true'); + ?> + </div> +</td> + + + <td><?=image_tag("gui/index_2x2.png", array ( 'width' => '17' , 'heigth' => '35' ) )?></td> + + </tr>