Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…into MOODLE_22_STABLE
  • Loading branch information...
commit ade2e5955ea78b1d9941532a222068cb79814135 2 parents ce40b66 + 9f097a7
@samhemelryk samhemelryk authored
View
15 mod/scorm/report/basic/report.php
@@ -155,11 +155,9 @@ function display($scorm, $cm, $course, $download) {
$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 @@ function display($scorm, $cm, $course, $download) {
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();
View
13 mod/scorm/report/interactions/report.php
@@ -211,9 +211,9 @@ function display($scorm, $cm, $course, $download) {
$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 @@ function display($scorm, $cm, $course, $download) {
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();
Please sign in to comment.
Something went wrong with that request. Please try again.