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

[Pressenter SVN Repo] #98: Errores con el modulo "tipo documento"
by Pressenter SVN Repo 15 Jan '07

15 Jan '07

#98: Errores con el modulo "tipo documento" --------------------------------+------------------------------------------- Reporter: vdifiore | Owner: somebody Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc Component: alba-tipodocumento | Version: 1.0b Severity: normal | Keywords: --------------------------------+------------------------------------------- El modulo '''tipodocumento''' no aparece en los menues. Por otro lado la tabla esta vacía -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/98> Pressenter SVN Repo <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 2

SVN Alba r4009 - prosistem/alba/trunk/alba/data/sql
by commits＠pressenter.com.ar 15 Jan '07

15 Jan '07

Author: hsanchez Date: 2007-01-15 11:52:25 -0300 (Mon, 15 Jan 2007) New Revision: 4009 Added: prosistem/alba/trunk/alba/data/sql/update_1.0b_to_1.0rc.sql Log: Archivo para el UPDATE SQL -Update del autoincremente -Insert para tipo de documentos - Ticket #98 Added: prosistem/alba/trunk/alba/data/sql/update_1.0b_to_1.0rc.sql =================================================================== --- prosistem/alba/trunk/alba/data/sql/update_1.0b_to_1.0rc.sql 2007-01-15 13:50:45 UTC (rev 4008) +++ prosistem/alba/trunk/alba/data/sql/update_1.0b_to_1.0rc.sql 2007-01-15 14:52:25 UTC (rev 4009) @@ -0,0 +1,4 @@ +ALTER TABLE `tipoiva` CHANGE `id` `id` INT( 11 ) NOT NULL AUTO_INCREMENT ; + +INSERT INTO `tipodocumento` ( `id` , `descripcion` , `orden` , `nombre` ) VALUES (NULL , 'Documento Nacional de Identidad', '0', 'DNI'), (NULL , 'Libreta de Enrolamiento', '0', 'LE'); +INSERT INTO `tipodocumento` ( `id` , `descripcion` , `orden` , `nombre` ) VALUES (NULL , 'Cedula de Identidad', '0', 'CI'), (NULL , 'Pasaporte', '0', 'Pasaporte'); \ No newline at end of file Property changes on: prosistem/alba/trunk/alba/data/sql/update_1.0b_to_1.0rc.sql ___________________________________________________________________ Name: svn:keywords + Id Date Author Rev URL

1 0

Re: [Pressenter SVN Repo] #79: Error ingreso nueva categoría IVA.
by Pressenter SVN Repo 15 Jan '07

15 Jan '07

#79: Error ingreso nueva categoría IVA. --------------------------+------------------------------------------------- Reporter: verox | Owner: somebody Type: defecto | Status: closed Priority: alta | Milestone: Component: alba-tipoiva | Version: 1.0rc Severity: normal | Resolution: fixed Keywords: | --------------------------+------------------------------------------------- Changes (by hsanchez): * status: new => closed * version: 1.0b => 1.0rc * resolution: => fixed Comment: Corregido, agregué el autoincremente al id. -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/79#comment:2> Pressenter SVN Repo <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 0

SVN Alba r4008 - in prosistem/alba/trunk/alba/apps/principal/modules/asistencia: actions templates
by commits＠pressenter.com.ar 15 Jan '07

15 Jan '07

Author: hsanchez Date: 2007-01-15 10:50:45 -0300 (Mon, 15 Jan 2007) New Revision: 4008 Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php Log: Agregando datos para el boton print 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-12 19:07:43 UTC (rev 4007) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php 2007-01-15 13:50:45 UTC (rev 4008) @@ -201,10 +201,12 @@ * Accion para mostrar los datos cambiados en el form */ public function executeMostrar() { - $vista_id = $this->getRequestParameter('vistas'); + $vista_id = $this->getRequestParameter('vistas'); $fechainicio = str_replace("/","-",$this->getRequestParameter('fechainicio')); - return $this->forward('asistencia','index',"vista_id=$vista_id&fechainicio=$fechainicio"); - + //die($this->getRequestParameter('fechainicio')); + //list($y, $m, $d) = split("[/. -]",$this->getRequestParameter('fechainicio')); + //$fechainicio = "$d/$m/$y"; + return $this->forward('asistencia','index',"vista_id=$vista_id&fechainicio=$fechainicio"); } public function handleErrorMostrar(){ @@ -279,9 +281,6 @@ throw $e; } } - - - return $this->redirect($destino); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php 2007-01-12 19:07:43 UTC (rev 4007) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php 2007-01-15 13:50:45 UTC (rev 4008) @@ -24,9 +24,9 @@ <?php echo select_tag('division_id', options_for_select($optionsDivision, $division_id)); ?> </td> <td> - <?php echo label_for('fecha', __('Fecha Inicio:'), 'class="required" '); ?> + <?php echo label_for('fecha', __('Fecha Inicio:'), 'class="required" '); ?> </td> - <td> + <td> <?php echo zz_input_date_tag('fechainicio',$fechainicio, array ( 'rich' => true,'withtime' => true, 'calendar_button_img' => '/sf/images/sf_admin/date.png', @@ -119,7 +119,17 @@ <ul class="sf_admin_actions"><li> <?php echo submit_tag(__('Grabar'), array ('name' => 'Grabar','class' => 'sf_admin_action_save')) ?> </form> - <?php echo submit_tag(__('Imprimir'), array ('name' => 'Imprimir','class' => 'sf_admin_action_print')) ?> + <?php + echo form_tag('asistencia/mostrar', 'id=sf_admin_edit_form name=sf_admin_edit_form multipart=true'); + echo input_hidden_tag('division_id', $division_id); + list($y, $m, $d) = split("[/. -]",$fechainicio); + echo input_hidden_tag('fechainicio', "$d/$m/$y"); + echo input_hidden_tag('vistas', $vista_id); + if($alumno_id >= 0) + echo input_hidden_tag('alumno_id', $alumno_id); + echo submit_tag(__('Imprimir'), array ('name' => 'Imprimir','class' => 'sf_admin_action_print')); + ?> + </form> </li></ul> </div> <?php }?>

1 0

Re: [Pressenter SVN Repo] #60: Instalador
by Pressenter SVN Repo 15 Jan '07

15 Jan '07

#60: Instalador ----------------------------+----------------------------------------------- Reporter: josx | Owner: anonymous Type: defecto | Status: closed Priority: normal | Milestone: version 1.0rc Component: alba-installer | Version: Severity: normal | Resolution: fixed Keywords: | ----------------------------+----------------------------------------------- Changes (by josx): * status: assigned => closed * resolution: => fixed Comment: Ya funciona en windows con xampp. -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/60#comment:7> Pressenter SVN Repo <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 0

SVN Alba r4007 - prosistem/alba/trunk
by commits＠pressenter.com.ar 12 Jan '07

12 Jan '07

Author: josx Date: 2007-01-12 16:07:43 -0300 (Fri, 12 Jan 2007) New Revision: 4007 Modified: prosistem/alba/trunk/index.php Log: Modificaciones la instalador para soportar windows ( ticket #60 ) Modified: prosistem/alba/trunk/index.php =================================================================== --- prosistem/alba/trunk/index.php 2007-01-12 14:18:25 UTC (rev 4006) +++ prosistem/alba/trunk/index.php 2007-01-12 19:07:43 UTC (rev 4007) @@ -30,23 +30,24 @@ * @license GPL */ + define("OS_WINDOWS",((strtoupper(substr(PHP_OS,0,3))=='WIN'))?true:false); define("APACHE_REQUIRED_VERSION","2.0.0"); define("PHP_REQUIRED_VERSION","5.0.0"); define("MEMORY_LIMIT_REQUIRED", "16"); define("MYSQL_REQUIRED_VERSION","4.1.0"); - define("INSTALL_DIR", getcwd()."/"); + define("INSTALL_DIR", getcwd().DIRECTORY_SEPARATOR); - chdir("alba/"); - define("ALBA_PATH", getcwd()."/"); + chdir("alba".DIRECTORY_SEPARATOR); + define("ALBA_PATH", getcwd().DIRECTORY_SEPARATOR); define("INSTALL_COMPLETE_DIR",ALBA_PATH."log"); - define("INSTALL_COMPLETE_FILE",INSTALL_COMPLETE_DIR."/"."instalacion_completa"); + define("INSTALL_COMPLETE_FILE",INSTALL_COMPLETE_DIR.DIRECTORY_SEPARATOR."instalacion_completa"); - define("ALBA_WEB",ALBA_PATH."web/"); - define("CONFIG_PATH", ALBA_PATH."config/"); + define("ALBA_WEB",ALBA_PATH."web".DIRECTORY_SEPARATOR); + define("CONFIG_PATH", ALBA_PATH."config".DIRECTORY_SEPARATOR); define("APACHE_CONFIG_DIST", CONFIG_PATH."apache.conf.dist"); define("DATABASE_CONFIG_DIST", CONFIG_PATH."databases.yml.dist"); @@ -65,18 +66,24 @@ define("IMG_OK", "<img src='dist/".SYMFONY_DIR."/data/web/sf/images/sf_admin/save.png'>"); define("IMG_NOT_OK", "<img src='dist/".SYMFONY_DIR."/data/web/sf/images/sf_admin/delete.png'>"); - define("SQL_CREATE", ALBA_PATH."data/sql/alba_tablas.sql"); - define("SQL_INSERT", ALBA_PATH."data/sql/datos_desde_cero.sql"); + define("SQL_CREATE", ALBA_PATH."data".DIRECTORY_SEPARATOR."sql".DIRECTORY_SEPARATOR."alba_tablas.sql"); + define("SQL_INSERT", ALBA_PATH."data".DIRECTORY_SEPARATOR."sql".DIRECTORY_SEPARATOR."datos_desde_cero.sql"); define("CURRENT_WEB_DIR",dirname($_SERVER["PHP_SELF"])."/"); define("SYMFONY_WEB_DIR", "public_html"); - define("REDIRECT_URL","http://" . $_SERVER['SERVER_NAME'] . CURRENT_WEB_DIR.SYMFONY_WEB_DIR."/"); + define("SERVER","http://" . $_SERVER['SERVER_NAME'].CURRENT_WEB_DIR); + define("SYMFONY_WINDOWS_WEB_DIR","alba/web"); // directorio directo del web en alba + define("REDIRECT_URL",(OS_WINDOWS)?SERVER.SYMFONY_WINDOWS_WEB_DIR."/index.php":SERVER.SYMFONY_WEB_DIR."/"); - if(!file_exists(INSTALL_COMPLETE_FILE)) { + if(OS_WINDOWS) { + @unlink(ALBA_PATH.".htaccess"); + @unlink(INSTALL_DIR."dist/.htaccess"); + } + $f_phpversion = function_exists ("phpversion"); $f_apache_get_version = function_exists ("apache_get_version"); // $f_get_magic_quotes_gpc = function_exists ("get_magic_quotes_gpc"); @@ -470,21 +477,23 @@ $contenido_archivo = reemplzarArchivo(PROPEL_CONFIG_DIST,$aReemplazo); file_put_contents(PROPEL_CONFIG, $contenido_archivo); - //if ($_SERVER['WINDIR'] || $_SERVER['windir'] - // ver http://ar.php.net/manual/en/function.symlink.php para emulacion de symlinks en windows - @symlink(ALBA_WEB, INSTALL_DIR.SYMFONY_WEB_DIR); - $aReemplazo = Array('REWRITE_PATH' => CURRENT_WEB_DIR.SYMFONY_WEB_DIR); + _symlink(INSTALL_DIR."dist/".SYMFONY_DIR."/data/", ALBA_PATH."data/symfony"); + _symlink(INSTALL_DIR."dist/pake/", ALBA_PATH."lib/pake"); + _symlink(INSTALL_DIR."dist/phing.sandbox/", ALBA_PATH."lib/phing"); + _symlink(INSTALL_DIR."dist/".SYMFONY_DIR."/lib/", ALBA_PATH."lib/symfony"); + _symlink(INSTALL_DIR."alba/data/symfony/web/sf/", ALBA_WEB."sf"); + + + $rewrite_path = (OS_WINDOWS)?CURRENT_WEB_DIR.SYMFONY_WINDOWS_WEB_DIR:CURRENT_WEB_DIR.SYMFONY_WEB_DIR; + + if(!OS_WINDOWS) + _symlink(ALBA_WEB, INSTALL_DIR.SYMFONY_WEB_DIR); // crea nuevo link afuera de la estructura de alba + + $aReemplazo = Array('REWRITE_PATH' => $rewrite_path); $contenido_archivo = reemplzarArchivo(HTACCESS_DIST,$aReemplazo); file_put_contents(HTACCESS, $contenido_archivo); - - - @symlink(INSTALL_DIR."dist/".SYMFONY_DIR."/data/", ALBA_PATH."data/symfony"); - @symlink(INSTALL_DIR."dist/pake/", ALBA_PATH."lib/pake"); - @symlink(INSTALL_DIR."dist/phing.sandbox/", ALBA_PATH."lib/phing"); - @symlink(INSTALL_DIR."dist/".SYMFONY_DIR."/lib/", ALBA_PATH."lib/symfony"); - @symlink(INSTALL_DIR."alba/data/symfony/web/sf/", ALBA_WEB."sf"); - + touch(INSTALL_COMPLETE_FILE); return true; @@ -501,4 +510,42 @@ } +function _symlink( $target, $link ) { + if (OS_WINDOWS) { + @dircopy($target, $link); + } else { + @symlink($target,$link); + } +} + + +function dircopy($srcdir, $dstdir, $verbose = false) { + $num = 0; + if(!is_dir($dstdir)) mkdir($dstdir); + if($curdir = opendir($srcdir)) { + while($file = readdir($curdir)) { + if($file != '.' && $file != '..') { + $srcfile = $srcdir . DIRECTORY_SEPARATOR . $file; + $dstfile = $dstdir . DIRECTORY_SEPARATOR . $file; + if(is_file($srcfile)) { + if(is_file($dstfile)) $ow = filemtime($srcfile) - filemtime($dstfile); else $ow = 1; + if($ow > 0) { + if($verbose) echo "Copying '$srcfile' to '$dstfile'..."; + if(copy($srcfile, $dstfile)) { + touch($dstfile, filemtime($srcfile)); $num++; + if($verbose) echo "OK\n"; + } + else echo "Error: File '$srcfile' could not be copied!\n"; + } + } + else if(is_dir($srcfile)) { + $num += dircopy($srcfile, $dstfile, $verbose); + } + } + } + closedir($curdir); + } + return $num; +} + ?> \ No newline at end of file

1 0

[Pressenter SVN Repo] #97: GD no deberia ser Obligatorio
by Pressenter SVN Repo 12 Jan '07

12 Jan '07

#97: GD no deberia ser Obligatorio ----------------------------+----------------------------------------------- Reporter: josx | Owner: ftoledo Type: defecto | Status: new Priority: normal | Milestone: version 1.0rc Component: alba-installer | Version: 1.0b Severity: minor | Keywords: ----------------------------+----------------------------------------------- Primero que nada en la instalación no deberia ser obligatorio el uso de GD, ya que solo no podria visualizar los graficos. Además para complementar esto deberiamos chequear al mostrar los graficos generados con GD, si el en el servidor tiene GD y si no es asi no mostrarle nada. -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/97> Pressenter SVN Repo <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 1

SVN Alba r4006 - in prosistem/alba/trunk: . alba/apps/principal/modules/asistencia/actions alba/apps/principal/modules/asistencia/templates
by commits＠pressenter.com.ar 12 Jan '07

12 Jan '07

Author: josx Date: 2007-01-12 11:18:25 -0300 (Fri, 12 Jan 2007) New Revision: 4006 Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php prosistem/alba/trunk/index.php Log: GD no es mas obligatorio en la instalacion y ademas si no la tiene no muestra el grafico. (ticket #97) 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-12 13:54:04 UTC (rev 4005) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/actions/actions.class.php 2007-01-12 14:18:25 UTC (rev 4006) @@ -154,27 +154,32 @@ if($flag == 1) { - $aTitulo = array_keys($aTipoasistencias); - $aTitulo[] = "No Cargado"; + $aTitulo = array_keys($aTipoasistencias); + $aTitulo[] = "No Cargado"; - include "graph.php"; - putenv('GDFONTPATH=' . realpath(sfConfig::get('sf_lib_dir')."/font/")); - $graph = new graph(); - $graph->setProp("font","FreeSerifBold.ttf"); - $graph->setProp("keyfont","FreeSerifBold.ttf"); - $graph->setProp("showkey",true); - $graph->setProp("type","pie"); - $graph->setProp("showgrid",false); - $graph->setProp("key", $aTitulo); - $graph->setProp("keywidspc",-50); - $graph->setProp("keyinfo",2); - foreach($aPorcentajeAsistencia as $porcentaje) { - $graph->addPoint($porcentaje); - } - $graph->addPoint($dias-$tot); + if(array_search("gd", get_loaded_extensions())) { // Si no tiene cargado la GD no muestra el grafico - $graph->graphX(); - $graph->showGraph(sfConfig::get('sf_upload_dir_name').'/grafico_asistencias.png'); + include "graph.php"; + putenv('GDFONTPATH=' . realpath(sfConfig::get('sf_lib_dir')."/font/")); + $graph = new graph(); + $graph->setProp("font","FreeSerifBold.ttf"); + $graph->setProp("keyfont","FreeSerifBold.ttf"); + $graph->setProp("showkey",true); + $graph->setProp("type","pie"); + $graph->setProp("showgrid",false); + $graph->setProp("key", $aTitulo); + $graph->setProp("keywidspc",-50); + $graph->setProp("keyinfo",2); + foreach($aPorcentajeAsistencia as $porcentaje) { + $graph->addPoint($porcentaje); + } + $graph->addPoint($dias-$tot); + + $graph->graphX(); + $graph->showGraph(sfConfig::get('sf_upload_dir_name').'/grafico_asistencias.png'); + } + + } //print_r($optionsDivision); //Asignacion de variables para el template Modified: prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php 2007-01-12 13:54:04 UTC (rev 4005) +++ prosistem/alba/trunk/alba/apps/principal/modules/asistencia/templates/indexSuccess.php 2007-01-12 14:18:25 UTC (rev 4006) @@ -99,7 +99,7 @@ $sizeAsis = count($aDatos[$idx][$fecha]); echo input_tag("asistencia['$idx']['$fecha']", $aDatos["$idx"]["$fecha"], array('size' => $sizeAsis, 'maxlength' => $sizeAsis)); @$totales[$aDatos["$idx"]["$fecha"]]++; - $totalesAlumnos[$aDatos["$idx"]["$fecha"]]++; + @$totalesAlumnos[$aDatos["$idx"]["$fecha"]]++; } else { echo input_tag("asistencia['$idx']['$fecha']", "", array('size' => "2", 'maxlength' => "2")); } Modified: prosistem/alba/trunk/index.php =================================================================== --- prosistem/alba/trunk/index.php 2007-01-12 13:54:04 UTC (rev 4005) +++ prosistem/alba/trunk/index.php 2007-01-12 14:18:25 UTC (rev 4006) @@ -134,15 +134,7 @@ $msg_mysql_module = "No tiene instalado el modulo MYSQL en PHP"; } - -// .htacces en el dir web - -// sacar acceso a todos los dirs menos al web - -// chequear del apache si corre con AllowOverride All - - $hasErrors = false; $aError = array(); $aDb = array( 'server' => '', 'user' => '', 'password' => '', 'name' => '', 'createdb' => '' ) ; @@ -247,8 +239,8 @@ <tr class="sf_admin_row_0"> - <td>¿ Esta Instalado GD en PHP ?</td> - <td><?=($bool_gd)?IMG_OK:IMG_NOT_OK." (Necesitas instalar GD - http://www.php.net/manual/es/ref.image.php)";?></td> + <td>¿ Esta Instalado GD en PHP ? (optativo) </td> + <td><?=($bool_gd)?IMG_OK:IMG_NOT_OK." (Si queres ver los gráficos de estadísticas necesitas instalar GD - http://www.php.net/manual/es/ref.image.php)";?></td> </tr> <tr class="sf_admin_row_1"> @@ -295,7 +287,7 @@ </tr> </table> -<? if($bool_config AND $bool_upload AND $bool_log AND $bool_cache AND $bool_memory_limit AND $bool_apache_get_version AND $bool_phpversion AND $bool_gd AND $bool_mysql_module AND $bool_mod_rewrite) { ?> +<? if($bool_config AND $bool_upload AND $bool_log AND $bool_cache AND $bool_memory_limit AND $bool_apache_get_version AND $bool_phpversion AND $bool_mysql_module AND $bool_mod_rewrite) { ?> <?php if($hasErrors) { ?> <br><br>

1 0

SVN Alba r4005 - in prosistem/alba/trunk/alba/apps/principal/modules: actividad/actions alumno/actions cuenta/templates provincia/config tipodocumento/actions tipodocumento/config usuario/config
by commits＠pressenter.com.ar 12 Jan '07

12 Jan '07

Author: ftoledo Date: 2007-01-12 10:54:04 -0300 (Fri, 12 Jan 2007) New Revision: 4005 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/cuenta/templates/verCompletaSuccess.php prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/usuario/config/generator.yml Log: Ordenes x defecto 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-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/actividad/actions/actions.class.php 2007-01-12 13:54:04 UTC (rev 4005) @@ -30,11 +30,9 @@ * @license GPL */ -class actividadActions extends autoactividadActions -{ +class actividadActions extends autoactividadActions { protected function addFiltersCriteria (&$c) { $c->add(ActividadPeer::FK_ESTABLECIMIENTO_ID,$this->getUser()->getAttribute('fk_establecimiento_id')); - } protected function SaveActividad ($actividad) { @@ -42,6 +40,17 @@ $actividad->setFkEstablecimientoId($this->getUser()->getAttribute('fk_establecimiento_id')); $actividad->save(); } + protected function addSortCriteria (&$c) { + if ($sort_column = $this->getUser()->getAttribute('sort', 'nombre', 'sf_admin/actividad/sort')) { + $sort_column = Propel::getDB($c->getDbName())->quoteIdentifier($sort_column); + if ($this->getUser()->getAttribute('type', 'asc', 'sf_admin/actividad/sort') == 'asc') { + $c->addAscendingOrderByColumn($sort_column); + } + else { + $c->addDescendingOrderByColumn($sort_column); + } + } + } } -?> +?> \ No newline at end of file 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-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/alumno/actions/actions.class.php 2007-01-12 13:54:04 UTC (rev 4005) @@ -99,7 +99,17 @@ } - + protected function addSortCriteria (&$c) { + if ($sort_column = $this->getUser()->getAttribute('sort', null, 'sf_admin/alumno/sort')) { + $sort_column = Propel::getDB($c->getDbName())->quoteIdentifier($sort_column); + if ($this->getUser()->getAttribute('type', null, 'sf_admin/alumno/sort') == 'asc') { + $c->addAscendingOrderByColumn($sort_column); + } + else { + $c->addDescendingOrderByColumn($sort_column); + } + } + } } ?> Modified: prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/cuenta/templates/verCompletaSuccess.php 2007-01-12 13:54:04 UTC (rev 4005) @@ -135,7 +135,7 @@ <td><?echo $responsable->getDireccion();?></td> <td><?echo $responsable->getCiudad();?></td> <td><?echo $responsable->getRelacion();?></td> - <td><?echo $responsable->getAutorizacionRetiro();?></td> + <td><?echo $responsable->getAutorizacionRetiro() == 1 ? "Si" : "No";?></td> <td><?echo $responsable->getTelefono();?></td> <td> <ul class="sf_admin_td_actions"> Modified: prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml 2007-01-12 13:54:04 UTC (rev 4005) @@ -15,7 +15,7 @@ list: title: Listado de Provincias - display: [ =nombre_corto, nombre_largo, _pais ] + display: [ =nombre_corto, nombre_largo, _pais, orden ] object_actions: _edit: - _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/actions/actions.class.php 2007-01-12 13:54:04 UTC (rev 4005) @@ -31,6 +31,16 @@ * @license GPL */ -class tipodocumentoActions extends autotipodocumentoActions -{ +class tipodocumentoActions extends autotipodocumentoActions { + protected function addSortCriteria (&$c) { + if ($sort_column = $this->getUser()->getAttribute('sort', 'nombre', 'sf_admin/tipodocumento/sort')) { + $sort_column = Propel::getDB($c->getDbName())->quoteIdentifier($sort_column); + if ($this->getUser()->getAttribute('type', 'asc', 'sf_admin/tipodocumento/sort') == 'asc') { + $c->addAscendingOrderByColumn($sort_column); + } + else { + $c->addDescendingOrderByColumn($sort_column); + } + } + } } Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml 2007-01-12 13:54:04 UTC (rev 4005) @@ -7,11 +7,9 @@ id: { name: identificador } nombre: { name: Nombre , params: size=64 } descripcion: { name: Descripción , params: size=64 } - edit: title: Modificar Tipo de Documento display: [nombre, descripcion, orden] - list: display: [=nombre, descripcion, orden] title: Listado de Tipo de Documento Modified: prosistem/alba/trunk/alba/apps/principal/modules/usuario/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/usuario/config/generator.yml 2007-01-11 18:07:18 UTC (rev 4004) +++ prosistem/alba/trunk/alba/apps/principal/modules/usuario/config/generator.yml 2007-01-12 13:54:04 UTC (rev 4005) @@ -19,7 +19,10 @@ edit: title: Modificar Usuario - display: [usuario, _clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, seguridad_pregunta, seguridad_respuesta, fk_establecimiento_id] + display: + "General": [usuario, _clave, correo_publico, email, activo, fecha_creado, fecha_actualizado, fk_establecimiento_id] + "Si olvida su clave se le realizará un pregunta se seguridad" : [seguridad_pregunta] + "Deberá ingresar una respuesta para validarla " : [seguridad_respuesta] fields: fecha_creado: {type: plain} fecha_actualizado: {type: plain }

1 0

Re: [Pressenter SVN Repo] #92: El listado de resp. visto desde cuenta, informa "1" en vez de "SI".
by Pressenter SVN Repo 11 Jan '07

11 Jan '07

#92: El listado de resp. visto desde cuenta, informa "1" en vez de "SI". -------------------------+-------------------------------------------------- Reporter: verox | Owner: somebody Type: defecto | Status: closed Priority: normal | Milestone: version 1.0rc Component: alba-cuenta | Version: 1.0b Severity: normal | Resolution: fixed Keywords: | -------------------------+-------------------------------------------------- Changes (by ftoledo): * status: new => closed * resolution: => fixed * milestone: => version 1.0rc Comment: Se muestra ''Si'' en vez del 1 y ''No'' en vez de 0. -- Ticket URL: <http://alba.pressenter.com.ar/cgi-bin/trac.cgi/ticket/92#comment:1> Pressenter SVN Repo <http://wwww.proyectoalba.com.ar/> Proyecto Alba

1 0