-{{/editurl}}
-
+
diff --git a/lib/classes/output/icon_system_fontawesome.php b/lib/classes/output/icon_system_fontawesome.php
index afd79775c3f..95f4ee4d412 100644
--- a/lib/classes/output/icon_system_fontawesome.php
+++ b/lib/classes/output/icon_system_fontawesome.php
@@ -215,6 +215,7 @@ class icon_system_fontawesome extends icon_system_font {
'core:i/contentbank' => 'fa-paint-brush',
'core:i/dashboard' => 'fa-tachometer',
'core:i/categoryevent' => 'fa-cubes',
+ 'core:i/chartbar' => 'fa-chart-bar',
'core:i/course' => 'fa-graduation-cap',
'core:i/courseevent' => 'fa-graduation-cap',
'core:i/customfield' => 'fa-hand-o-right',
diff --git a/mod/h5pactivity/lang/en/h5pactivity.php b/mod/h5pactivity/lang/en/h5pactivity.php
index 81d8eb2229e..67d661a0c23 100644
--- a/mod/h5pactivity/lang/en/h5pactivity.php
+++ b/mod/h5pactivity/lang/en/h5pactivity.php
@@ -127,7 +127,6 @@ $string['result_other'] = 'Unknown interaction type';
$string['result_sequencing_choice'] = 'Positions';
$string['result_sequencing_answer'] = 'Position value';
$string['result_sequencing_position'] = '#{$a}';
-$string['review_all_attempts'] = 'View all attempts ({$a} submitted)';
$string['review_mode'] = 'Review attempts';
$string['review_my_attempts'] = 'View my attempts';
$string['review_user_attempts'] = 'View user attempts ({$a})';
@@ -147,4 +146,5 @@ $string['tracking_messages'] = 'Some H5P provide attempt tracking data for advan
$string['true'] = 'True';
$string['usecontentbank'] = 'Use the content bank (opens in new window) to manage your H5P files';
$string['view'] = 'View';
+$string['viewattempts'] = 'View attempts ({$a})';
$string['view_report'] = 'View report';
diff --git a/mod/h5pactivity/tests/behat/attempt_options.feature b/mod/h5pactivity/tests/behat/attempt_options.feature
index 573606d3965..ebee06b3bd0 100644
--- a/mod/h5pactivity/tests/behat/attempt_options.feature
+++ b/mod/h5pactivity/tests/behat/attempt_options.feature
@@ -8,6 +8,7 @@ Feature: Attempts review settings.
Given the following "users" exist:
| username | firstname | lastname | email |
| student1 | Student | 1 | student1@example.com |
+ | student2 | Student | 2 | student2@example.com |
| teacher1 | Teacher | 1 | teacher1@example.com |
| teacher2 | Teacher | 2 | teacher2@example.com |
And the following "courses" exist:
@@ -16,6 +17,7 @@ Feature: Attempts review settings.
And the following "course enrolments" exist:
| user | course | role |
| student1 | C1 | student |
+ | student2 | C1 | student |
| teacher1 | C1 | editingteacher |
| teacher2 | C1 | teacher |
@@ -28,7 +30,45 @@ Feature: Attempts review settings.
| idnumber | h5ppackage |
| enabletracking | |
| reviewmode | |
- And the following "mod_h5pactivity > attempt" exists:
+ And the following "mod_h5pactivity > attempts" exist:
+ | user | h5pactivity | attempt | interactiontype | rawscore | maxscore | duration | completion | success |
+ | student1 | H5P package | 1 | compound | 0 | 2 | 6 | 1 | 0 |
+ | student1 | H5P package | 2 | compound | 2 | 2 | 4 | 1 | 1 |
+ | student2 | H5P package | 1 | compound | 1 | 2 | 8 | 1 | 0 |
+ When I am on the "H5P package" "h5pactivity activity" page logged in as
+ Then "Attempts report" "link" should in current page administration
+ And I should "You are in preview mode."
+ And I should "Attempt tracking is not enabled for this activity."
+ And I should "You can enable it in Settings."
+ And I should "View attempts (3)"
+
+ Examples:
+ | user | enabletracking | reviewmode | attemptsreportlink | previewmode | attempttracking | attempttrackingsettings | viewattempts |
+ | student1 | 1 | 1 | exist | not see | not see | not see | not see |
+ | student1 | 1 | 0 | not exist | not see | not see | not see | not see |
+ | student1 | 0 | 1 | not exist | not see | not see | not see | not see |
+ | teacher1 | 1 | 1 | exist | see | not see | not see | see |
+ | teacher1 | 1 | 0 | exist | see | not see | not see | see |
+ | teacher1 | 0 | 1 | not exist | see | see | see | not see |
+ | teacher2 | 0 | 1 | not exist | see | see | not see | not see |
+ # TODO: The non-editing teachers will be able to see attempts when MDL-80028 is fixed.
+ | teacher2 | 1 | 1 | not exist | see | not see | not see | not see |
+
+ Scenario: View attempts link behaviour
+ Given the following "activity" exists:
+ | activity | h5pactivity |
+ | name | H5P package |
+ | intro | Test H5P description |
+ | course | C1 |
+ | idnumber | h5ppackage |
+ | enabletracking | 1 |
+ | reviewmode | 1 |
+ When I am on the "H5P package" "h5pactivity activity" page logged in as teacher1
+ # The link is displayed with the correct number of attempts (in that case 0 because there are no attempts yet).
+ Then I should see "View attempts (0)"
+ Then I follow "View attempts (0)"
+ And I should not see "View user attempts"
+ But the following "mod_h5pactivity > attempt" exists:
| user | student1 |
| h5pactivity | H5P package |
| attempt | 1 |
@@ -38,18 +78,6 @@ Feature: Attempts review settings.
| duration | 4 |
| completion | 1 |
| success | 1 |
- When I am on the "H5P package" "h5pactivity activity" page logged in as
- Then "Attempts report" "link" should in current page administration
- And I should "You are in preview mode."
- And I should "Attempt tracking is not enabled for this activity."
- And I should "You can enable it in Settings."
-
- Examples:
- | user | enabletracking | reviewmode | attemptsreportlink | previewmode | attempttracking | attempttrackingsettings |
- | student1 | 1 | 1 | exist | not see | not see | not see |
- | student1 | 1 | 0 | not exist | not see | not see | not see |
- | student1 | 0 | 1 | not exist | not see | not see | not see |
- | teacher1 | 1 | 1 | exist | see | not see | not see |
- | teacher1 | 1 | 0 | exist | see | not see | not see |
- | teacher1 | 0 | 1 | not exist | see | see | see |
- | teacher2 | 0 | 1 | not exist | see | see | not see |
+ And I am on the "H5P package" "h5pactivity activity" page
+ And I follow "View attempts (1)"
+ And I should see "View user attempts"
diff --git a/mod/h5pactivity/view.php b/mod/h5pactivity/view.php
index 31041d598b6..e1d0ad8ca24 100644
--- a/mod/h5pactivity/view.php
+++ b/mod/h5pactivity/view.php
@@ -87,9 +87,20 @@ if (!$manager->can_submit()) {
}
echo $OUTPUT->notification($message, \core\output\notification::NOTIFY_WARNING);
}
-
}
-echo player::display($fileurl, $config, true, 'mod_h5pactivity', true);
+$extraactions = [];
+
+if ($manager->can_view_all_attempts() && $manager->is_tracking_enabled()) {
+ $extraactions[] = new action_link(
+ new moodle_url('/mod/h5pactivity/report.php', ['id' => $cm->id]),
+ get_string('viewattempts', 'mod_h5pactivity', $manager->count_attempts()),
+ null,
+ null,
+ new pix_icon('i/chartbar', '', 'core')
+ );
+}
+
+echo player::display($fileurl, $config, true, 'mod_h5pactivity', true, $extraactions);
echo $OUTPUT->footer();
diff --git a/pix/i/chartbar.svg b/pix/i/chartbar.svg
new file mode 100644
index 00000000000..9ad54c5374b
--- /dev/null
+++ b/pix/i/chartbar.svg
@@ -0,0 +1 @@
+