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

Merge pull request #2628 from crazyserver/MOBILE-3523 

MOBILE-3523 workshop: Prefetch assessments forms
main
Dani Palou 2020-11-27 12:33:18 +01:00 committed by GitHub
parent 8620535d7b eab3a622ba
commit 9eae2aec43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/mod/workshop/components/assessment/assessment.ts
View File

@ -113,7 +113,7 @@ export class AddonModWorkshopAssessmentComponent implements OnInit {
}; };
if (!this.submission) { if (!this.submission) {
const modal = this.domUtils.showModalLoading('core.sending', true); const modal = this.domUtils.showModalLoading();
this.workshopHelper.getSubmissionById(this.workshop.id, this.assessment.submissionid, this.workshopHelper.getSubmissionById(this.workshop.id, this.assessment.submissionid,
{cmId: this.workshop.coursemodule}).then((submissionData) => { {cmId: this.workshop.coursemodule}).then((submissionData) => {

10
src/addon/mod/workshop/providers/helper.ts
View File

@ -189,10 +189,14 @@ export class AddonModWorkshopHelperProvider {
options.siteId = options.siteId || this.sitesProvider.getCurrentSiteId(); options.siteId = options.siteId || this.sitesProvider.getCurrentSiteId();
return this.workshopProvider.getReviewerAssessments(workshopId, options).then((assessments) => { return this.workshopProvider.getReviewerAssessments(workshopId, options).then((assessments) => {
const promises = assessments.map((assessment) => { const promises = [];
return this.getSubmissionById(workshopId, assessment.submissionid, options).then((submission) => { assessments.forEach((assessment) => {
promises.push(this.getSubmissionById(workshopId, assessment.submissionid, options).then((submission) => {
assessment.submission = submission; assessment.submission = submission;
}); }));
promises.push(this.workshopProvider.getAssessmentForm(workshopId, assessment.id, options).then((assessmentForm) => {
assessment.form = assessmentForm;
}));
}); });
return Promise.all(promises).then(() => { return Promise.all(promises).then(() => {

5
src/addon/mod/workshop/providers/prefetch-handler.ts
View File

@ -142,6 +142,11 @@ export class AddonModWorkshopPrefetchHandler extends CoreCourseActivityPrefetchH
files = files.concat(assessment.feedbackattachmentfiles) files = files.concat(assessment.feedbackattachmentfiles)
.concat(assessment.feedbackcontentfiles); .concat(assessment.feedbackcontentfiles);
}); });
if (workshop.phase >= AddonModWorkshopProvider.PHASE_ASSESSMENT && canAssess) {
return Promise.all(assessments.map((assessment) => {
return this.workshopHelper.getReviewerAssessmentById(workshop.id, assessment.id);
}));
}
})); }));
}); });