February 2007 - Alba-desarrollo - lists.ourproject.org

SVN Alba r4288 - in prosistem/alba/trunk/alba/apps/principal: config modules/turnos/actions modules/turnos/config modules/turnos/validate templates
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: ftoledo Date: 2007-02-23 17:20:56 -0300 (Fri, 23 Feb 2007) New Revision: 4288 Modified: prosistem/alba/trunk/alba/apps/principal/config/settings.yml prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/security.yml prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml prosistem/alba/trunk/alba/apps/principal/templates/layout.php Log: warnings en el modulo de turnos en la version dev Modified: prosistem/alba/trunk/alba/apps/principal/config/settings.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/config/settings.yml 2007-02-23 18:46:34 UTC (rev 4287) +++ prosistem/alba/trunk/alba/apps/principal/config/settings.yml 2007-02-23 20:20:56 UTC (rev 4288) @@ -13,7 +13,6 @@ no_script_name: off etag: off i18n: off - test: .settings: # E_ALL | E_STRICT & ~E_NOTICE = 2047 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-02-23 18:46:34 UTC (rev 4287) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-02-23 20:20:56 UTC (rev 4288) @@ -63,9 +63,11 @@ } } function _add_zeros($string, $strlen) { - if ($strlen > strlen($string)) - for ($x = strlen($string); $x < $strlen; $x++) + if ($strlen > strlen($string)) { + for ($x = strlen($string); $x < $strlen; $x++) { $string = '0' . $string; + } + } return $string; } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml 2007-02-23 18:46:34 UTC (rev 4287) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml 2007-02-23 20:20:56 UTC (rev 4288) @@ -1,18 +1,18 @@ generator: - class: sfPropelAdminGenerator - param: - model_class: Turnos - theme: default - fields: - descripcion: {name: Descripción , params: size=64} - hora_inicio: {name: Hora Inicio } - hora_fin: { name: Hora Fin } - edit: - title: Turno - display: [descripcion, _hora_inicio, _hora_fin ] - list: - title: Listado de Turnos - display: [=descripcion, hora_inicio, hora_fin ] - object_actions: - _edit: - - _delete: - + class: sfPropelAdminGenerator + param: + model_class: Turnos + theme: default + fields: + descripcion: { name: Descripcion , params: size=64} + hora_inicio: { name: Hora Inicio } + hora_fin: { name: Hora Fin } + edit: + title: Turno + display: [descripcion, _hora_inicio, _hora_fin ] + list: + title: Listado de Turnos + display: [=descripcion, hora_inicio, hora_fin ] + object_actions: + _edit: - + _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/security.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/security.yml 2007-02-23 18:46:34 UTC (rev 4287) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/security.yml 2007-02-23 20:20:56 UTC (rev 4288) @@ -1,4 +1,3 @@ -all: +all: is_secure: on - credentials: turnos - \ No newline at end of file + credentials: turnos \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml 2007-02-23 18:46:34 UTC (rev 4287) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml 2007-02-23 20:20:56 UTC (rev 4288) @@ -1,4 +1,4 @@ -methods: +methods: post: - "turnos{hora_inicio}" - "turnos{hora_fin}" @@ -6,23 +6,17 @@ fillin: enabled: on - names: turnos{hora_inicio}: required: Yes required_msg: El campo hora inicio es obligatorio - turnos{hora_fin}: required: Yes required_msg: El campo hora fin es obligatorio - - turnos{descripcion}: required: Yes required_msg: El campo descripción es obligatorio validators: caracteresMaximos255 - - caracteresMaximos255: class: sfStringValidator param: Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 18:46:34 UTC (rev 4287) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 20:20:56 UTC (rev 4288) @@ -1,13 +1,11 @@ -<?php +<?php if(!isset($vista)){ $vista=""; } -?> - -<?php if($vista == "noMuestraMenu"): ?> - <?php echo $content; ?> -<?php else: ?> +?><?php if($vista == "noMuestraMenu"): + echo $content; + else: ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-200000126/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> @@ -16,7 +14,7 @@ <?php echo include_metas() ?> <?php echo include_title() ?> - <link rel="stylesheet" type="text/css" href="<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.MENU_THEME.'/theme.css' ?>"/> + <link rel="stylesheet" type="text/css" href="<?php echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.MENU_THEME.'/theme.css' ?>"/> <link rel="shortcut icon" href="/favicon.ico" /> <style type="text/css"> @@ -57,9 +55,9 @@ </head> <body> - <?php if($vista == "imprimir") :?> - <?php echo $content; ?> - <?php else: ?> +<?php if($vista == "imprimir") :?> +<?php echo $content; ?> +<?php else: ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr valign="top"> <td colspan="2" class="fmedio"> @@ -156,6 +154,6 @@ </table> <?php endif; ?> </body> - <?php echo javascript_include_tag('varios/wz_tooltip.js'); ?> +<?php echo javascript_include_tag('varios/wz_tooltip.js'); ?> </html> <? endif; ?> \ No newline at end of file

1 0

[Pressenter SVN Repo] #99: Mejores sobre la carga de Alumnos
by Pressenter SVN Repo 23 Feb '07

23 Feb '07

#99: Mejores sobre la carga de Alumnos -------------------------+-------------------------------------------------- Reporter: vdifiore | Owner: somebody Type: mejora | Status: new Priority: normal | Milestone: version 1.0rc Component: alba-alumno | Version: 1.0b Severity: minor | Keywords: -------------------------+-------------------------------------------------- Algunas cosas a mejorar En el campo provincias falta, entre muchas la cap fed Pensar en añadir tabla de barrios En la carga de alumno incluir un link a crear cuenta La carga de alumno no exige asociación con cuenta alguna para su creacion -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/99> Pressenter SVN Repo <http://wwww.proyectoalba.com.ar/> Proyecto Alba

2 2

SVN Alba r4287 - in prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo: actions templates
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: ftoledo Date: 2007-02-23 15:46:34 -0300 (Fri, 23 Feb 2007) New Revision: 4287 Added: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/deleteError.php Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/agregarTurnosYPeriodosSuccess.php Log: validacion al eliminar el Ciclo Lectivo fix de botones en agregar Turnos y Periodos de Ciclo Lectivo 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-02-23 18:46:09 UTC (rev 4286) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2007-02-23 18:46:34 UTC (rev 4287) @@ -217,8 +217,8 @@ $con->commit(); //cambio el attributo porque se cambio el ciclo actual - $this->getUser()->setAttribute('fk_cicloactual_id',$ciclolectivo->getId()); - $this->getUser()->setAttribute('cicloactual_descripcion',$ciclolectivo->getDescripcion()); + $this->getUser()->setAttribute('fk_ciclolectivo_id',$ciclolectivo->getId()); + $this->getUser()->setAttribute('ciclolectivo_descripcion',$ciclolectivo->getDescripcion()); } catch (Exception $e){ @@ -263,14 +263,40 @@ $this->ciclolectivo = CiclolectivoPeer::retrieveByPk($this->getRequestParameter('id')); $this->forward404Unless($this->ciclolectivo); - - $this->deleteCiclolectivo($this->ciclolectivo); - if ($this->getUser()->getAttribute('fk_ciclolectivo_id') == $this->getRequestParameter('id')) { - $this->getUser()->setAttribute('fk_ciclolectivo_id',0); - $this->getUser()->setAttribute('ciclolectivo_descripcion','No seleccionado'); + try { + $this->deleteCiclolectivo($this->ciclolectivo); + if ($this->getUser()->getAttribute('fk_ciclolectivo_id') == $this->getRequestParameter('id')) { + $this->getUser()->setAttribute('fk_ciclolectivo_id',0); + $this->getUser()->setAttribute('ciclolectivo_descripcion','No seleccionado'); + } } + catch (Exeception $e){ + echo $e->getMessage(); + die(); + } + return $this->redirect('ciclolectivo/list'); } + + function validateDelete() { + $this->ciclolectivo = CiclolectivoPeer::retrieveByPk($this->getRequestParameter('id')); + $this->forward404Unless($this->ciclolectivo); + if ($this->ciclolectivo->countTurnoss() >0) { + $this->error = "El ciclo lectivo contiene turnos asociados"; + return false; + } + if ($this->ciclolectivo->countPeriodos() > 0) { + $this->error = "El ciclo lectivo contiene Peridos asociados"; + return false; + } + if ($this->ciclolectivo->countFeriados() > 0) { + $this->error = "El ciclo lectivo contiene Feriados asociados"; + return false; + } + + return true; + } + } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/agregarTurnosYPeriodosSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/agregarTurnosYPeriodosSuccess.php 2007-02-23 18:46:09 UTC (rev 4286) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/agregarTurnosYPeriodosSuccess.php 2007-02-23 18:46:34 UTC (rev 4287) @@ -119,7 +119,7 @@ <tr> <th colspan="9"> <div class="float-right"> - </div> </th> @@ -148,8 +148,8 @@ ?> <tr class="sf_admin_row_0"> <td><?echo input_tag("periodo[$i][descripcion]",$periodo->getDescripcion());?></td> - <td><?echo input_date_tag("periodo[$i][fecha_inicio]",$periodo->getFechaInicio(), "rich=true");?></td> - <td><?echo input_date_tag("preiodo[$i][fecha_fin]",$periodo->getFechaFin(), "rich=true");?></td> + <td><?echo input_date_tag("periodo[$i][fecha_inicio]",$periodo->getFechaInicio(), "rich=true calendar_button_img=/sf/images/sf_admin/date.png");?></td> + <td><?echo input_date_tag("preiodo[$i][fecha_fin]",$periodo->getFechaFin(), "rich=true calendar_button_img=/sf/images/sf_admin/date.png");?></td> <?php echo input_hidden_tag("periodo[$i][id]", $periodo->getId()); ?> <td> <ul class="sf_admin_td_actions"> @@ -162,8 +162,8 @@ <tr class="sf_admin_row_0"> <td><?echo input_tag("periodo[$i][descripcion]",'');?></td> - <td><?echo input_date_tag("periodo[$i][fecha_inicio]",'',"rich=true");?></td> - <td><?echo input_date_tag("periodo[$i][fecha_fin]",'',"rich=true");?></td> + <td><?echo input_date_tag("periodo[$i][fecha_inicio]",'',"rich=true calendar_button_img=/sf/images/sf_admin/date.png");?></td> + <td><?echo input_date_tag("periodo[$i][fecha_fin]",'',"rich=true calendar_button_img=/sf/images/sf_admin/date.png");?></td> <td></td> </tr> @@ -179,9 +179,9 @@ <div> <ul class="sf_admin_actions"> <li> - <? echo submit_tag('submit', 'class=default value=Grabar"'); ?> - <li> - <li><input value="Listado de Ciclo Lectivos" type="button" onclick="document.location.href='<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()?>/ciclolectivo/list';" /></li> + <?php echo submit_tag('submit', 'class=sf_admin_action_save value=Grabar'); ?> + </li> + <li><?php echo button_to("Listado de Ciclo Lectivos","ciclolectivo/list",'class=sf_admin_action_list')?></li> </ul> </div> Added: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/deleteError.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/deleteError.php 2007-02-23 18:46:09 UTC (rev 4286) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/deleteError.php 2007-02-23 18:46:34 UTC (rev 4287) @@ -0,0 +1,8 @@ +<div class="error"> + No es posible eliminar éste Ciclo Lectivo: + <ul> + <li><?php echo $error?></li> + </ul> +</div> +<br/> +<div><?php echo link_to('Volver al ciclo lectivo','ciclolectivo/edit?id=' . $ciclolectivo->getId())?></div> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/deleteError.php ___________________________________________________________________ Name: svn:keywords + Id Date Author Rev URL

1 0

SVN Alba r4286 - in prosistem/alba/trunk/alba/apps/principal/modules/alumno: actions templates validate
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: josx Date: 2007-02-23 15:46:09 -0300 (Fri, 23 Feb 2007) New Revision: 4286 Added: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/grabarCuentaSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/nuevaCuentaSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/validate/grabarCuenta.yml Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/buscarSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php Log: Ahora se puede agregar una cuenta desde el alumno 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-02-23 16:54:12 UTC (rev 4285) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-02-23 18:46:09 UTC (rev 4286) @@ -162,8 +162,77 @@ public function executeCambiarCuenta() { + } + + public function handleErrorGrabarCuenta() { + $this->cuenta = $this->updateCuentaFromRequest(); + $this->setTemplate("nuevaCuenta"); + $this->vista = "noMuestraMenu"; + return sfView::SUCCESS; } + + public function executeGrabarCuenta() { + $cuenta = $this->updateCuentaFromRequest(); + $cuenta->save(); + } + + + public function updateCuentaFromRequest() { + $cuenta = $this->getRequestParameter('cuenta'); + + $cuenta_obj = new Cuenta(); + + if (isset($cuenta['nombre'])) + { + $cuenta_obj->setNombre($cuenta['nombre']); + } + if (isset($cuenta['razon_social'])) + { + $cuenta_obj->setRazonSocial($cuenta['razon_social']); + } + if (isset($cuenta['cuit'])) + { + $cuenta_obj->setCuit($cuenta['cuit']); + } + if (isset($cuenta['direccion'])) + { + $cuenta_obj->setDireccion($cuenta['direccion']); + } + if (isset($cuenta['ciudad'])) + { + $cuenta_obj->setCiudad($cuenta['ciudad']); + } + if (isset($cuenta['codigo_postal'])) + { + $cuenta_obj->setCodigoPostal($cuenta['codigo_postal']); + } + if (isset($cuenta['pais_id'])) + { + $cuenta_obj->setPaisId($cuenta['pais_id']); + } + if (isset($cuenta['fk_provincia_id'])) + { + $cuenta_obj->setFkProvinciaId($cuenta['fk_provincia_id']); + } + if (isset($cuenta['fk_tipoiva_id'])) + { + $cuenta_obj->setFkTipoivaId($cuenta['fk_tipoiva_id']); + } + if (isset($cuenta['telefono'])) + { + $cuenta_obj->setTelefono($cuenta['telefono']); + } + + return $cuenta_obj; + } + + + public function executeNuevaCuenta() { + $this->cuenta = new Cuenta(); + } + + } ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/buscarSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/buscarSuccess.php 2007-02-23 16:54:12 UTC (rev 4285) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/buscarSuccess.php 2007-02-23 18:46:09 UTC (rev 4286) @@ -22,7 +22,7 @@ $numero = ($tr_class)?1:0; ?> <tr class="sf_admin_row_<?php echo $numero;?>"> - <td><?php echo label_for('cuenta', __("Cuenta :".$cuenta->getNombre()), ''); ?></td> + <td><?php echo label_for('cuenta', __($cuenta->getNombre()), ''); ?></td> <td><?php echo link_to_remote('Seleccionar', array ( 'update' => 'cuenta', 'url' => 'alumno/seleccionarCuenta?vista=noMuestraMenu&id='.$cuenta->getId()));?></td> </tr> <?php Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2007-02-23 16:54:12 UTC (rev 4285) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2007-02-23 18:46:09 UTC (rev 4286) @@ -344,9 +344,9 @@ <?php } else { ?> <?php echo include_partial('buscarCuenta'); ?> <? } ?> - </div> </div> + <?php echo link_to_remote('Nueva Cuenta', array('update' => 'nueva_cuenta', 'url' => 'alumno/nuevaCuenta?vista=noMuestraMenu' )); ?> </div> @@ -372,3 +372,9 @@ <div id="sf_admin_footer"> <?php include_partial('alumno/edit_footer', array('alumno' => $alumno)) ?> </div> + + +<div id="nueva_cuenta"> +</div> + + Added: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/grabarCuentaSuccess.php =================================================================== Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/grabarCuentaSuccess.php ___________________________________________________________________ Name: svn:keywords + Id Date Author Rev URL Added: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/nuevaCuentaSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/nuevaCuentaSuccess.php 2007-02-23 16:54:12 UTC (rev 4285) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/nuevaCuentaSuccess.php 2007-02-23 18:46:09 UTC (rev 4286) @@ -0,0 +1,119 @@ +<?php use_helper('Object') ?> +<?php use_helper('Javascript') ?> + +<div style="background-color: silver;border:1px solid black; position:relative;bottom:150px; left:360px; width:40%" > +<h2>Nueva Cuenta</h2> +<?php echo form_tag('alumno/grabarCuenta', 'id=sf_admin_edit_form name=sf_admin_edit_form multipart=true') ?> + + <table> + <tr> + <td>Nombre:</td> + + <td> + <?php if ($sf_request->hasError('cuenta{nombre}')): ?> + <?php echo form_error('cuenta{nombre}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + <?php echo object_input_tag($cuenta, 'getNombre', array ('size' => 32,'control_name' => 'cuenta[nombre]',)) ?> + </td> + + <td></td> + <td></td> + + <td>Razon Social:</td> + <td> + <?php if ($sf_request->hasError('cuenta{razon_social}')): ?> + <?php echo form_error('cuenta{razon_social}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + <?php echo object_input_tag($cuenta, 'getRazonSocial', array ('size' => 32,'control_name' => 'cuenta[razon_social]',)) ?> + </td> + + </tr> + <tr> + <td>CUIT:</td> + <td> + <?php if ($sf_request->hasError('cuenta{cuit}')): ?> + <?php echo form_error('cuenta{cuit}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + <?php echo object_input_tag($cuenta, 'getCuit', array ('size' => 32,'control_name' => 'cuenta[cuit]',)) ?> + </td> + + <td></td> + <td></td> + + <td>Tipo IVA:</td> + <td> + <?php if ($sf_request->hasError('cuenta{fk_tipoiva_id}')): ?> + <?php echo form_error('cuenta{fk_tipoiva_id}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + + +<?php echo object_select_tag($cuenta, 'getFkTipoivaId', array ( + 'related_class' => 'Tipoiva', + 'control_name' => 'cuenta[fk_tipoiva_id]', +)) ?> + + </td> + + </tr> + + <tr> + <td>Direccion:</td> + <td> + <?php if ($sf_request->hasError('cuenta{direccion}')): ?> + <?php echo form_error('cuenta{direccion}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + <?php echo object_input_tag($cuenta, 'getDireccion', array ('size' => 32,'control_name' => 'cuenta[direccion]',)) ?> + </td> + + <td></td> + <td></td> + + <td>Ciudad:</td> + <td> + <?php if ($sf_request->hasError('cuenta{ciudad}')): ?> + <?php echo form_error('cuenta{ciudad}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + <?php echo object_input_tag($cuenta, 'getCiudad', array ('size' => 32,'control_name' => 'cuenta[ciudad]',)) ?> + + </td> + + </tr> + + <tr> + <td>Provincia:</td> + <td> + <?php if ($sf_request->hasError('cuenta{fk_provincia_id}')): ?> + <?php echo form_error('cuenta{fk_provincia_id}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + + + <?php echo object_select_tag($cuenta, 'getFkProvinciaId', array ( + 'related_class' => 'Provincia', + 'control_name' => 'cuenta[fk_provincia_id]', +)) ?> + </td> + + <td></td> + <td></td> + + <td>CP:</td> + <td> + <?php if ($sf_request->hasError('cuenta{codigo_postal}')): ?> + <?php echo form_error('cuenta{codigo_postal}', array('class' => 'form-error-msg')) ?> + <?php endif; ?> + <?php echo object_input_tag($cuenta, 'getCodigoPostal', array ('size' => 32,'control_name' => 'cuenta[codigo_postal]',)) ?> + + </td> + </tr> + </table> + <?php echo submit_to_remote('ajax_submit', 'Grabar', array('update' => 'nueva_cuenta', 'url' => 'alumno/grabarCuenta?vista=noMuestraMenu',)) ?> + <?php echo button_to_function('Cerrar', update_element_function('nueva_cuenta', array('content' => '')));?> +</form> +</div> \ No newline at end of file Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/nuevaCuentaSuccess.php ___________________________________________________________________ Name: svn:keywords + Id Date Author Rev URL Added: prosistem/alba/trunk/alba/apps/principal/modules/alumno/validate/grabarCuenta.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/validate/grabarCuenta.yml 2007-02-23 16:54:12 UTC (rev 4285) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/validate/grabarCuenta.yml 2007-02-23 18:46:09 UTC (rev 4286) @@ -0,0 +1,82 @@ +methods: + post: + - "cuenta{nombre}" + - "cuenta{razon_social}" + - "cuenta{cuit}" + - "cuenta{direccion}" + - "cuenta{ciudad}" + - "cuenta{fk_tipoiva_id}" + - "cuenta{codigo_postal}" + - "cuenta{fk_provincia_id}" + +fillin: + enabled: on + +names: + cuenta{nombre}: + required: Yes + required_msg: El campo nombre es obligatorio + validators: caracteresMaximos128 + + cuenta{razon_social}: + required: Yes + required_msg: El campo razón social es obligatorio + validators: caracteresMaximos128 + + cuenta{cuit}: + required: Yes + required_msg: El campo CUIT es obligatorio + validators: caracteresMaximos20 + + cuenta{ciudad}: + required: Yes + required_msg: El campo ciudad es obligatorio + validators: caracteresMaximos128 + + cuenta{direccion}: + required: Yes + required_msg: El campo dirección es obligatorio + validators: caracteresMaximos128 + + cuenta{codigo_postal}: + required: Yes + required_msg: El campo código postal es obligatorio + validators: caracteresMaximos20 + + cuenta{fk_tipoiva_id}: + required: Yes + required_msg: El campo Tipo IVA es obligatorio + validators: validarNumero + + cuenta{fk_provincia_id}: + required: Yes + required_msg: El campo Provincia es obligatorio + validators: validarNumero + + +caracteresMaximos128: + class: sfStringValidator + param: + max: 128 + max_error: La maxima cantidad de caracteres permitida es de 128 + +caracteresMaximos255: + class: sfStringValidator + param: + max: 255 + max_error: La maxima cantidad de caracteres permitida es de 255 + +caracteresMaximos20: + class: sfStringValidator + param: + max: 20 + max_error: La maxima cantidad de caracteres permitida es de 255 + + +validarNumero: + class: sfNumberValidator + param: + nan_error: Por favor ingrese un valor númerico + min: 0 + min_error: El número debe ser positivo + Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/alumno/validate/grabarCuenta.yml ___________________________________________________________________ Name: svn:keywords + Id Date Author Rev URL

1 0

SVN Alba r4285 - in prosistem/alba/trunk/alba/apps/principal: modules/ciclolectivo/actions modules/ciclolectivo/templates modules/seguridad/actions modules/turnos/actions modules/turnos/config modules/turnos/templates modules/turnos/validate templates
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: ftoledo Date: 2007-02-23 13:54:12 -0300 (Fri, 23 Feb 2007) New Revision: 4285 Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/cambiarSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_fin.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_inicio.php prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml prosistem/alba/trunk/alba/apps/principal/templates/layout.php Log: validando ciclo lectivo y turnos 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-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/actions/actions.class.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -254,7 +254,23 @@ return $this->redirect($this->getRequestParameter('referer', '@homepage')); } - + + /** + * Elimino el ciclo lectivo si es el actual + * el usuario debe quedar con ciclolectivo "No seleccionado" + */ + public function executeDelete () { + + $this->ciclolectivo = CiclolectivoPeer::retrieveByPk($this->getRequestParameter('id')); + $this->forward404Unless($this->ciclolectivo); + + $this->deleteCiclolectivo($this->ciclolectivo); + if ($this->getUser()->getAttribute('fk_ciclolectivo_id') == $this->getRequestParameter('id')) { + $this->getUser()->setAttribute('fk_ciclolectivo_id',0); + $this->getUser()->setAttribute('ciclolectivo_descripcion','No seleccionado'); + } + return $this->redirect('ciclolectivo/list'); + } } -?> +?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/cambiarSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/cambiarSuccess.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/ciclolectivo/templates/cambiarSuccess.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -1,12 +1,16 @@ <?php use_helper('Object')?> -<?php echo form_tag('ciclolectivo/actual')?> +<?php if (count($cicloslectivos) != 0) :?> + <?php echo form_tag('ciclolectivo/actual')?> - <div align="center">Seleccione el Ciclo Lectivo para administrar - <br><br> - <?php echo select_tag('ciclolectivo',objects_for_select($cicloslectivos,'getId','getDescripcion',$sf_user->getAttribute('fk_ciclolectivo_id')))?> - <?php echo input_hidden_tag('referer', $referer) ?> - <br><br> - <?php echo submit_tag('Seleccionar')?> - </div> - -</form> \ No newline at end of file + <div align="center">Seleccione el Ciclo Lectivo para administrar + <br><br> + <?php echo select_tag('ciclolectivo',objects_for_select($cicloslectivos,'getId','getDescripcion',$sf_user->getAttribute('fk_ciclolectivo_id')))?> + <?php echo input_hidden_tag('referer', $referer) ?> + <br><br> + <?php echo submit_tag('Seleccionar')?> + </div> + + </form> +<?php else: ?> + <div>Todavía no ha creado un Ciclo Lectivo?. Haga click <?php echo link_to('aquí','ciclolectivo/list')?>.</div> +<?php endif;?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/seguridad/actions/actions.class.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -1,4 +1,4 @@ -<?php +<?php /** * This file is part of Alba. * @@ -22,8 +22,8 @@ * Seguridad 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 @@ -105,8 +105,10 @@ return sfView::SUCCESS; } } - else + else { + $this->referer = $this->getRequest()->getReferer(); $this->getRequest()->getParameterHolder()->set('referer', $this->getRequest()->getReferer()); + } } /* cierre de session */ 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-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/actions/actions.class.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -29,9 +29,7 @@ * @filesource * @license GPL */ - -class turnosActions extends autoturnosActions -{ +class turnosActions extends autoturnosActions { public function preExecute() { $this->vista = $this->getRequestParameter('vista'); } @@ -43,7 +41,6 @@ function saveTurnos($turno) { $turno->setFkCiclolectivoId($this->getUser()->getAttribute('fk_ciclolectivo_id')); $turno->save(); - } protected function updateTurnosFromRequest() { @@ -62,51 +59,14 @@ } if (isset($turnos['hora_fin'])) { - $this->turnos->setHoraFin($turnos['hora_fin']); + $this->turnos->setHoraFin($turnos['hora_fin']); } - } - + } function _add_zeros($string, $strlen) { - if ($strlen > strlen($string)) { - for ($x = strlen($string); $x < $strlen; $x++) { + if ($strlen > strlen($string)) + for ($x = strlen($string); $x < $strlen; $x++) $string = '0' . $string; - } - } return $string; } - - public function executeEdit () - { - $this->turnos = $this->getTurnosOrCreate(); - $this->turnos->setFkCiclolectivoId($this->getUser()->getAttribute('fk_ciclolectivo_id')); - if ($this->getRequest()->getMethod() == sfRequest::POST) - { - $this->turnos = $this->getTurnosOrCreate(); - - $this->updateTurnosFromRequest(); - - $this->saveTurnos($this->turnos); - - $this->setFlash('notice', 'Your modifications have been saved'); - - if ($this->getRequestParameter('save_and_add')) - { - return $this->redirect('turnos/create'); - } - else - { - return $this->redirect('turnos/edit?id='.$this->turnos->getId()); - } - } - else - { - // add javascripts - $this->getResponse()->addJavascript('/sf/js/prototype/prototype'); - $this->getResponse()->addJavascript('/sf/js/sf_admin/collapse'); - } - } - - } - ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/config/generator.yml 2007-02-23 16:54:12 UTC (rev 4285) @@ -13,7 +13,6 @@ list: title: Listado de Turnos display: [=descripcion, hora_inicio, hora_fin ] - object_actions: - _edit: - - _delete: - \ No newline at end of file + _edit: - + _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_fin.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_fin.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_fin.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -1 +1 @@ -<?echo select_time_tag("turnos[hora_fin]", $turnos->getHoraFin(), array('include_second' => false, '12hour_time' => true));?> \ No newline at end of file +<?php echo select_time_tag("turnos[hora_fin]", $turnos->getHoraFin(), array('include_second' => false, '12hour_time' => true));?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_inicio.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_inicio.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/templates/_hora_inicio.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -1 +1 @@ -<?echo select_time_tag("turnos[hora_inicio]", $turnos->getHoraInicio(), array('include_second' => false, '12hour_time' => true));?> \ No newline at end of file +<?php echo select_time_tag("turnos[hora_inicio]", $turnos->getHoraInicio(), array('include_second' => false, '12hour_time' => true));?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/modules/turnos/validate/edit.yml 2007-02-23 16:54:12 UTC (rev 4285) @@ -28,5 +28,3 @@ param: max: 255 max_error: La maxima cantidad de caracteres permitida es de 255 - - Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 16:09:55 UTC (rev 4284) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 16:54:12 UTC (rev 4285) @@ -136,8 +136,11 @@ ?> </div> <?php if ($sf_user->isAuthenticated() && $sf_user->getAttribute('fk_ciclolectivo_id') == 0):?> - <div class="form-errors">No tiene un ciclo lectivo seleccionado.<br/> - Éste valor es requerido para algunos módulos, por favor seleccione uno. + <div class="form-errors"> + <ul> + <li>No tiene un ciclo lectivo seleccionado. Éste valor es requerido para algunos módulos, por favor seleccione uno. + </li> + </ul> </div> <?php endif;?> <br/>

1 0

SVN Alba r4284 - prosistem/alba/trunk/alba/apps/principal/templates
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: ftoledo Date: 2007-02-23 13:09:55 -0300 (Fri, 23 Feb 2007) New Revision: 4284 Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php Log: salto de linea Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 16:06:52 UTC (rev 4283) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 16:09:55 UTC (rev 4284) @@ -135,13 +135,12 @@ } ?> </div> - <br> <?php if ($sf_user->isAuthenticated() && $sf_user->getAttribute('fk_ciclolectivo_id') == 0):?> <div class="form-errors">No tiene un ciclo lectivo seleccionado.<br/> Éste valor es requerido para algunos módulos, por favor seleccione uno. </div> <?php endif;?> - + <br/> <div id="content"><?php echo $content ?></div> </td> <td width="17" class="fder"> </td>

1 0

SVN Alba r4283 - prosistem/alba/trunk/alba/apps/principal/templates
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: ftoledo Date: 2007-02-23 13:06:52 -0300 (Fri, 23 Feb 2007) New Revision: 4283 Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php Log: warinig para cuando el ciclo lectivo no esta seleccionado Modified: prosistem/alba/trunk/alba/apps/principal/templates/layout.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 14:54:23 UTC (rev 4282) +++ prosistem/alba/trunk/alba/apps/principal/templates/layout.php 2007-02-23 16:06:52 UTC (rev 4283) @@ -3,160 +3,157 @@ if(!isset($vista)){ $vista=""; } - -if($vista == "noMuestraMenu") { - echo $content; -} else { ?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-200000126/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head> -<?php echo include_http_metas() ?> -<?php echo include_metas() ?> -<?php echo include_title() ?> +<?php if($vista == "noMuestraMenu"): ?> + <?php echo $content; ?> +<?php else: ?> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2000/REC-xhtml1-200000126/DTD/xhtml1-transitional.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> -<link rel="stylesheet" type="text/css" href="<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.MENU_THEME.'/theme.css' ?>"/> -<link rel="shortcut icon" href="/favicon.ico" /> + <?php echo include_http_metas() ?> + <?php echo include_metas() ?> + <?php echo include_title() ?> -<style type="text/css"> -.fdown { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index3_5x2.png"?>); -} -.fmedio { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fmedio.png"?>); -} -.ftop { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index3_1x4.png"?>); -} -.fmenu { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fmenu.png"?>); -} -td { - font-family: Arial, Helvetica, sans-serif; - font-size: 11px; -} -.fizq { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fizq.png"?>); -} -.fizq-menu { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fizq-menu.png"?>); -} -.menuimg { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index_2x1.png"?>); -} -.fder { - background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fder.png"?>); -} -</style> + <link rel="stylesheet" type="text/css" href="<?echo sfContext::getInstance()->getRequest()->getRelativeUrlRoot() . '/js/jsmenu/themes/'.MENU_THEME.'/theme.css' ?>"/> + <link rel="shortcut icon" href="/favicon.ico" /> -<?php - if($vista == "imprimir") { -?><link rel="stylesheet" type="text/css" href="/~josx/alba/css/impresion.css" /><? + <style type="text/css"> + .fdown { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index3_5x2.png"?>); } -?> + .fmedio { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fmedio.png"?>); + } + .ftop { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index3_1x4.png"?>); + } + .fmenu { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fmenu.png"?>); + } + td { + font-family: Arial, Helvetica, sans-serif; + font-size: 11px; + } + .fizq { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fizq.png"?>); + } + .fizq-menu { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fizq-menu.png"?>); + } + .menuimg { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/index_2x1.png"?>); + } + .fder { + background-image: url(<?=sfContext::getInstance()->getRequest()->getRelativeUrlRoot()."/images/gui/fder.png"?>); + } + </style> -</head> -<body> + <?php if($vista == "imprimir") :?> + <link rel="stylesheet" type="text/css" href="/~josx/alba/css/impresion.css" /> + <? endif;?> -<?php - if($vista == "imprimir") { - echo $content; - } else { -?> + </head> + <body> - <table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr valign="top"> - <td colspan="2" class="fmedio"> - <table cellpadding="0" cellspacing="0" width="100%"> - <tr> - <td class="fmedio"><?=image_tag("gui/index_1x1.png", array ( 'width' => '758' , 'heigth' => '77' ) )?></td> - <td class="fmedio" align="right"> - <?php if($sf_user->isAuthenticated() == true): ?> + <?php if($vista == "imprimir") :?> + <?php echo $content; ?> + <?php else: ?> + <table width="100%" border="0" cellpadding="0" cellspacing="0"> + <tr valign="top"> + <td colspan="2" class="fmedio"> + <table cellpadding="0" cellspacing="0" width="100%"> + <tr> + <td class="fmedio"><?=image_tag("gui/index_1x1.png", array ( 'width' => '758' , 'heigth' => '77' ) )?></td> + <td class="fmedio" align="right"> + <?php if($sf_user->isAuthenticated() == true): ?> - <table class="user-info"> - <tr> - <td nowrap="nowrap">Bienvenido, <a href="#" onmouseover="this.T_BGCOLOR='#d3e3f6';this.T_SHADOWWIDTH=3;this.T_FONTCOLOR='blue';this.T_BORDERWIDTH=2;this.T_BORDERCOLOR='#000000'; return escape('Organización: <?echo $sf_user->getAttribute("organizacion_nombre")?> ' )"><?php echo $sf_user->getAttribute('usuario')?></a> - <?php if (SF_DEBUG) - echo ' #'. $sf_user->getAttribute('id'); - ?> - </td> - </tr> - <tr> - <td nowrap="nowrap"><?php echo link_to($sf_user->getAttribute('establecimiento_nombre'),'establecimiento/cambiar')?> - <?php if (SF_DEBUG) - echo ' #'. $sf_user->getAttribute('fk_establecimiento_id'); - ?> - </td> - </tr> - <tr> - <td nowrap="nowrap">Ciclo: <?php echo link_to($sf_user->getAttribute('ciclolectivo_descripcion'),'ciclolectivo/cambiar')?> - <?php if (SF_DEBUG) - echo ' #'. $sf_user->getAttribute('fk_ciclolectivo_id'); - ?> - </td> - </tr> - - </table> - <?php else: ?> - Bienvenido, Anónimo - <?php endif; ?> - </td> - </tr> - </table> - </td> - - <td><?=image_tag("gui/index_1x2.png", array ( 'width' => '17' , 'heigth' => '77' ) )?></td> - </tr> + <table class="user-info"> + <tr> + <td nowrap="nowrap">Bienvenido, <a href="#" onmouseover="this.T_BGCOLOR='#d3e3f6';this.T_SHADOWWIDTH=3;this.T_FONTCOLOR='blue';this.T_BORDERWIDTH=2;this.T_BORDERCOLOR='#000000'; return escape('Organización: <?echo $sf_user->getAttribute("organizacion_nombre")?> ' )"><?php echo $sf_user->getAttribute('usuario')?></a> + <?php if (SF_DEBUG) + echo ' #'. $sf_user->getAttribute('id'); + ?> + </td> + </tr> + <tr> + <td nowrap="nowrap"><?php echo link_to($sf_user->getAttribute('establecimiento_nombre'),'establecimiento/cambiar')?> + <?php if (SF_DEBUG) + echo ' #'. $sf_user->getAttribute('fk_establecimiento_id'); + ?> + </td> + </tr> + <tr> + <td nowrap="nowrap">Ciclo: <?php echo link_to($sf_user->getAttribute('ciclolectivo_descripcion'),'ciclolectivo/cambiar')?> + <?php if (SF_DEBUG) + echo ' #'. $sf_user->getAttribute('fk_ciclolectivo_id'); + ?> + </td> + </tr> + + </table> + <?php else: ?> + Bienvenido, Anónimo + <?php endif; ?> + </td> + </tr> + </table> + </td> + + <td><?php echo image_tag("gui/index_1x2.png", array ( 'width' => '17' , 'heigth' => '77' ) )?></td> + </tr> - <tr valign="top"> - <td class="fizq-menu" width="1%"> </td> - <td colspan="1" class="fmenu"><? - if($sf_user->isAuthenticated() == true) { - include("menu.php"); - } - ?> - <div id="menu" align="right"> - <? $uri = sfRouting::getInstance()->getCurrentInternalUri(); - $vista_var = "vista=imprimir"; - $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> - + <tr valign="top"> + <td class="fizq-menu" width="1%"> </td> + <td colspan="1" class="fmenu"><? + if($sf_user->isAuthenticated() == true) { + include("menu.php"); + } + ?> + <div id="menu" align="right"> + <?php $uri = sfRouting::getInstance()->getCurrentInternalUri(); + $vista_var = "vista=imprimir"; + $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><?php echo image_tag("gui/index_2x2.png", array ( 'width' => '17' , 'heigth' => '35' ) )?></td> + </tr> + <tr valign="top"> + <td width="33" class="fizq"> </td> + <td width="959"> + <div id="cabecera" align="center"> + <?php + if($sf_user->isAuthenticated() != true) { + if ($sf_params->get('module') != 'seguridad' && $sf_params->get('action') !='login') { + include_partial('seguridad/login', array('sf_params' => $sf_params, 'error_inicio_sesion' => @$error_inicio_sesion)); - <td><?=image_tag("gui/index_2x2.png", array ( 'width' => '17' , 'heigth' => '35' ) )?></td> - - - </tr> - - - <tr valign="top"> - <td width="33" class="fizq"> </td> - <td width="959"> -<div id="cabecera" align="center"> -<?php - if($sf_user->isAuthenticated() != true) { - if ($sf_params->get('module') != 'seguridad' && $sf_params->get('action') !='login') { - include_partial('seguridad/login', array('sf_params' => $sf_params, 'error_inicio_sesion' => @$error_inicio_sesion)); - - } - } -?></div><br><div id="content"><?php echo $content ?></div> - </td> - <td width="17" class="fder"> </td> - </tr> - <tr valign="top"> - <td><?=image_tag("gui/index3_5x1.png", array ( 'width' => '33' , 'heigth' => '22' ) )?></td> - <td class="fdown"> </td> - <td><?=image_tag("gui/index3_5x3.png", array ( 'width' => '17' , 'heigth' => '20' ) )?></td> - </tr> - </table> - -<? } ?> -</body> -<? echo javascript_include_tag('varios/wz_tooltip.js'); ?> -</html> -<? } ?> \ No newline at end of file + } + } + ?> + </div> + <br> + <?php if ($sf_user->isAuthenticated() && $sf_user->getAttribute('fk_ciclolectivo_id') == 0):?> + <div class="form-errors">No tiene un ciclo lectivo seleccionado.<br/> + Éste valor es requerido para algunos módulos, por favor seleccione uno. + </div> + <?php endif;?> + + <div id="content"><?php echo $content ?></div> + </td> + <td width="17" class="fder"> </td> + </tr> + <tr valign="top"> + <td><?php echo image_tag("gui/index3_5x1.png", array ( 'width' => '33' , 'heigth' => '22' ) )?></td> + <td class="fdown"> </td> + <td><?php echo image_tag("gui/index3_5x3.png", array ( 'width' => '17' , 'heigth' => '20' ) )?></td> + </tr> + </table> + <?php endif; ?> + </body> + <?php echo javascript_include_tag('varios/wz_tooltip.js'); ?> + </html> +<? endif; ?> \ No newline at end of file

1 0

SVN Alba r4282 - in prosistem/alba/trunk/alba/apps/principal/modules/alumno: actions templates
by commits＠pressenter.com.ar 23 Feb '07

23 Feb '07

Author: josx Date: 2007-02-23 11:54:23 -0300 (Fri, 23 Feb 2007) New Revision: 4282 Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php Log: Arregle un error de codigo de carga de alumnos 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-02-22 22:58:15 UTC (rev 4281) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-02-23 14:54:23 UTC (rev 4282) @@ -23,8 +23,8 @@ * alumno actions. * * @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 Modified: prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2007-02-22 22:58:15 UTC (rev 4281) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/templates/editSuccess.php 2007-02-23 14:54:23 UTC (rev 4282) @@ -1,5 +1,5 @@ <?php - if(isset($datosCuenta)) { + if(isset($datosCuenta) and $datosCuenta) { ?> <script type="text/javascript"> function completaDatos() @@ -197,7 +197,7 @@ <h2><?php echo __('Donde vive') ?></h2> <br> <?php - if(isset($datosCuenta)) { + if(isset($datosCuenta) and $datosCuenta) { echo button_to("Cargar datos de la cuenta", "#", array("class" => "sf_admin_action_sava", "onClick" => "javascript:completaDatos()")); } ?>

1 0

[Pressenter - SVN Alba] #141: Error en la instalacion automatica
by Pressenter - SVN Alba 22 Feb '07

22 Feb '07

#141: Error en la instalacion automatica ----------------------+----------------------------------------------------- Reporter: dobetko | Owner: somebody Type: defecto | Status: new Priority: muy alta | Milestone: Component: alba | Version: Severity: critica | Keywords: ----------------------+----------------------------------------------------- luego de la instalacion automatica al entrar a principal_dev.php de una pagina en blanco y en index.php se ve la pantalla de login pero al ingresar admin admin devuelve esto... Not Found The requested URL /public_html/seguridad/login was not found on this server. -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/141> Pressenter - SVN Alba <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 1

SVN Alba r4262 - prosistem/alba/trunk/alba/doc
by commits＠pressenter.com.ar 21 Feb '07

21 Feb '07

Author: verox Date: 2007-02-21 18:27:39 -0300 (Wed, 21 Feb 2007) New Revision: 4262 Modified: prosistem/alba/trunk/alba/doc/manual.odt Log: Hasta el cap. 7 completo y mejorado. Modified: prosistem/alba/trunk/alba/doc/manual.odt =================================================================== (Binary files differ)

1 0