EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-2669 completion: Don't get completion if previously received

main
Pau Ferrer Ocaña 2018-10-30 16:50:21 +01:00
parent 53b0473af0
commit 9d0a9ef746
30 changed files with 91 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/addon/mod/assign/components/index/index.ts
View File

@ -75,7 +75,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
this.loadContent(false, true).then(() => {
this.assignProvider.logView(this.assign.id).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});
@ -104,7 +104,7 @@ export class AddonModAssignIndexComponent extends CoreCourseModuleMainActivityCo
this.submittedObserver = this.eventsProvider.on(AddonModAssignProvider.SUBMITTED_FOR_GRADING_EVENT, (data) => {
if (this.assign && data.assignmentId == this.assign.id && data.userId == this.userId) {
// Assignment submitted, check completion.
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
// Reload data since it can have offline data now.
this.showLoadingAndRefresh(true, false);

2
src/addon/mod/book/components/index/index.ts
View File

@ -166,7 +166,7 @@ export class AddonModBookIndexComponent extends CoreCourseModuleMainResourceComp
this.bookProvider.logView(this.module.instance, chapterId).then(() => {
// Module is completed when last chapter is viewed, so we only check completion if the last is reached.
if (!this.nextChapter) {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}
}).catch(() => {
// Ignore errors.

2
src/addon/mod/chat/components/index/index.ts
View File

@ -48,7 +48,7 @@ export class AddonModChatIndexComponent extends CoreCourseModuleMainActivityComp
this.loadContent().then(() => {
this.chatProvider.logView(this.chat.id).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});

4
src/addon/mod/choice/components/index/index.ts
View File

@ -67,7 +67,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
return;
}
this.choiceProvider.logView(this.choice.id).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch((error) => {
// Ignore errors.
});
@ -354,7 +354,7 @@ export class AddonModChoiceIndexComponent extends CoreCourseModuleMainActivityCo
this.choiceProvider.submitResponse(this.choice.id, this.choice.name, this.courseId, responses).then(() => {
// Success!
// Check completion since it could be configured to complete once the user answers the choice.
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
this.domUtils.scrollToTop(this.content);
// Let's refresh the data.

2
src/addon/mod/data/components/index/index.ts
View File

@ -104,7 +104,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
}
this.dataProvider.logView(this.data.id).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});

2
src/addon/mod/feedback/pages/form/form.ts
View File

@ -95,7 +95,7 @@ export class AddonModFeedbackFormPage implements OnDestroy {
ionViewDidLoad(): void {
this.fetchData().then(() => {
this.feedbackProvider.logView(this.feedback.id, true).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});

2
src/addon/mod/folder/components/index/index.ts
View File

@ -56,7 +56,7 @@ export class AddonModFolderIndexComponent extends CoreCourseModuleMainResourceCo
} else {
this.loadContent().then(() => {
this.folderProvider.logView(this.module.instance).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});

4
src/addon/mod/forum/components/index/index.ts
View File

@ -114,7 +114,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
}
this.forumProvider.logView(this.forum.id).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch((error) => {
// Ignore errors.
});
@ -423,7 +423,7 @@ export class AddonModForumIndexComponent extends CoreCourseModuleMainActivityCom
});
// Check completion since it could be configured to complete once the user adds a new discussion or replies.
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}
}

4
src/addon/mod/glossary/components/index/index.ts
View File

@ -86,7 +86,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
}
this.glossaryProvider.logView(this.glossary.id, this.viewMode).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch((error) => {
// Ignore errors.
});
@ -387,7 +387,7 @@ export class AddonModGlossaryIndexComponent extends CoreCourseModuleMainActivity
this.showLoadingAndRefresh(false);
// Check completion since it could be configured to complete once the user adds a new discussion or replies.
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}
}

2
src/addon/mod/imscp/components/index/index.ts
View File

@ -53,7 +53,7 @@ export class AddonModImscpIndexComponent extends CoreCourseModuleMainResourceCom
this.loadContent().then(() => {
this.imscpProvider.logView(this.module.instance).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});

2
src/addon/mod/lesson/components/index/index.ts
View File

@ -310,7 +310,7 @@ export class AddonModLessonIndexComponent extends CoreCourseModuleMainActivityCo
*/
protected logView(): void {
this.lessonProvider.logViewLesson(this.lesson.id, this.password).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch((error) => {
// Ignore errors.
});

2
src/addon/mod/lti/components/index/index.ts
View File

@ -51,7 +51,7 @@ export class AddonModLtiIndexComponent extends CoreCourseModuleMainActivityCompo
* Check the completion.
*/
protected checkCompletion(): void {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}
/**

2
src/addon/mod/lti/providers/module-handler.ts
View File

@ -88,7 +88,7 @@ export class AddonModLtiModuleHandler implements CoreCourseModuleHandler {
return this.ltiProvider.getLtiLaunchData(ltiData.id).then((launchData) => {
// "View" LTI.
this.ltiProvider.logView(ltiData.id).then(() => {
this.courseProvider.checkModuleCompletion(courseId, module.completionstatus);
this.courseProvider.checkModuleCompletion(courseId, module.completiondata);
}).catch(() => {
// Ignore errors.
});

2
src/addon/mod/page/components/index/index.ts
View File

@ -54,7 +54,7 @@ export class AddonModPageIndexComponent extends CoreCourseModuleMainResourceComp
this.loadContent().then(() => {
this.pageProvider.logView(this.module.instance).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});

8
src/addon/mod/quiz/components/index/index.ts
View File

@ -86,7 +86,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
}
this.quizProvider.logViewQuiz(this.quizData.id).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch((error) => {
// Ignore errors.
});
@ -370,7 +370,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
*/
protected goToAutoReview(): Promise<any> {
// If we go to auto review it means an attempt was finished. Check completion status.
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
// Verify that user can see the review.
const attemptId = this.autoReview.attemptId;
@ -395,7 +395,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
protected hasSyncSucceed(result: any): boolean {
if (result.attemptFinished) {
// An attempt was finished, check completion status.
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}
// If the sync call isn't rejected it means the sync was successful.
@ -484,7 +484,7 @@ export class AddonModQuizIndexComponent extends CoreCourseModuleMainActivityComp
protected isRefreshSyncNeeded(syncEventData: any): boolean {
if (syncEventData.attemptFinished) {
// An attempt was finished, check completion status.
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}
if (this.quizData && syncEventData.quizId == this.quizData.id) {

2
src/addon/mod/resource/components/index/index.ts
View File

@ -51,7 +51,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
this.loadContent().then(() => {
this.resourceProvider.logView(this.module.instance).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});

2
src/addon/mod/resource/providers/helper.ts
View File

@ -153,7 +153,7 @@ export class AddonModResourceHelperProvider {
return this.courseHelper.downloadModuleAndOpenFile(module, courseId, AddonModResourceProvider.COMPONENT, module.id,
module.contents).then(() => {
this.resourceProvider.logView(module.instance).then(() => {
this.courseProvider.checkModuleCompletion(courseId, module.completionstatus);
this.courseProvider.checkModuleCompletion(courseId, module.completiondata);
}).catch(() => {
// Ignore errors.
});

2
src/addon/mod/scorm/components/index/index.ts
View File

@ -94,7 +94,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
* Check the completion.
*/
protected checkCompletion(): void {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}
/**

2
src/addon/mod/survey/components/index/index.ts
View File

@ -54,7 +54,7 @@ export class AddonModSurveyIndexComponent extends CoreCourseModuleMainActivityCo
this.loadContent(false, true).then(() => {
this.surveyProvider.logView(this.survey.id).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});

2
src/addon/mod/url/components/index/index.ts
View File

@ -172,7 +172,7 @@ export class AddonModUrlIndexComponent extends CoreCourseModuleMainResourceCompo
*/
go(): void {
this.urlProvider.logView(this.module.instance).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});

2
src/addon/mod/url/providers/module-handler.ts
View File

@ -166,7 +166,7 @@ export class AddonModUrlModuleHandler implements CoreCourseModuleHandler {
*/
protected openUrl(module: any, courseId: number): void {
this.urlProvider.logView(module.instance).then(() => {
this.courseProvider.checkModuleCompletion(courseId, module.completionstatus);
this.courseProvider.checkModuleCompletion(courseId, module.completiondata);
}).catch(() => {
// Ignore errors.
});

2
src/addon/mod/wiki/components/index/index.ts
View File

@ -105,7 +105,7 @@ export class AddonModWikiIndexComponent extends CoreCourseModuleMainActivityComp
if (this.isMainPage) {
this.wikiProvider.logView(this.wiki.id).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch((error) => {
// Ignore errors.
});

4
src/addon/mod/workshop/components/index/index.ts
View File

@ -106,7 +106,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
}
this.workshopProvider.logView(this.workshop.id).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch((error) => {
// Ignore errors.
});
@ -123,7 +123,7 @@ export class AddonModWorkshopIndexComponent extends CoreCourseModuleMainActivity
this.showLoadingAndRefresh(true);
// Check completion since it could be configured to complete once the user adds a new discussion or replies.
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}
}

2
src/addon/mod/workshop/pages/submission/submission.ts
View File

@ -131,7 +131,7 @@ export class AddonModWorkshopSubmissionPage implements OnInit, OnDestroy {
ngOnInit(): void {
this.fetchSubmissionData().then(() => {
this.workshopProvider.logViewSubmission(this.submissionId).then(() => {
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completionstatus);
this.courseProvider.checkModuleCompletion(this.courseId, this.module.completiondata);
}).catch(() => {
// Ignore errors.
});

2
src/core/course/components/module-completion/module-completion.ts
View File

@ -25,7 +25,7 @@ import { CoreCourseProvider } from '../../providers/course';
*
* Example usage:
*
* <core-course-module-completion [completion]="module.completionstatus" [moduleName]="module.name"
* <core-course-module-completion [completion]="module.completiondata" [moduleName]="module.name"
* (completionChanged)="completionChanged()"></core-course-module-completion>
*/
@Component({

6
src/core/course/components/module/core-course-module.html
View File

@ -5,9 +5,9 @@
<core-format-text [text]="module.handlerData.title"></core-format-text>
<!-- Buttons. -->
<div item-end *ngIf="module.uservisible !== false" class="buttons core-module-buttons" [ngClass]="{'core-button-completion': module.completionstatus}">
<div item-end *ngIf="module.uservisible !== false" class="buttons core-module-buttons" [ngClass]="{'core-button-completion': module.completiondata}">
<!-- Module completion. -->
<core-course-module-completion *ngIf="module.completionstatus" [completion]="module.completionstatus" [moduleName]="module.name" (completionChanged)="completionChanged.emit()"></core-course-module-completion>
<core-course-module-completion *ngIf="module.completiondata" [completion]="module.completiondata" [moduleName]="module.name" (completionChanged)="completionChanged.emit()"></core-course-module-completion>
<div class="core-module-buttons-more">
<!-- Download button. -->
@ -37,7 +37,7 @@
<ion-badge item-end *ngIf="module.visible === 0 && (!section || section.visible)" text-wrap>{{ 'core.course.hiddenfromstudents' | translate }}</ion-badge>
<ion-badge item-end *ngIf="module.visible !== 0 && module.isStealth" text-wrap>{{ 'core.course.hiddenoncoursepage' | translate }}</ion-badge>
<ion-badge item-end *ngIf="module.availabilityinfo" text-wrap><core-format-text [text]="module.availabilityinfo"></core-format-text></ion-badge>
<ion-badge item-end *ngIf="module.completionstatus && module.completionstatus.offline" color="warning" text-wrap>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-badge>
<ion-badge item-end *ngIf="module.completiondata && module.completiondata.offline" color="warning" text-wrap>{{ 'core.course.manualcompletionnotsynced' | translate }}</ion-badge>
</div>
<core-format-text class="core-module-description" *ngIf="module.description" maxHeight="80" [text]="module.description"></core-format-text>
</a>

55
src/core/course/pages/section/section.ts
View File

@ -184,34 +184,41 @@ export class CoreCourseSectionPage implements OnDestroy {
}
}).then(() => {
const promises = [];
let promise;
// Get the completion status.
if (this.course.enablecompletion === false) {
// Completion not enabled.
promise = Promise.resolve({});
} else {
promise = this.courseProvider.getActivitiesCompletionStatus(this.course.id).catch(() => {
// It failed, don't use completion.
return {};
});
}
// Get all the sections.
promises.push(this.courseProvider.getSections(this.course.id, false, true).then((sections) => {
if (refresh) {
// Invalidate the recently downloaded module list. To ensure info can be prefetched.
const modules = this.courseProvider.getSectionsModules(sections);
promises.push(promise.then((completionStatus) => {
// Get all the sections.
return this.courseProvider.getSections(this.course.id, false, true).then((sections) => {
if (refresh) {
// Invalidate the recently downloaded module list. To ensure info can be prefetched.
const modules = this.courseProvider.getSectionsModules(sections);
return this.prefetchDelegate.invalidateModules(modules, this.course.id).then(() => {
return sections;
});
} else {
return this.prefetchDelegate.invalidateModules(modules, this.course.id).then(() => {
return sections;
}
}).then((sections) => {
});
} else {
return sections;
}
}).then((sections) => {
let promise;
// Get the completion status.
if (this.course.enablecompletion === false) {
// Completion not enabled.
promise = Promise.resolve({});
} else {
const sectionWithModules = sections.find((section) => {
return section.modules.length > 0;
});
if (sectionWithModules && typeof sectionWithModules.modules[0].completion != 'undefined') {
promise = Promise.resolve({});
} else {
promise = this.courseProvider.getActivitiesCompletionStatus(this.course.id).catch(() => {
// It failed, don't use completion.
return {};
});
}
}
return promise.then((completionStatus) => {
this.courseHelper.addHandlerDataForModules(sections, this.course.id, completionStatus, this.course.fullname);
// Format the name of each section and check if it has content.

23
src/core/course/providers/helper.ts
View File

@ -147,11 +147,16 @@ export class CoreCourseHelperProvider {
section.modules.forEach((module) => {
module.handlerData = this.moduleDelegate.getModuleDataFor(module.modname, module, courseId, section.id);
if (completionStatus && typeof completionStatus[module.id] != 'undefined') {
// Check if activity has completions and if it's marked.
module.completionstatus = completionStatus[module.id];
module.completionstatus.courseId = courseId;
module.completionstatus.courseName = courseName;
if (module.completiondata && module.completion > 0) {
module.completiondata.courseId = courseId;
module.completiondata.courseName = courseName;
module.completiondata.tracking = module.completion;
module.completiondata.cmid = module.id;
} else if (completionStatus && typeof completionStatus[module.id] != 'undefined') {
// Not in use > 3.6. Check if activity has completions and if it's marked.
module.completiondata = completionStatus[module.id];
module.completiondata.courseId = courseId;
module.completiondata.courseName = courseName;
}
// Check if the module is stealth.
@ -1070,7 +1075,13 @@ export class CoreCourseHelperProvider {
if (this.coursesProvider.isGetCoursesByFieldAvailable()) {
promises.push(this.coursesProvider.getCoursesByField('id', course.id));
}
promises.push(this.courseProvider.getActivitiesCompletionStatus(course.id));
const sectionWithModules = sections.find((section) => {
return section.modules.length > 0;
});
if (!sectionWithModules || typeof sectionWithModules.modules[0].completion == 'undefined') {
promises.push(this.courseProvider.getActivitiesCompletionStatus(course.id));
}
return this.utils.allPromises(promises);
}).then(() => {

7
src/core/course/providers/sync.ts
View File

@ -129,6 +129,7 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider {
}
// Get the current completion status to check if any completion was modified in web.
// This can be retrieved on core_course_get_contents since 3.6 but this is an easy way to get them.
return this.courseProvider.getActivitiesCompletionStatus(courseId, siteId, undefined, false, true, false)
.then((onlineCompletions) => {
@ -183,7 +184,11 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider {
if (result.updated) {
// Update data.
return this.courseProvider.invalidateSections(courseId, siteId).then(() => {
return this.courseProvider.getActivitiesCompletionStatus(courseId);
if (this.sitesProvider.getCurrentSite().isVersionGreaterEqualThan('3.6')) {
return this.courseProvider.getSections(courseId, false, true, undefined, siteId);
} else {
return this.courseProvider.getActivitiesCompletionStatus(courseId, siteId);
}
}).catch(() => {
// Ignore errors.
});

1
upgrade.txt
View File

@ -6,6 +6,7 @@ information provided here is intended especially for developers.
- gulp was updated to v4. In order for gulp to work, you need to install gulp-cli: npm install -g gulp-cli
It's also recommended to update ionic cli to v4, otherwise some errors could be raised while building: npm install -g ionic
- The value of the constant CoreCourseProvider.ALL_SECTIONS_ID has changed from -1 to -2.
- Use of completionstatus on the module object has been deprecated, use completiondata instead.
=== 3.5.2 ===