Replacing spanish hardcoded values see #3258

skala
Julio Montoya 15 years ago
parent 263554bd99
commit 199708a8e8
  1. 11
      main/inc/ajax/myspace.ajax.php
  2. 24
      main/mySpace/access_details.php
  3. 9
      main/mySpace/myspace.lib.php

@ -3,6 +3,9 @@
/**
* Responses to AJAX calls
*/
$language_file = array ('tracking');
require_once '../global.inc.php';
$action = $_GET['a'];
@ -11,7 +14,7 @@ require_once api_get_path(SYS_CODE_PATH).'mySpace/myspace.lib.php';
switch ($action) {
case 'access_detail':
$user_id = Security::remove_XSS($_REQUEST['student']);
$user_id = intval($_REQUEST['student']);
$course_code = Security::remove_XSS($_REQUEST['course']);
$type = Security::remove_XSS($_REQUEST['type']);
$range = Security::remove_XSS($_REQUEST['range']);
@ -48,9 +51,9 @@ switch ($action) {
$db['stats'] = $foo_stats;
$db['graph_result'] = grapher($sql_result, $start_date, $end_date);
} else {
$db['result'] = '<div class="warning-message"> No se encontro informaci&oacute;n habilitada del usuario </div>';
$db['graph_result'] = '<div class="warning-message"> No se encontro informaci&oacute;n habilitada del usuario </div>';
$db['stats'] = '<div class="warning-message"> No se encontro informaci&oacute;n registrada para este rango </div>';
$db['result'] = Display::return_message(get_lang('NoDataAvailable'), 'warning');
$db['graph_result'] = Display::return_message(get_lang('NoDataAvailable'), 'warning');
$db['stats'] = Display::return_message(get_lang('NoDataAvailable'), 'warning');
}
header('Cache-Control: no-cache');
echo json_encode($db); // requires: PHP >= 5.2.0, PECL json >= 1.2.0

@ -9,6 +9,7 @@
* @param integer $user_id the user id
* @param string $course_code the course code
* @author Julio Montoya <gugli100@gmail.com>
* @author Jorge Frisancho Jibaja - select between dates
*
*/
@ -30,6 +31,7 @@ $this_section = SECTION_TRACKING;
/* MAIN */
$user_id = intval($_REQUEST['student']);
$session_id = intval($_GET['id_session']);
$type = Security::remove_XSS($_REQUEST['type']);
$course_code = Security::remove_XSS($_REQUEST['course']);
$connections = MySpace::get_connections_to_course($user_id, $course_code, $session_id);
@ -173,14 +175,14 @@ api_display_tool_title(get_lang('DetailsStudentInCourse'));
?>
<div id="cev_results_header" class="ui-tabs ui-widget ui-widget-content ui-corner-all">
<div id="cev_cont" class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<strong><?php echo (get_lang('User').': '.api_get_person_name($main_user_info['firstName'], $main_user_info['lastName']).'</strong> <br /> <strong>'.get_lang('Course').': </strong>'.$course_code)?></div>
<?php echo '<strong>'.get_lang('User').': '.api_get_person_name($main_user_info['firstName'], $main_user_info['lastName']).'</strong> <br /> <strong>'.get_lang('Course').': </strong>'.$course_code; ?></div>
<br />
<form action="javascript:get(document.getElementById('myform'));" name="myform" id="myform">
<div id="cev_cont_header">
<p> Seleccione una rango de fechas para su consulta </p>
<label for="from">Desde</label>
<p><?php echo get_lang('SelectADateRange')?></p>
<label for="to"><?php echo get_lang('From')?></label>
<input type="text" id="date_from" name="from"/>
<label for="to">Hasta</label>
<label for="to"><?php echo get_lang('Until')?></label>
<input type="text" id="date_to" name="to"/>
</div><br /><br />
</form>
@ -188,7 +190,7 @@ api_display_tool_title(get_lang('DetailsStudentInCourse'));
</div><br />
<div id="cev_results" class="ui-tabs ui-widget ui-widget-content ui-corner-all">
<div class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"> Informaci&oacute;n Basica</div><br />
<div class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"><?php echo get_lang('Statistics'); ?></div><br />
<div id="cev_cont_stats">
<?php
if ($result_to_print != "") {
@ -197,10 +199,10 @@ api_display_tool_title(get_lang('DetailsStudentInCourse'));
$foo_stats .= '<strong>'.get_lang('Average').': </strong>'.$rst['avg'].'<br />';
$foo_stats .= '<strong>'.get_lang('Quantity').' : </strong>'.$rst['times'].'<br />';
echo $foo_stats;
} else {
echo Display::display_warning_message(get_lang('NoDataAvailable'));
}
else{
echo ('<div id="messages" class="warning-message"> No se encontro informaci&oacute;n habilitada del usuario </div>');
}?>
?>
</div><br />
</div><br />
@ -220,8 +222,9 @@ api_display_tool_title(get_lang('DetailsStudentInCourse'));
if ($result_to_print != "") {
echo $result_to_print;
} else {
echo ('<div id="messages" class="warning-message"> No se encontro informaci&oacute;n habilitada del usuario </div>');
}?>
Display::display_warning_message(get_lang('NoDataAvailable'));
}
?>
</div>
<?php
if ($result_to_print != "") {
@ -231,6 +234,5 @@ api_display_tool_title(get_lang('DetailsStudentInCourse'));
}?>
</div>
</div><br />
<?php
Display:: display_footer();

@ -2019,8 +2019,8 @@ function grapher($sql_result, $start_date, $end_date, $type = "") {
// the graph id
$data = $data_set->GetData();
if ($cache->IsInCache($graph_id, $data_set->GetData())) {
//if (0) {
//if ($cache->IsInCache($graph_id, $data_set->GetData())) {
if (0) {
//if we already created the img
// echo 'in cache';
$img_file = $cache->GetHash($graph_id, $data_set->GetData());
@ -2058,9 +2058,8 @@ function grapher($sql_result, $start_date, $end_date, $type = "") {
// Finish the graph
$test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 8);
$test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 10);
$test->drawTitle(60, 22, get_lang('AccessDetails', ''), 50, 50, 50, 585);
$test->setFontProperties(api_get_path(LIBRARY_PATH).'pchart/fonts/tahoma.ttf', 10);
$test->drawTitle(60, 22, get_lang('AccessDetails'), 50, 50, 50, 585);
//------------------
//echo 'not in cache';

Loading…
Cancel
Save