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

SVN Alba r5179 - in prosistem/alba/trunk/alba/web/instalar: . images
by commits＠pressenter.com.ar 26 Sep '07

26 Sep '07

Author: ftoledo Date: 2007-09-26 18:59:51 -0300 (Wed, 26 Sep 2007) New Revision: 5179 Modified: prosistem/alba/trunk/alba/web/instalar/funciones.php prosistem/alba/trunk/alba/web/instalar/images/estilos.css prosistem/alba/trunk/alba/web/instalar/instalar.php prosistem/alba/trunk/alba/web/instalar/paso2.php prosistem/alba/trunk/alba/web/instalar/paso3.php prosistem/alba/trunk/alba/web/instalar/paso4.php prosistem/alba/trunk/alba/web/instalar/paso6.php Log: arreglos varios de la instalacion mas log para depurar Modified: prosistem/alba/trunk/alba/web/instalar/funciones.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/funciones.php 2007-09-26 20:26:29 UTC (rev 5178) +++ prosistem/alba/trunk/alba/web/instalar/funciones.php 2007-09-26 21:59:51 UTC (rev 5179) @@ -33,7 +33,6 @@ } function DebugLog($str,$modo = 'I') { - date_default_timezone_set('America/Argentina/Buenos_Aires'); $log = AlbaPath() . DIRECTORY_SEPARATOR . "log" . DIRECTORY_SEPARATOR . "install.log"; $fp = fopen($log,"a+"); if ($fp) { @@ -117,7 +116,7 @@ $yml = AlbaPath() . DIRECTORY_SEPARATOR . "config" . DIRECTORY_SEPARATOR . "databases.yml"; DebugLog ("generate_databases_yml(): generando archivo de conexion $yml"); if ($fp = @fopen ($yml,'w')) { - fwrite ($fp,"#Archivo generando por el instalador " . date('m/d/Y H:i:s') . "\n"); + fwrite ($fp,"# Archivo generado por el instalador de Alba " . date('m/d/Y H:i:s') . "\n"); fwrite ($fp,"all:\n"); fwrite ($fp," propel:\n"); fwrite ($fp," class: sfPropelDatabase\n"); @@ -151,8 +150,58 @@ * caga los datos ejemplo/minima */ function crear_base_modelo($filesql, $host, $user, $pass, $db) { - DebugLog("crear_base_modelo(): Creado base de datos modelo"); - return executeDump(AlbaPath() . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR .$filesql, $host, $user, $pass, $db); + DebugLog("crear_base_modelo(): Creado base de datos modelo: $filesql"); + if ($filesql == "") + return false; + else + return executeDump(AlbaPath() . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR .$filesql, $host, $user, $pass, $db); } + +/** +* helpers para comprobaciones +*/ +function check_php() { + DebugLog ("Comprobando version de php"); + return version_compare(phpversion(),'5.0.0','>='); +} +function check_mysql() { + DebugLog("Comprobando extension de mysql"); + return extension_loaded('mysql'); +} +function check_memorylimit() { + DebugLog("Comprobando limite de moeria de php"); + $limite = ini_get('memory_limit'); + return ($limite >= 32); +} +function check_magicquotes() { + DebugLog("Comprobando magic_quotes"); + return !get_magic_quotes_gpc(); +} +function check_gd() { + DebugLog("Comprobando extension GD de php"); + return extension_loaded('gd'); +} +function check_apache2() { + DebugLog("Comprobando version de apache"); + $version = 0; + preg_match('!Apache/(.*) !U', apache_get_version(), $version); + return version_compare($version[1],'2.0.0','>='); + +} +function check_rewrite() { + DebugLog("Comprobando mod_rewrite"); + $modulos = apache_get_modules(); + if(count($modulos)>0) { + $res = array_search('mod_rewrite', $modulos); + if($res === false) { + return false; + } else { + return true; + } + } else { + return false; + } +} + ?> \ No newline at end of file Modified: prosistem/alba/trunk/alba/web/instalar/images/estilos.css =================================================================== --- prosistem/alba/trunk/alba/web/instalar/images/estilos.css 2007-09-26 20:26:29 UTC (rev 5178) +++ prosistem/alba/trunk/alba/web/instalar/images/estilos.css 2007-09-26 21:59:51 UTC (rev 5179) @@ -5,6 +5,9 @@ div .error { color: red; } +div .ok { + color: green; +} #contenido { padding-left: 25px; Modified: prosistem/alba/trunk/alba/web/instalar/instalar.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/instalar.php 2007-09-26 20:26:29 UTC (rev 5178) +++ prosistem/alba/trunk/alba/web/instalar/instalar.php 2007-09-26 21:59:51 UTC (rev 5179) @@ -30,6 +30,8 @@ session_start(); +date_default_timezone_set('America/Argentina/Buenos_Aires'); + define ('ALBA_INSTALLER',1); define ('IMG_OK','<img src="images/ok.png" title="Correcto" alt="Correcto">'); @@ -68,6 +70,7 @@ <div id="contenido"> <?php if (file_exists(AlbaPath() . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR .'databases.yml')): ?> <?php $error_flag = true;?> + <?php DebugLog("Ya existe un archivo de configuracion - Instalacion Abortada.")?> <p>El sistema se encuentra instalado.</p> <p>Si desea volver a iniciar la instalación, por favor elimine el archivo de configuracion <b>databases.yml</b> que<br/> @@ -78,6 +81,7 @@ <?php switch ($paso) { case 1: + DebugLog("====================== INSTALACION ALBA - " .date('d-m-Y H:i:s'). "==================="); include ("paso1.php"); break; case 2: Modified: prosistem/alba/trunk/alba/web/instalar/paso2.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/paso2.php 2007-09-26 20:26:29 UTC (rev 5178) +++ prosistem/alba/trunk/alba/web/instalar/paso2.php 2007-09-26 21:59:51 UTC (rev 5179) @@ -32,42 +32,6 @@ if (!defined('ALBA_INSTALLER')) die(); -/* helpers para comprobaciones */ -function check_php() { - return version_compare(phpversion(),'5.0.0','>='); -} -function check_mysql() { - return extension_loaded('mysql'); -} -function check_memorylimit() { - $limite = ini_get('memory_limit'); - return ($limite >= 32); -} -function check_magicquotes() { - return !get_magic_quotes_gpc(); -} -function check_gd() { - return extension_loaded('gd'); -} -function check_apache2() { - $version = 0; - preg_match('!Apache/(.*) !U', apache_get_version(), $version); - return version_compare($version[1],'2.0.0','>='); - -} -function check_rewrite() { - $modulos = apache_get_modules(); - if(count($modulos)>0) { - $res = array_search('mod_rewrite', $modulos); - if($res === false) { - return false; - } else { - return true; - } - } else { - return false; - } -} ?> <div id="detalle"> <p>Comprobación de las versiones de programas instalados:</p> Modified: prosistem/alba/trunk/alba/web/instalar/paso3.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/paso3.php 2007-09-26 20:26:29 UTC (rev 5178) +++ prosistem/alba/trunk/alba/web/instalar/paso3.php 2007-09-26 21:59:51 UTC (rev 5179) @@ -32,50 +32,70 @@ if (!defined('ALBA_INSTALLER')) die(); -$cnx_error_flag = false; -$cnx_error_msg = ""; -$error_flag = true; +$cnx_error_flag = false; //errores de base de datos +$cnx_error_msg = ""; //errores de base de datos +$error_flag = false; // error en el paso del instalador $host = ""; $user = ""; $pass = ""; $db = ""; $creardb = ""; + if (isset($_POST['test_conn']) && $_POST['test_conn']==1) { - + //obtenidno datos del form $host = $_POST['host']; $user = $_POST['user']; $pass = $_POST['pass']; $db = $_POST['db']; $creardb = (isset($_POST['creardb']) && $_POST['creardb'] == 1); + + //probado conexion DebugLog('Probando conexión'); $conn = @mysql_connect($host,$user,$pass); if (!$conn) { + $error_flag = true; $cnx_error_flag = true; + $cnx_error_msg = "No se puede conectar a la base de datos: <br>" . mysql_error(); DebugLog('Error al conectar con la base de datos','E'); - $cnx_error_msg = "No se puede conectar a la base de datos: <br>" . mysql_error(); } else { - DebugLog('Probando crear base de datos'); + //crear base si es necesario if ($creardb) { + DebugLog('Probando crear base de datos...'); $ret = @mysql_query('CREATE DATABASE ' . $db , $conn); if (!$ret) { + $error_flag = true; $cnx_error_flag = true; + $cnx_error_msg = "No se puede crear la base de datos: <br>" . mysql_error(); DebugLog('No se puede crear la base de datos: ' . mysql_error() ,'E'); - $cnx_error_msg = "No se puede crear la base de datos: <br>" . mysql_error(); - $error_flag = true; } + else { + DebugLog("Base de datos $db creada correctamente"); + } } else { - $error_flag = false; - } + DebugLog("No se creara una base de datos"); + } + + //conectado a la base + $ret = @mysql_select_db($db); + if (!$ret) { + $error_flag = true; + $cnx_error_flag = true; + $cnx_error_msg = "No es posible utilizar la base $db: " . mysql_error(); + DebugLog("No es posible conectar a la base de datos $db: " . mysql_error(), 'E'); + } + $_SESSION['albainstall']['host'] = $host; $_SESSION['albainstall']['user'] = $user; $_SESSION['albainstall']['pass'] = $pass; $_SESSION['albainstall']['db'] = $db; $_SESSION['albainstall']['creardb'] = $creardb; } -} +} +else + $error_flag = true; ?> <div id="detalle"> <p>Detalle de conexión con la base de datos:</p> @@ -85,7 +105,7 @@ <p>Ocurrió el siguiente error:</p> <p><?php echo $cnx_error_msg?></p> </div> -<?php endif;?> +<?php endif?> <form name="test_conn" method="post"> <input type="hidden" name="test_conn" value="1"> <table> @@ -113,6 +133,15 @@ <br/> <input type="submit" name="btTextConn" value="Comprobar conexión a la Base de Datos" class="boton"> </form> + +<?php if (isset($_POST['test_conn']) && $_POST['test_conn']==1): ?> + <?php if (!$cnx_error_flag): ?> + <div class="ok"> + <p>La conexión a la base fue existosa.</p> + </div> + <?php endif;?> +<?php endif?> + <?php // ir al siguiente paso $paso = 4; Modified: prosistem/alba/trunk/alba/web/instalar/paso4.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/paso4.php 2007-09-26 20:26:29 UTC (rev 5178) +++ prosistem/alba/trunk/alba/web/instalar/paso4.php 2007-09-26 21:59:51 UTC (rev 5179) @@ -84,6 +84,13 @@ <input type="submit" name="btEnviar" value="Seleccionar base de datos" class="boton"> </form> </div> +<?php if (isset($_POST['set_tipo_base']) && $_POST['set_tipo_base'] == 1):?> + <?php if (!$error_flag): ?> + <div class="ok"> + <p>Modelo de base seleccionado: <?php echo $_POST['tipo_base']?> </p> + </div> + <?php endif;?> +<?php endif;?> <?php // ir al siguiente paso Modified: prosistem/alba/trunk/alba/web/instalar/paso6.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/paso6.php 2007-09-26 20:26:29 UTC (rev 5178) +++ prosistem/alba/trunk/alba/web/instalar/paso6.php 2007-09-26 21:59:51 UTC (rev 5179) @@ -50,7 +50,10 @@ <?php $ret = generate_databases_yml($host,$user,$pass,$db); echo $ret ? IMG_OK : IMG_ERROR; - if (!$ret) ; $error_flag = true; + if (!$ret) { + $error_flag = true; + DebugLog("Error al generar archivo databases.yml","E"); + } ?> </td> </tr> @@ -60,7 +63,10 @@ <?php $ret = crear_schema('lib.model.schema.sql', $host, $user, $pass, $db); echo $ret ? IMG_OK : IMG_ERROR; - if (!$ret) ; $error_flag = true; + if (!$ret) { + $error_flag = true; + DebugLog("Error al crear schemad e base de datos","E"); + } ?> </td> </tr> @@ -78,7 +84,10 @@ <?php $ret = crear_base_modelo($archivo,$host,$user,$pass,$db); echo $ret ? IMG_OK : IMG_ERROR; - if (!$ret) ; $error_flag = true; + if (!$ret) { + $error_flag = true; + DebugLog("Error al cargar modelo de base de datos: $archivo","E"); + } ?> </td> </tr> @@ -98,9 +107,9 @@ <?php endif;?> <p><a href="../">Ingresar al Sistema de Gestión Educactiva Alba</a></p> <p><i>* Recuerde que para ingresar al sistema el nombre de usuario por defecto es <b>admin</b> y la clave es <b>admin</b>.</i></p> -<?php -// ir al siguiente paso +<?php + +// finaliznado los pasos + DebugLog ("============================ FIN INSTALACION ALBA - " .date('d-m-Y H:i:s'). "======================="); $completo = true; - $paso = 7; - ?> \ No newline at end of file

1 0

SVN Alba r5178 - prosistem/alba/trunk/alba/web/instalar
by commits＠pressenter.com.ar 26 Sep '07

26 Sep '07

Author: josx Date: 2007-09-26 17:26:29 -0300 (Wed, 26 Sep 2007) New Revision: 5178 Modified: prosistem/alba/trunk/alba/web/instalar/paso1.php Log: Cambio de nombre del sistema en el texto de la instalacion Modified: prosistem/alba/trunk/alba/web/instalar/paso1.php =================================================================== --- prosistem/alba/trunk/alba/web/instalar/paso1.php 2007-09-26 20:05:16 UTC (rev 5177) +++ prosistem/alba/trunk/alba/web/instalar/paso1.php 2007-09-26 20:26:29 UTC (rev 5178) @@ -44,7 +44,7 @@ $alba_path = AlbaPath(); ?> <div id="detalle"> -<p>Bienvenidos al Sistema De Gestión para Unidades Educacionales Alba!</p> +<p>Bienvenidos al Sistema Libre de Gestión Educativa ALBA!</p> <p>Antes de continuar con la instalación, es necesario comprobar los permisos de algunos directorios en particular.<br/> Por favor, corrija los mismos y vuelva a recargar ésta página hasta que todos

1 0

SVN Alba r5177 - in prosistem/alba/trunk/alba/apps/principal/modules: cargobaja/config conceptobaja/config horarioescolartipo/config legajocategoria/config tipodocente/config tipodocumento/config tipoespacio/config
by commits＠pressenter.com.ar 26 Sep '07

26 Sep '07

Author: hsanchez Date: 2007-09-26 17:05:16 -0300 (Wed, 26 Sep 2007) New Revision: 5177 Modified: prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/config/generator.yml Log: Errores ortograficos, orden de los campos Modified: prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/config/generator.yml 2007-09-26 20:01:56 UTC (rev 5176) +++ prosistem/alba/trunk/alba/apps/principal/modules/cargobaja/config/generator.yml 2007-09-26 20:05:16 UTC (rev 5177) @@ -15,6 +15,7 @@ list: display: [=nombre, descripcion] title: Listado de Tipo de Baja de Cargos + sort: nombre object_actions: _edit: - _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/config/generator.yml 2007-09-26 20:01:56 UTC (rev 5176) +++ prosistem/alba/trunk/alba/apps/principal/modules/conceptobaja/config/generator.yml 2007-09-26 20:05:16 UTC (rev 5177) @@ -15,6 +15,7 @@ list: display: [=nombre, descripcion] title: Listado de Conceptos de Baja + sort: nombre object_actions: _edit: - _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/config/generator.yml 2007-09-26 20:01:56 UTC (rev 5176) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolartipo/config/generator.yml 2007-09-26 20:05:16 UTC (rev 5177) @@ -6,7 +6,7 @@ fields: id: { name: identificador } nombre: { name: Nombre, params: size=64} - descripcion: { name: Descripcion, params: size=64 } + descripcion: { name: Descripción, params: size=64 } edit: title: Modificar tipos de intervalos de horario escolar @@ -15,6 +15,7 @@ list: display: [=nombre, descripcion] title: Listado de tipos de intervalos de horario escolar + sort: nombre object_actions: _edit: - _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/config/generator.yml 2007-09-26 20:01:56 UTC (rev 5176) +++ prosistem/alba/trunk/alba/apps/principal/modules/legajocategoria/config/generator.yml 2007-09-26 20:05:16 UTC (rev 5177) @@ -8,6 +8,7 @@ list: title: Tipos de entrada al legajo pedagógico display: [ descripcion] + sort: descripcion object_actions: _edit: - _delete: - @@ -19,4 +20,4 @@ _save: - _save_and_add: - _list: - - \ No newline at end of file + Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/config/generator.yml 2007-09-26 20:01:56 UTC (rev 5176) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipodocente/config/generator.yml 2007-09-26 20:05:16 UTC (rev 5177) @@ -15,6 +15,7 @@ list: display: [=nombre, descripcion] title: Listado de Tipo de Docente + sort: nombre object_actions: _edit: - _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml 2007-09-26 20:01:56 UTC (rev 5176) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipodocumento/config/generator.yml 2007-09-26 20:05:16 UTC (rev 5177) @@ -13,6 +13,7 @@ list: display: [=nombre, descripcion, orden] title: Listado de Tipo de Documento + sort: orden object_actions: _edit: - _delete: - Modified: prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/config/generator.yml 2007-09-26 20:01:56 UTC (rev 5176) +++ prosistem/alba/trunk/alba/apps/principal/modules/tipoespacio/config/generator.yml 2007-09-26 20:05:16 UTC (rev 5177) @@ -9,6 +9,7 @@ list: title: Listado de Tipos de Espacios display: [ nombre, descripcion ] + sort: nombre object_actions: _edit: - _delete: -

1 0

SVN Alba r5176 - prosistem/alba/trunk/alba/apps/principal/modules/cal/actions
by commits＠pressenter.com.ar 26 Sep '07

26 Sep '07

Author: josx Date: 2007-09-26 17:01:56 -0300 (Wed, 26 Sep 2007) New Revision: 5176 Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php Log: Mas arreglos al codigo de phpicalendar Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-26 19:48:41 UTC (rev 5175) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-26 20:01:56 UTC (rev 5176) @@ -60,7 +60,7 @@ $today_today = date('Ymd', time() + $second_offset); $tomorrows_date = date('Ymd', strtotime("+1 day", $unix_time)); $yesterdays_date = date('Ymd', strtotime("-1 day", $unix_time)); - $sidebar_date = localizeDate($dateFormat_week_list, $unix_time); + $sidebar_date = localizeDate($dateFormat_week_list, $unix_time, $globals_local); // find out next month $next_month_month = ($this_month+1 == '13') ? '1' : ($this_month+1); @@ -78,11 +78,11 @@ $next_month = date("Ymd", $next_month_time); $prev_month = date("Ymd", $prev_month_time); - $display_date = localizeDate ($dateFormat_month, $unix_time); + $display_date = localizeDate ($dateFormat_month, $unix_time, $globals_local); $parse_month = date ("Ym", $unix_time); $first_of_month = $this_year.$this_month."01"; $start_month_day = dateOfWeek($first_of_month, $week_start_day); - $thisday2 = localizeDate($dateFormat_week_list, $unix_time); + $thisday2 = localizeDate($dateFormat_week_list, $unix_time, $globals_local); $num_of_events2 = 0; $list_icals = display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED)); @@ -102,7 +102,7 @@ $prev_year = strtotime ("-1 year", strtotime($getdate)); $prev_year = date ("Ymd", $prev_year); - $sidebar_date = localizeDate($dateFormat_day, strtotime($getdate)); + $sidebar_date = localizeDate($dateFormat_day, strtotime($getdate),$globals_local); // For the side months ereg ("([0-9]{4})([0-9]{2})([0-9]{2})", $getdate, $day_array2);

1 0

SVN Alba r5175 - in prosistem/alba/trunk/alba/apps/principal: lib modules/calendario/actions modules/horarioescolar/actions modules/relDivisionActividadDocente/actions
by commits＠pressenter.com.ar 26 Sep '07

26 Sep '07

Author: josx Date: 2007-09-26 16:48:41 -0300 (Wed, 26 Sep 2007) New Revision: 5175 Modified: prosistem/alba/trunk/alba/apps/principal/lib/miExportadorIcal.class.php prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php Log: Cambio de directorio donde guarda y lee los ics para mostrar los calendarios Modified: prosistem/alba/trunk/alba/apps/principal/lib/miExportadorIcal.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/lib/miExportadorIcal.class.php 2007-09-26 19:41:05 UTC (rev 5174) +++ prosistem/alba/trunk/alba/apps/principal/lib/miExportadorIcal.class.php 2007-09-26 19:48:41 UTC (rev 5175) @@ -39,7 +39,7 @@ function exportar($aObj = array(), $directo_a_browser = 1 ) { if(is_array($aObj)) { $v = new vcalendar(); - $v->setConfig('DIRECTORY',sfConfig::get('app_alba_tmpdir')); //sfConfig::get('app_alba_tmpdir'); + $v->setConfig('DIRECTORY',sfConfig::get('sf_root_cache_dir')); foreach ($aObj as $link_evento) { if($link_evento->getEvento()) { 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-09-26 19:41:05 UTC (rev 5174) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-09-26 19:48:41 UTC (rev 5175) @@ -79,7 +79,7 @@ function getEventos($aRes, $vista) { include("miExportadorIcal.class.php"); $e = new miExportadorIcal(); - $archivo = sfConfig::get('app_alba_tmpdir')."/".$e->exportar($aRes, 0); + $archivo = sfConfig::get('sf_root_cache_dir')."/".$e->exportar($aRes, 0); if($this->getRequestParameter('date')) { $date_component = $this->getRequestParameter('date'); } else { Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-09-26 19:41:05 UTC (rev 5174) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-09-26 19:48:41 UTC (rev 5175) @@ -120,7 +120,7 @@ $this->executeList(); include("miExportadorIcal.class.php"); $e = new miExportadorIcal(); - $this->archivo = sfConfig::get('app_alba_tmpdir')."/".$e->exportar($this->pager->getResults(), 0); + $this->archivo = sfConfig::get('sf_root_cache_dir')."/".$e->exportar($this->pager->getResults(), 0); if($this->getRequestParameter('date')) { $this->date_component = $this->getRequestParameter('date'); } else { Modified: prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php 2007-09-26 19:41:05 UTC (rev 5174) +++ prosistem/alba/trunk/alba/apps/principal/modules/relDivisionActividadDocente/actions/actions.class.php 2007-09-26 19:48:41 UTC (rev 5175) @@ -100,7 +100,7 @@ $this->executeList(); include("miExportadorIcal.class.php"); $e = new miExportadorIcal(); - $this->archivo = sfConfig::get('app_alba_tmpdir')."/".$e->exportar($this->pager->getResults(), 0); + $this->archivo = sfConfig::get('sf_root_cache_dir')."/".$e->exportar($this->pager->getResults(), 0); if($this->getRequestParameter('date')) { $this->date_component = $this->getRequestParameter('date'); } else {

1 0

SVN Alba r5174 - prosistem/alba/trunk/alba/apps/principal/modules/provincia/config
by commits＠pressenter.com.ar 26 Sep '07

26 Sep '07

Author: hsanchez Date: 2007-09-26 16:41:05 -0300 (Wed, 26 Sep 2007) New Revision: 5174 Modified: prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml Log: Ordenando los campos nombre largo y corto Modified: prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml 2007-09-26 19:40:36 UTC (rev 5173) +++ prosistem/alba/trunk/alba/apps/principal/modules/provincia/config/generator.yml 2007-09-26 19:41:05 UTC (rev 5174) @@ -11,11 +11,11 @@ orden: { name: Orden, params: size=10 } edit: title: "" - display: [ nombre_corto, nombre_largo, fk_pais_id, orden ] + display: [ nombre_largo, nombre_corto, fk_pais_id, orden ] list: title: Listado de Provincias - display: [ =nombre_corto, nombre_largo, _pais, orden ] + display: [ nombre_largo, =nombre_corto, _pais, orden ] object_actions: _edit: - _delete: -

1 0

SVN Alba r5173 - prosistem/alba/trunk/alba/apps/principal/modules/pais/config
by commits＠pressenter.com.ar 26 Sep '07

26 Sep '07

Author: hsanchez Date: 2007-09-26 16:40:36 -0300 (Wed, 26 Sep 2007) New Revision: 5173 Modified: prosistem/alba/trunk/alba/apps/principal/modules/pais/config/generator.yml Log: quitando titulo para usar el del header Modified: prosistem/alba/trunk/alba/apps/principal/modules/pais/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/pais/config/generator.yml 2007-09-26 19:39:37 UTC (rev 5172) +++ prosistem/alba/trunk/alba/apps/principal/modules/pais/config/generator.yml 2007-09-26 19:40:36 UTC (rev 5173) @@ -9,7 +9,7 @@ orden: { name: orden, params: size=10 } edit: - title: Editar País + title: "" display: [ nombre_corto , nombre_largo, orden ] list:

1 0

SVN Alba r5172 - in prosistem/alba/trunk/alba/apps/principal/modules/pais: . templates
by commits＠pressenter.com.ar 26 Sep '07

26 Sep '07

Author: hsanchez Date: 2007-09-26 16:39:37 -0300 (Wed, 26 Sep 2007) New Revision: 5172 Added: prosistem/alba/trunk/alba/apps/principal/modules/pais/templates/ prosistem/alba/trunk/alba/apps/principal/modules/pais/templates/_edit_header.php Log: Agregando header para titulos Added: prosistem/alba/trunk/alba/apps/principal/modules/pais/templates/_edit_header.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/pais/templates/_edit_header.php 2007-09-26 19:36:34 UTC (rev 5171) +++ prosistem/alba/trunk/alba/apps/principal/modules/pais/templates/_edit_header.php 2007-09-26 19:39:37 UTC (rev 5172) @@ -0,0 +1 @@ +<h1><?php echo ($sf_params->get('action') == "create")?"Ingresar País":"Modificar País";?></h1> Property changes on: prosistem/alba/trunk/alba/apps/principal/modules/pais/templates/_edit_header.php ___________________________________________________________________ Name: svn:keywords + "Id Author Rev Date URL"

1 0

SVN Alba r5171 - in prosistem/alba/trunk/alba/apps/principal/modules: cal/actions calendario/actions horarioescolar/actions
by commits＠pressenter.com.ar 26 Sep '07

26 Sep '07

Author: josx Date: 2007-09-26 16:36:34 -0300 (Wed, 26 Sep 2007) New Revision: 5171 Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php Log: Arreglos de las URL del calendario cuando envian parametros Modified: prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-26 19:33:42 UTC (rev 5170) +++ prosistem/alba/trunk/alba/apps/principal/modules/cal/actions/components.class.php 2007-09-26 19:36:34 UTC (rev 5171) @@ -247,6 +247,9 @@ // 'search_box' => BASE.'templates/'.$template.'/search_box.tpl' // )); + $url_nueva = sfContext::getInstance()->getRequest()->getUri(); + $url_nueva = str_replace("/view/".$context->getRequest()->getParameter('view')."/date/".$getdate,"", $url_nueva); + $page->replace_files(array( 'header' => '', 'event_js' => "", @@ -258,10 +261,10 @@ $prefixUri = sfContext::getInstance()->getRequest()->getUriPrefix(); $globals = array( "base" => $relativeUrlRoot ."/images/cal", - 'day_view_action' => $action.'/'.$this->verPorDia, - 'week_view_action' => $action."/".$this->verPorSemana, - 'month_view_action' => $action.'/'.$this->verPorMes, - 'year_view_action' => $action.'/'.$this->verPorAnio, + 'day_view_action' => $url_nueva.'/'.$this->verPorDia, + 'week_view_action' => $url_nueva."/".$this->verPorSemana, + 'month_view_action' => $url_nueva.'/'.$this->verPorMes, + 'year_view_action' => $url_nueva.'/'.$this->verPorAnio, 'version' => $phpicalendar_version, 'charset' => $charset, 'default_path' => '', 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-09-26 19:33:42 UTC (rev 5170) +++ prosistem/alba/trunk/alba/apps/principal/modules/calendario/actions/actions.class.php 2007-09-26 19:36:34 UTC (rev 5171) @@ -86,15 +86,7 @@ $date_component = ""; } - if($this->getRequestParameter('view')) { - switch($this->getRequestParameter('view')) { - case 'week': $view = 'verPorSemana'; break; - case 'day': $view = 'verPorDia'; break; - default: $view = 'verPorDia'; - } - } else { - $view = $vista; - } + $view = $this->getRequestParameter('view', $vista); return array($view, $archivo, $date_component); } Modified: prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-09-26 19:33:42 UTC (rev 5170) +++ prosistem/alba/trunk/alba/apps/principal/modules/horarioescolar/actions/actions.class.php 2007-09-26 19:36:34 UTC (rev 5171) @@ -126,17 +126,7 @@ } else { $this->date_component = ""; } - - $this->view = $this->getRequestParameter('view','verPorDia'); -// if($this->getRequestParameter('view')) { -// switch($this->getRequestParameter('view')) { -// case 'week': $this->view = 'verPorSemana'; break; -// case 'day': $this->view = 'verPorDia'; break; -// default: $this->view = 'verPorDia'; -// } -// } else { -// $this->view = "verPorDia"; -// } + $this->view = $this->getRequestParameter('view','verPorDia'); }

1 0

SVN Alba r5170 - prosistem/alba/trunk/alba/apps/principal/modules/pais/config
by commits＠pressenter.com.ar 26 Sep '07

26 Sep '07

Author: hsanchez Date: 2007-09-26 16:33:42 -0300 (Wed, 26 Sep 2007) New Revision: 5170 Modified: prosistem/alba/trunk/alba/apps/principal/modules/pais/config/generator.yml Log: Modificando el listado de paises Modified: prosistem/alba/trunk/alba/apps/principal/modules/pais/config/generator.yml =================================================================== --- prosistem/alba/trunk/alba/apps/principal/modules/pais/config/generator.yml 2007-09-26 19:24:02 UTC (rev 5169) +++ prosistem/alba/trunk/alba/apps/principal/modules/pais/config/generator.yml 2007-09-26 19:33:42 UTC (rev 5170) @@ -14,7 +14,8 @@ list: title: Listado de Países - display: [ =nombre_corto, nombre_largo, orden ] + display: [ nombre_largo, =nombre_corto, orden ] + sort: [ orden, asc ] object_actions: _edit: - - _delete: - \ No newline at end of file + _delete: -

1 0