mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-30652-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2012-01-09 12:02:41 +13:00
commit 9b69f4a9c9
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mod/scorm/report/basic/report.php
View File

@ -155,11 +155,9 @@ class scorm_basic_report extends scorm_default_report {
$table->sortable(true);
$table->collapsible(true);
// This is done to prevent redundant data, when a user has multiple attempts
$table->column_suppress('picture');
$table->column_suppress('fullname');
// I wonder why it is doing all this suppress malarkey?
// However, if it was suppressing idnumber field before, I guess
// it needs to suppress all the user identity fields now
foreach ($extrafields as $field) {
$table->column_suppress($field);
}
@ -521,17 +519,18 @@ class scorm_basic_report extends scorm_default_report {
echo '</tr></table>';
}
}
if (!$download) {
$mform->set_data(compact('detailedrep', 'pagesize', 'attemptsmode'));
$mform->display();
}
} else {
if ($candelete && !$download) {
echo '</div>';
echo '</form>';
$table->finish_output();
}
echo '</div>';
echo $OUTPUT->notification(get_string('noactivity', 'scorm'));
}
// Show preferences form irrespective of attempts are there to report or not
if (!$download) {
$mform->set_data(compact('detailedrep', 'pagesize', 'attemptsmode'));
$mform->display();
}
if ($download == 'Excel' or $download == 'ODS') {
$workbook->close();

13
mod/scorm/report/interactions/report.php
View File

@ -211,9 +211,9 @@ class scorm_interactions_report extends scorm_default_report {
$table->sortable(true);
$table->collapsible(true);
// This is done to prevent redundant data, when a user has multiple attempts
$table->column_suppress('picture');
$table->column_suppress('fullname');
// This is done to prevent redundant data, when a user has multiple attempts
foreach ($extrafields as $field) {
$table->column_suppress($field);
}
@ -583,17 +583,18 @@ class scorm_interactions_report extends scorm_default_report {
echo '</tr></table>';
}
}
if (!$download) {
$mform->set_data(compact('detailedrep', 'pagesize', 'attemptsmode'));
$mform->display();
}
} else {
if ($candelete && !$download) {
echo '</div>';
echo '</form>';
$table->finish_output();
}
echo '</div>';
echo $OUTPUT->notification(get_string('noactivity', 'scorm'));
}
// Show preferences form irrespective of attempts are there to report or not
if (!$download) {
$mform->set_data(compact('detailedrep', 'pagesize', 'attemptsmode'));
$mform->display();
}
if ($download == 'Excel' or $download == 'ODS') {
$workbook->close();