-
-
- {{ 'addon.mod_lti.launchactivity' | translate }}
-
+
+
+
+ {{ 'addon.mod_lti.launchactivity' | translate }}
+
+
+
+
+
+
-
-
-
diff --git a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
index 5b80f4744..53daf6b16 100644
--- a/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
+++ b/src/addons/mod/quiz/components/index/addon-mod-quiz-index.html
@@ -10,7 +10,7 @@
+ [courseId]="courseId" [hasDataToSync]="buttonText && hasOffline">
@@ -134,22 +134,26 @@
-
-
-
-
-
+
+
+
+
+
{{ message }}
-
+
+
+
{{ 'addon.mod_quiz.noquestions' | translate }}
-
+
+
+
{{ 'addon.mod_quiz.errorquestionsnotsupported' | translate }}
-
+
+
+
{{ 'addon.mod_quiz.errorrulesnotsupported' | translate }}
-
+
+
+
{{ 'addon.mod_quiz.errorbehaviournotsupported' | translate }}
{{ quiz.preferredbehaviour }}
+
-
-
+
+
+
{{ 'addon.mod_quiz.canattemptbutnotsubmit' | translate }}
{{ 'addon.mod_quiz.warningquestionsnotsupported' | translate }}
{{ type }}
+
+
+
+
-
+
+
{{ buttonText | translate }}
@@ -195,17 +211,10 @@
{{ 'core.openinbrowser' | translate }}
+
-
-
-
-
-
-
-
-
+
+
+
+
{{ 'addon.mod_quiz.noreviewattempt' | translate }}
+
+
+
+
+
+ {{ 'addon.mod_quiz.review' | translate }}
+
+
+
{{message}}
-
-
- {{ 'core.openinbrowser' | translate }}
-
-
-
-
-
- {{ 'addon.mod_quiz.submitallandfinish' | translate }}
-
@@ -180,10 +143,25 @@
{{ 'addon.mod_quiz.errorparsequestions' | translate }}
-
+
+ {{ 'addon.mod_quiz.returnattempt' | translate }}
+
+
+
+
+
{{ 'core.openinbrowser' | translate }}
-
+
+
+
+ {{ 'addon.mod_quiz.submitallandfinish' | translate }}
+
+
diff --git a/src/addons/mod/quiz/pages/player/player.page.ts b/src/addons/mod/quiz/pages/player/player.page.ts
index 16e1a22de..d022c6d5e 100644
--- a/src/addons/mod/quiz/pages/player/player.page.ts
+++ b/src/addons/mod/quiz/pages/player/player.page.ts
@@ -602,9 +602,11 @@ export class AddonModQuizPlayerPage implements OnInit, OnDestroy, CanLeave {
},
});
- if (modalData && modalData.action == AddonModQuizNavigationModalComponent.CHANGE_PAGE) {
- this.changePage(modalData.page!, true, modalData.slot);
+ if (!modalData) {
+ return;
}
+
+ this.changePage(modalData.page!, true, modalData.slot);
}
/**
diff --git a/src/addons/mod/quiz/pages/review/review.html b/src/addons/mod/quiz/pages/review/review.html
index a83b93d8d..38286d18a 100644
--- a/src/addons/mod/quiz/pages/review/review.html
+++ b/src/addons/mod/quiz/pages/review/review.html
@@ -87,8 +87,6 @@
-
-
@@ -113,28 +111,30 @@
+
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ 'addon.mod_quiz.showall' | translate }}
+ {{ 'addon.mod_quiz.showeachpage' | translate }}
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/addons/mod/quiz/pages/review/review.page.ts b/src/addons/mod/quiz/pages/review/review.page.ts
index 07fb1c5cd..04b7bb7a7 100644
--- a/src/addons/mod/quiz/pages/review/review.page.ts
+++ b/src/addons/mod/quiz/pages/review/review.page.ts
@@ -53,7 +53,7 @@ export class AddonModQuizReviewPage implements OnInit {
attempt?: AddonModQuizAttemptWSData; // The attempt being reviewed.
component = AddonModQuizProvider.COMPONENT; // Component to link the files to.
showAll = false; // Whether to view all questions in the same page.
- numPages?: number; // Number of pages.
+ numPages = 1; // Number of pages.
showCompleted = false; // Whether to show completed time.
additionalData?: AddonModQuizWSAdditionalData[]; // Additional data to display for the attempt.
loaded = false; // Whether data has been loaded.
@@ -112,10 +112,9 @@ export class AddonModQuizReviewPage implements OnInit {
* Change the current page. If slot is supplied, try to scroll to that question.
*
* @param page Page to load. -1 means all questions in same page.
- * @param fromModal Whether the page was selected using the navigation modal.
* @param slot Slot of the question to scroll to.
*/
- async changePage(page: number, fromModal?: boolean, slot?: number): Promise
{
+ async changePage(page: number, slot?: number): Promise {
if (slot !== undefined && (this.attempt!.currentpage == -1 || page == this.currentPage)) {
// Scrol to a certain question in the current page.
this.scrollToQuestion(slot);
@@ -183,7 +182,7 @@ export class AddonModQuizReviewPage implements OnInit {
this.setSummaryCalculatedData(data);
this.questions = data.questions;
- this.nextPage = page == -1 ? -2 : page + 1;
+ this.nextPage = page + 1;
this.previousPage = page - 1;
this.questions.forEach((question) => {
@@ -341,8 +340,6 @@ export class AddonModQuizReviewPage implements OnInit {
summaryShown: false,
currentPage: this.attempt?.currentpage,
isReview: true,
- numPages: this.numPages,
- showAll: this.showAll,
},
});
@@ -350,11 +347,7 @@ export class AddonModQuizReviewPage implements OnInit {
return;
}
- if (modalData.action == AddonModQuizNavigationModalComponent.CHANGE_PAGE) {
- this.changePage(modalData.page!, true, modalData.slot);
- } else if (modalData.action == AddonModQuizNavigationModalComponent.SWITCH_MODE) {
- this.switchMode();
- }
+ this.changePage(modalData.page!, modalData.slot);
}
}
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index 0fd7713b7..cf24bdd04 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -6,7 +6,7 @@
-
+
+
+
-
+
+
+
{{ 'core.play' | translate }}
@@ -88,15 +92,13 @@
-
+
{{ 'core.openwith' | translate }}
-
-
+
+
+
+
@@ -31,7 +31,7 @@
- {{ 'addon.mod_scorm.noattemptsallowed' | translate }}
+ {{ 'addon.mod_scorm.noattemptsallowed' | translate }}
{{ 'core.unlimited' | translate }}
@@ -40,23 +40,34 @@
- {{ 'addon.mod_scorm.noattemptsmade' | translate }}
+ {{ 'addon.mod_scorm.noattemptsmade' | translate }}
{{ numAttempts }}
-
+
+
+
- {{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.num}}
+ {{'core.grades.grades' | translate}}
-
- {{ attempt.gradeFormatted }}
- {{ 'addon.mod_scorm.cannotcalculategrade' | translate }}
-
+
+
+
+ {{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.num}}
+
+
+ {{ attempt.gradeFormatted }}
+ {{ 'addon.mod_scorm.cannotcalculategrade' | translate }}
+
+
+
- {{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.num}}
+ {{ 'addon.mod_scorm.gradeforattempt' | translate }} {{attempt.num}}
{{ 'addon.mod_scorm.offlineattemptnote' | translate }}
@@ -71,13 +82,13 @@
- {{ 'addon.mod_scorm.grademethod' | translate }}
+ {{ 'addon.mod_scorm.grademethod' | translate }}
{{ gradeMethodReadable }}
- {{ 'addon.mod_scorm.gradereported' | translate }}
+ {{ 'addon.mod_scorm.gradereported' | translate }}
{{ gradeFormatted }}
@@ -86,7 +97,7 @@
- {{ 'core.lastsync' | translate }}
+ {{ 'core.lastsync' | translate }}
{{ syncTime }}
@@ -144,32 +155,34 @@
+
-
-
-
-
- {{ errorMessage | translate }}
-
-
-
- {{ 'core.openinbrowser' | translate }}
-
-
-
+
+
+
+
+
+
+ {{ errorMessage | translate }}
+
+
+
+ {{ 'core.openinbrowser' | translate }}
+
+
+
-
-
-
-
- {{ 'addon.mod_scorm.exceededmaxattempts' | translate }}
-
-
-
+
+
+
+
+ {{ 'addon.mod_scorm.exceededmaxattempts' | translate }}
+
+
+
-
-
-
+
+
@@ -178,29 +191,23 @@
-
-
+
+
{{ statusMessage | translate }}
-
-
-
-
-
- {{ 'addon.mod_scorm.browse' | translate }}
-
-
-
-
-
- {{ 'addon.mod_scorm.enter' | translate }}
-
-
-
-
-
+
+
+
+
+ {{ 'addon.mod_scorm.browse' | translate }}
+
+
+ {{ 'addon.mod_scorm.enter' | translate }}
+
+
@@ -212,11 +219,9 @@
-
-
-
+
+
+
+
+
+
+
+ {{ 'addon.mod_survey.results' | translate }}
+
+
-
-
+
+ {{ 'core.submit' | translate }}
+
+
+
+
+
+
{{ url }}
-
-
-
-
- {{ 'addon.mod_url.accessurl' | translate }}
-
-
-
-
-
-
+
+
+
+
+ {{ 'addon.mod_url.accessurl' | translate }}
+
+
+
+
+