Fixing timezone convertions in glossary + Minor cleaning in a gradebook link title

skala
Julio Montoya 14 years ago
parent b47e60aa2d
commit c4c0b036e3
  1. 4
      main/glossary/index.php
  2. 4
      main/gradebook/gradebook_showlog_eval.php
  3. 1
      main/gradebook/index.php
  4. 9
      main/gradebook/lib/fe/displaygradebook.php
  5. 2
      main/gradebook/lib/fe/gradebooktable.class.php

@ -112,13 +112,13 @@ if (api_is_allowed_to_edit(null, true)) {
// Date treatment for timezones
if (!empty($glossary_data['insert_date']) && $glossary_data['insert_date'] != '0000-00-00 00:00:00:') {
$glossary_data['insert_date'] = api_get_local_time($glossary_data['insert_date'] , null, date_default_timezone_get());
$glossary_data['insert_date'] = api_get_local_time($glossary_data['insert_date']);
} else {
$glossary_data['insert_date'] = '';
}
if (!empty($glossary_data['update_date']) && $glossary_data['update_date'] != '0000-00-00 00:00:00:') {
$glossary_data['update_date'] = api_get_local_time($glossary_data['update_date'] , null, date_default_timezone_get());
$glossary_data['update_date'] = api_get_local_time($glossary_data['update_date']);
} else {
$glossary_data['update_date'] = '';
}

@ -45,10 +45,10 @@ $sql="SELECT le.name,le.description,le.weight,le.visible,le.type,le.created_at,u
$result=Database::query($sql);
$list_info=array();
while ($row=Database::fetch_row($result)) {
$list_info[]=$row;
$list_info[]=$row;
}
foreach($list_info as $key => $info_log) {
foreach($list_info as $key => $info_log) {
$list_info[$key][5]=($info_log[5]) ? api_convert_and_format_date($info_log[5]) : 'N/A';
$list_info[$key][3]=($info_log[3]==1) ? get_lang('GradebookVisible') : get_lang('GradebookInvisible');
}

@ -28,7 +28,6 @@ require_once 'lib/fe/displaygradebook.php';
require_once 'lib/fe/userform.class.php';
require_once api_get_path(LIBRARY_PATH).'ezpdf/class.ezpdf.php';
require_once api_get_path(LIBRARY_PATH).'document.lib.php';
require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
$htmlHeadXtra[] = '<script type="text/javascript">
$(document).ready( function() {

@ -70,12 +70,15 @@ class DisplayGradebook
}
$evalinfo= '<table width="100%" border="0"><tr><td>';
$evalinfo .= get_lang('EvaluationName') . ' :<b> ' . $evalobj->get_name() . ' </b>(' . api_format_date($evalobj->get_date()).' )<br />' . get_lang('Course') . ' :<b> ' . $course . '</b><br />';
$evalinfo .= '<h2>'.$evalobj->get_name().'</h2><br />';
$evalinfo .= $description;
$evalinfo .= get_lang('Course') . ' :<b> ' . $course . '</b><br />';
//'<br>' . get_lang('Weight') . ' :<b> ' . $evalobj->get_weight() . '</b><br>' . get_lang('Visible') . ' :<b> ' . $visible . '</b>
$evalinfo .= get_lang('QualificationNumeric') . ' :<b> ' . $evalobj->get_max() . '</b><br>' . $description .$average;
$evalinfo .= get_lang('QualificationNumeric') . ' :<b> ' . $evalobj->get_max() . '</b><br>'.$average;
if (!$evalobj->has_results()) {
$evalinfo .= '<br /><i>' . get_lang('NoResultsInEvaluation') . '</i>';
} elseif ($scoredisplay->is_custom() && api_get_self() != '/dokeos/main/gradebook/gradebook_statistics.php') {
} elseif ($scoredisplay->is_custom() && api_get_self() != '/main/gradebook/gradebook_statistics.php') {
if (api_is_allowed_to_edit(null, true)) {
if ($page != 'statistics') {
//$evalinfo .= '<br /><br /><a href="gradebook_view_result.php?selecteval='.Security::remove_XSS($_GET['selecteval']).'"> '.Display::return_icon(('evaluation_rate.png'),get_lang('ViewResult'),'','32') . '</a>';

@ -54,7 +54,7 @@ class GradebookTable extends SortableTable {
}
}
if (api_is_allowed_to_edit(null, true)) {
$this->set_header($column++, get_lang('Date'),true, 'width="100px"');
$this->set_header($column++, get_lang('CreationDate'),true, 'width="100px"');
} elseif (($status<>1) && !api_is_allowed_to_create_course() && (!isset($_GET['selectcat']) || $_GET['selectcat']==0)) {
$this->set_header($column++, get_lang('Date'),true, 'width="100px"');
}

Loading…
Cancel
Save