chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Work: fixed a few local date issues and column names in assignments - refs BT#6418

Browse Source
1.9.x
Yannick Warnier 12 years ago
parent 76b50a5f21
commit 7c1cb6ffae
2 changed files with 7 additions and 5 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      main/work/student_work.php
  2. 8
      main/work/work.lib.php

4
main/work/student_work.php
Unescape View File

@ -69,7 +69,7 @@ $workPerUser = getWorkPerUser($studentId);
$table = new HTML_Table(array('class' => 'data_table')); $table = new HTML_Table(array('class' => 'data_table'));
$column = 0; $column = 0;
$row = 0; $row = 0;
$headers = array(get_lang('Title'), get_lang('HandedOutDate'), get_lang('HandedOutDateLimit'), get_lang('Score'), get_lang('Actions')); $headers = array(get_lang('Title'), get_lang('HandedOutDate'), get_lang('HandOutDateLimit'), get_lang('Score'), get_lang('Actions'));
foreach ($headers as $header) { foreach ($headers as $header) {
$table->setHeaderContents($row, $column, $header); $table->setHeaderContents($row, $column, $header);
$column++; $column++;
@ -90,7 +90,7 @@ foreach ($workPerUser as $work) {
$table->setCellContents($row, $column, $userResult['sent_date']); $table->setCellContents($row, $column, $userResult['sent_date']);
$column++; $column++;
//$dateQualification = !empty($workExtraData['expires_on']) && $workExtraData['expires_on'] != '0000-00-00 00:00:00' ? api_get_utc_datetime($workExtraData['expires_on']) : '-'; //$dateQualification = !empty($workExtraData['expires_on']) && $workExtraData['expires_on'] != '0000-00-00 00:00:00' ? api_get_utc_datetime($workExtraData['expires_on']) : '-';
$dateQualification = !empty($workExtraData['ends_on']) && $workExtraData['ends_on'] != '0000-00-00 00:00:00' ? api_get_utc_datetime($workExtraData['ends_on']) : '-'; $dateQualification = !empty($workExtraData['expires_on']) && $workExtraData['expires_on'] != '0000-00-00 00:00:00' ? api_get_local_time($workExtraData['expires_on']) : '-';
$table->setCellContents($row, $column, $dateQualification); $table->setCellContents($row, $column, $dateQualification);
$column++; $column++;
//var_dump($userResult); //var_dump($userResult);

8
main/work/work.lib.php
Unescape View File

@ -455,7 +455,7 @@ function display_student_publications_list($id, $my_folder_data, $work_parents,
$qualification_exists = true; $qualification_exists = true;
} }
$edit_dir = isset($_GET['edit_dir']) ? $_GET['edit_dir'] : ''; $edit_dir = isset($_GET['edit_dir']) ? intval($_GET['edit_dir']) : '';
$table_header = array(); $table_header = array();
$table_has_actions_column = false; $table_has_actions_column = false;
@ -539,7 +539,8 @@ function display_student_publications_list($id, $my_folder_data, $work_parents,
$sql = Database::query('SELECT * FROM '.$work_assigment.' WHERE c_id = '.$course_id.' AND id = "'.$row['has_properties'].'" LIMIT 1'); $sql = Database::query('SELECT * FROM '.$work_assigment.' WHERE c_id = '.$course_id.' AND id = "'.$row['has_properties'].'" LIMIT 1');
$homework = Database::fetch_array($sql); $homework = Database::fetch_array($sql);
} }
// save original value for later
$utc_expiry_time = $homework['expires_on'];
if ($is_allowed_to_edit && $locked == false) { if ($is_allowed_to_edit && $locked == false) {
if (!empty($edit_dir) && $edit_dir == $id2) { if (!empty($edit_dir) && $edit_dir == $id2) {
@ -887,7 +888,8 @@ function display_student_publications_list($id, $my_folder_data, $work_parents,
} }
if (!empty($homework)) { if (!empty($homework)) {
$row[] = !empty($homework['ends_on']) && $homework['ends_on'] != '0000-00-00 00:00:00' ? api_get_local_time($homework['ends_on']): '-'; // use original utc value saved previously to avoid doubling the utc-to-local conversion ($homework['expires_on'] might have been tainted)
$row[] = !empty($utc_expiry_time) && $utc_expiry_time != '0000-00-00 00:00:00' ? api_get_local_time($utc_expiry_time): '-';
} else { } else {
$row[] = '-'; $row[] = '-';
} }

Write Preview
Loading…
Cancel
Save