mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-80673-main' of https://github.com/snake/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2024-01-25 12:06:14 +08:00
commit 22cccb52d6
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/forum/amd/build/local/grades/grader.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
mod/forum/amd/build/local/grades/grader.min.js.map
View File

File diff suppressed because one or more lines are too long

19
mod/forum/amd/src/local/grades/grader.js
View File

@ -29,7 +29,7 @@ import {add as addToast} from 'core/toast';
import {addNotification} from 'core/notification';
import {getString} from 'core/str';
import {failedUpdate} from 'core_grades/grades/grader/gradingpanel/normalise';
import {addIconToContainerWithPromise, getIcon as getSpinner} from 'core/loadingicon';
import {addIconToContainerWithPromise} from 'core/loadingicon';
import {debounce} from 'core/utils';
import {fillInitialValues} from 'core_grades/grades/grader/gradingpanel/comparison';
import Modal from 'core/modal_cancel';
@ -487,27 +487,26 @@ export const view = async(getGradeForUser, userid, moduleName, {
focusOnClose = null,
} = {}) => {
const userGrade = await getGradeForUser(userid);
const [
userGrade,
modal,
gradeTemplateData
] = await Promise.all([
getGradeForUser(userid),
Modal.create({
title: moduleName,
large: true,
removeOnClose: true,
returnElement: focusOnClose,
show: true,
body: getSpinner(),
body: Templates.render('mod_forum/local/grades/view_grade', userGrade),
}),
renderGradeTemplate(userGrade)
]);
modal.setBodyContent(Templates.renderForPromise('mod_forum/local/grades/view_grade', userGrade));
// Note: We do not use await here because it messes with the Modal transitions.
const [{html, js}] = await Promise.all([modal.getBodyPromise(), renderGradeTemplate(userGrade)]);
const gradeReplace = modal.getRoot()[0].querySelector('[data-region="grade-template"]');
Templates.replaceNodeContents(gradeReplace, html, js);
const bodyPromise = await modal.getBodyPromise();
const gradeReplace = bodyPromise[0].querySelector('[data-region="grade-template"]');
Templates.replaceNodeContents(gradeReplace, gradeTemplateData.html, gradeTemplateData.js);
};
const renderGradeTemplate = (userGrade) => Templates.renderForPromise(userGrade.templatename, userGrade.grade);