MOBILE-4099 scorm: Don't call WS if user cannot save tracks
parent
f1f7ee02de
commit
7b5a5bed8f
|
@ -93,13 +93,6 @@ export class AddonModScormDataModel12 {
|
||||||
protected errorCode = '0'; // Last error.
|
protected errorCode = '0'; // Last error.
|
||||||
protected timeout?: number; // Timeout to commit changes.
|
protected timeout?: number; // Timeout to commit changes.
|
||||||
|
|
||||||
protected siteId: string;
|
|
||||||
protected scorm: AddonModScormScorm;
|
|
||||||
protected scoId: number;
|
|
||||||
protected attempt: number;
|
|
||||||
protected mode: string;
|
|
||||||
protected offline: boolean;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*
|
*
|
||||||
|
@ -110,23 +103,18 @@ export class AddonModScormDataModel12 {
|
||||||
* @param userData The user default data.
|
* @param userData The user default data.
|
||||||
* @param mode Mode being played. By default, MODENORMAL.
|
* @param mode Mode being played. By default, MODENORMAL.
|
||||||
* @param offline Whether the attempt is offline.
|
* @param offline Whether the attempt is offline.
|
||||||
|
* @param canSaveTracks Whether the user can save tracks.
|
||||||
*/
|
*/
|
||||||
constructor(
|
constructor(
|
||||||
siteId: string,
|
protected siteId: string,
|
||||||
scorm: AddonModScormScorm,
|
protected scorm: AddonModScormScorm,
|
||||||
scoId: number,
|
protected scoId: number,
|
||||||
attempt: number,
|
protected attempt: number,
|
||||||
userData: AddonModScormUserDataMap,
|
protected userData: AddonModScormUserDataMap,
|
||||||
mode?: string,
|
protected mode = AddonModScormProvider.MODENORMAL,
|
||||||
offline?: boolean,
|
protected offline = false,
|
||||||
|
protected canSaveTracks = true,
|
||||||
) {
|
) {
|
||||||
this.siteId = siteId;
|
|
||||||
this.scorm = scorm;
|
|
||||||
this.scoId = scoId;
|
|
||||||
this.attempt = attempt;
|
|
||||||
this.mode = mode || AddonModScormProvider.MODENORMAL;
|
|
||||||
this.offline = !!offline;
|
|
||||||
|
|
||||||
this.init(userData);
|
this.init(userData);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -981,6 +969,10 @@ export class AddonModScormDataModel12 {
|
||||||
* @return True if success, false otherwise.
|
* @return True if success, false otherwise.
|
||||||
*/
|
*/
|
||||||
protected storeData(storeTotalTime?: boolean): boolean {
|
protected storeData(storeTotalTime?: boolean): boolean {
|
||||||
|
if (!this.canSaveTracks) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
let tracks: AddonModScormDataEntry[];
|
let tracks: AddonModScormDataEntry[];
|
||||||
|
|
||||||
if (storeTotalTime) {
|
if (storeTotalTime) {
|
||||||
|
|
|
@ -132,6 +132,10 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get canSaveTracks(): boolean {
|
||||||
|
return !this.accessInfo || !!this.accessInfo.cansavetrack;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize.
|
* Initialize.
|
||||||
*
|
*
|
||||||
|
@ -235,9 +239,13 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
|
||||||
* Determine the attempt to use, the mode (normal/preview) and if it's offline or online.
|
* Determine the attempt to use, the mode (normal/preview) and if it's offline or online.
|
||||||
*
|
*
|
||||||
* @param attemptsData Attempts count.
|
* @param attemptsData Attempts count.
|
||||||
|
* @param accessInfo Access info.
|
||||||
* @return Promise resolved when done.
|
* @return Promise resolved when done.
|
||||||
*/
|
*/
|
||||||
protected async determineAttemptAndMode(attemptsData: AddonModScormAttemptCountResult): Promise<void> {
|
protected async determineAttemptAndMode(
|
||||||
|
attemptsData: AddonModScormAttemptCountResult,
|
||||||
|
accessInfo: AddonModScormGetScormAccessInformationWSResponse,
|
||||||
|
): Promise<void> {
|
||||||
const data = await AddonModScormHelper.determineAttemptToContinue(this.scorm, attemptsData);
|
const data = await AddonModScormHelper.determineAttemptToContinue(this.scorm, attemptsData);
|
||||||
|
|
||||||
let incomplete = false;
|
let incomplete = false;
|
||||||
|
@ -257,7 +265,14 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Determine mode and attempt to use.
|
// Determine mode and attempt to use.
|
||||||
const result = AddonModScorm.determineAttemptAndMode(this.scorm, this.mode, this.attempt, this.newAttempt, incomplete);
|
const result = AddonModScorm.determineAttemptAndMode(
|
||||||
|
this.scorm,
|
||||||
|
this.mode,
|
||||||
|
this.attempt,
|
||||||
|
this.newAttempt,
|
||||||
|
incomplete,
|
||||||
|
accessInfo.cansavetrack,
|
||||||
|
);
|
||||||
|
|
||||||
if (result.attempt > this.attempt) {
|
if (result.attempt > this.attempt) {
|
||||||
// We're creating a new attempt.
|
// We're creating a new attempt.
|
||||||
|
@ -300,23 +315,26 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Get attempts data.
|
// Get attempts data.
|
||||||
const attemptsData = await AddonModScorm.getAttemptCount(this.scorm.id, { cmId: this.cmId });
|
const [attemptsData, accessInfo] = await Promise.all([
|
||||||
|
AddonModScorm.getAttemptCount(this.scorm.id, { cmId: this.cmId }),
|
||||||
|
AddonModScorm.getAccessInformation(this.scorm.id, {
|
||||||
|
cmId: this.cmId,
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
|
||||||
await this.determineAttemptAndMode(attemptsData);
|
this.accessInfo = accessInfo;
|
||||||
|
|
||||||
const [data, accessInfo] = await Promise.all([
|
await this.determineAttemptAndMode(attemptsData, accessInfo);
|
||||||
|
|
||||||
|
const [data] = await Promise.all([
|
||||||
AddonModScorm.getScormUserData(this.scorm.id, this.attempt, {
|
AddonModScorm.getScormUserData(this.scorm.id, this.attempt, {
|
||||||
cmId: this.cmId,
|
cmId: this.cmId,
|
||||||
offline: this.offline,
|
offline: this.offline,
|
||||||
}),
|
}),
|
||||||
AddonModScorm.getAccessInformation(this.scorm.id, {
|
|
||||||
cmId: this.cmId,
|
|
||||||
}),
|
|
||||||
this.fetchToc(),
|
this.fetchToc(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
this.userData = data;
|
this.userData = data;
|
||||||
this.accessInfo = accessInfo;
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
CoreDomUtils.showErrorModalDefault(error, 'addon.mod_scorm.errorgetscorm', true);
|
CoreDomUtils.showErrorModalDefault(error, 'addon.mod_scorm.errorgetscorm', true);
|
||||||
}
|
}
|
||||||
|
@ -400,6 +418,7 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
|
||||||
this.userData!,
|
this.userData!,
|
||||||
this.mode,
|
this.mode,
|
||||||
this.offline,
|
this.offline,
|
||||||
|
this.canSaveTracks,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Add the model to the window so the SCORM can access it.
|
// Add the model to the window so the SCORM can access it.
|
||||||
|
@ -453,6 +472,10 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
|
||||||
* @return Promise resolved when done.
|
* @return Promise resolved when done.
|
||||||
*/
|
*/
|
||||||
protected async markCompleted(sco: AddonModScormScoWithData): Promise<void> {
|
protected async markCompleted(sco: AddonModScormScoWithData): Promise<void> {
|
||||||
|
if (!this.canSaveTracks) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const tracks = [{
|
const tracks = [{
|
||||||
element: 'cmi.core.lesson_status',
|
element: 'cmi.core.lesson_status',
|
||||||
value: 'completed',
|
value: 'completed',
|
||||||
|
@ -536,6 +559,10 @@ export class AddonModScormPlayerPage implements OnInit, OnDestroy {
|
||||||
* @return Promise resolved when done.
|
* @return Promise resolved when done.
|
||||||
*/
|
*/
|
||||||
protected async setStartTime(scoId: number): Promise<void> {
|
protected async setStartTime(scoId: number): Promise<void> {
|
||||||
|
if (!this.canSaveTracks) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const tracks = [{
|
const tracks = [{
|
||||||
element: 'x.start.time',
|
element: 'x.start.time',
|
||||||
value: String(CoreTimeUtils.timestamp()),
|
value: String(CoreTimeUtils.timestamp()),
|
||||||
|
|
|
@ -206,6 +206,7 @@ export class AddonModScormProvider {
|
||||||
* @param attempt Current attempt.
|
* @param attempt Current attempt.
|
||||||
* @param newAttempt Whether it should start a new attempt.
|
* @param newAttempt Whether it should start a new attempt.
|
||||||
* @param incomplete Whether current attempt is incomplete.
|
* @param incomplete Whether current attempt is incomplete.
|
||||||
|
* @param canSaveTracks Whether the user can save tracks.
|
||||||
* @return Mode, attempt number and whether to start a new attempt.
|
* @return Mode, attempt number and whether to start a new attempt.
|
||||||
*/
|
*/
|
||||||
determineAttemptAndMode(
|
determineAttemptAndMode(
|
||||||
|
@ -214,7 +215,15 @@ export class AddonModScormProvider {
|
||||||
attempt: number,
|
attempt: number,
|
||||||
newAttempt?: boolean,
|
newAttempt?: boolean,
|
||||||
incomplete?: boolean,
|
incomplete?: boolean,
|
||||||
|
canSaveTracks = true,
|
||||||
): {mode: string; attempt: number; newAttempt: boolean} {
|
): {mode: string; attempt: number; newAttempt: boolean} {
|
||||||
|
if (!canSaveTracks) {
|
||||||
|
return {
|
||||||
|
mode: scorm.hidebrowse ? AddonModScormProvider.MODENORMAL : mode,
|
||||||
|
attempt,
|
||||||
|
newAttempt: false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
if (mode == AddonModScormProvider.MODEBROWSE) {
|
if (mode == AddonModScormProvider.MODEBROWSE) {
|
||||||
if (scorm.hidebrowse) {
|
if (scorm.hidebrowse) {
|
||||||
|
|
Loading…
Reference in New Issue