From 4e09c6e865242bf7c5d5d10b7b1f23d6ec9c5bff Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 26 Jul 2018 14:04:47 +0200
Subject: [PATCH] MOBILE-2179 scorm: Always check completion when leaving
player
---
src/addon/mod/scorm/components/index/index.ts | 9 +++++++--
.../toc-popover/addon-mod-scorm-toc-popover.html | 4 ++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/addon/mod/scorm/components/index/index.ts b/src/addon/mod/scorm/components/index/index.ts
index 3ccebfbb2..56adc3e0f 100644
--- a/src/addon/mod/scorm/components/index/index.ts
+++ b/src/addon/mod/scorm/components/index/index.ts
@@ -61,6 +61,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
protected lastAttempt: number; // Last attempt.
protected lastIsOffline: boolean; // Whether the last attempt is offline.
protected hasPlayed = false; // Whether the user has opened the player page.
+ protected syncDueToPlayerLeft = false; // Whether a sync was due to the user leaving the player.
constructor(injector: Injector, protected scormProvider: AddonModScormProvider, @Optional() protected content: Content,
protected scormHelper: AddonModScormHelperProvider, protected scormOffline: AddonModScormOfflineProvider,
@@ -327,11 +328,14 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
* @return {boolean} If suceed or not.
*/
protected hasSyncSucceed(result: any): boolean {
- if (result.updated) {
- // Check completion status.
+ if (result.updated || this.syncDueToPlayerLeft) {
+ // Check completion status if something was sent or the user just left the player.
+ // If the user plays the SCORM in online we don't know if he sent data or not, so always check completion.
this.checkCompletion();
}
+ this.syncDueToPlayerLeft = false;
+
return true;
}
@@ -343,6 +347,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
if (this.hasPlayed) {
this.hasPlayed = false;
+ this.syncDueToPlayerLeft = true;
this.scormOptions.newAttempt = false; // Uncheck new attempt.
// Add a delay to make sure the player has started the last writing calls so we can detect conflicts.
diff --git a/src/addon/mod/scorm/components/toc-popover/addon-mod-scorm-toc-popover.html b/src/addon/mod/scorm/components/toc-popover/addon-mod-scorm-toc-popover.html
index 0518f03f7..8b4dffff1 100644
--- a/src/addon/mod/scorm/components/toc-popover/addon-mod-scorm-toc-popover.html
+++ b/src/addon/mod/scorm/components/toc-popover/addon-mod-scorm-toc-popover.html
@@ -3,10 +3,10 @@
<p>{{ 'addon.mod_scorm.dataattemptshown' | translate:{number: attemptToContinue} }}</p>
</ion-item>
<ion-item text-center *ngIf="isBrowse">
- <p>{{ 'addon.mod_scorm.mod_scorm.browsemode' }}</p>
+ <p>{{ 'addon.mod_scorm.browsemode' | translate }}</p>
</ion-item>
<ion-item text-center *ngIf="isReview">
- <p>{{ 'addon.mod_scorm.mod_scorm.reviewmode' }}</p>
+ <p>{{ 'addon.mod_scorm.reviewmode' | translate }}</p>
</ion-item>
<!-- List of SCOs. -->