L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-83856 gradingform_guide: fix remark format to always be FORMAT_HTML

Browse Source
This commit is contained in:
Andrew Gosali
2025-03-18 16:30:45 +07:00
parent 8f89677192
commit 78187606c6
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
grade/grading/form/guide/classes/grades/grader/gradingpanel/external/fetch.php
Vendored
+1 -1
View File
@@ -203,7 +203,7 @@ class fetch extends external_api {
$definitionid,
'remark',
$filling['remark'],
(int) $filling['remarkformat']
(int) FORMAT_HTML
);
}
grade/grading/form/guide/lib.php
+5 -2
View File
@@ -857,16 +857,19 @@ class gradingform_guide_instance extends gradingform_instance {
parent::update($data);
foreach ($data['criteria'] as $criterionid => $record) {
// Hardcoding/defaulting to html format for new/existing record
$record['remarkformat'] = FORMAT_HTML;
if (!array_key_exists($criterionid, $currentgrade['criteria'])) {
$newrecord = array('instanceid' => $this->get_id(), 'criterionid' => $criterionid,
'score' => $record['score'], 'remarkformat' => FORMAT_MOODLE);
'score' => $record['score'], 'remarkformat' => $record['remarkformat']);
if (isset($record['remark'])) {
$newrecord['remark'] = $record['remark'];
}
$DB->insert_record('gradingform_guide_fillings', $newrecord);
} else {
$newrecord = array('id' => $currentgrade['criteria'][$criterionid]['id']);
foreach (array('score', 'remark'/*, 'remarkformat' TODO */) as $key) {
foreach (array('score', 'remark', 'remarkformat') as $key) {
if (isset($record[$key]) && $currentgrade['criteria'][$criterionid][$key] != $record[$key]) {
$newrecord[$key] = $record[$key];
}
grade/grading/form/rubric/classes/grades/grader/gradingpanel/external/fetch.php
Vendored
+1 -1
View File
@@ -196,7 +196,7 @@ class fetch extends external_api {
$definitionid,
'remark',
$filling['remark'],
(int) $filling['remarkformat']
(int) FORMAT_HTML
);
}
grade/grading/form/rubric/lib.php
+5 -2
View File
@@ -863,16 +863,19 @@ class gradingform_rubric_instance extends gradingform_instance {
$currentgrade = $this->get_rubric_filling();
parent::update($data);
foreach ($data['criteria'] as $criterionid => $record) {
// Hardcoding/defaulting to html format for new/existing record
$record['remarkformat'] = FORMAT_HTML;
if (!array_key_exists($criterionid, $currentgrade['criteria'])) {
$newrecord = array('instanceid' => $this->get_id(), 'criterionid' => $criterionid,
'levelid' => $record['levelid'], 'remarkformat' => FORMAT_MOODLE);
'levelid' => $record['levelid'], 'remarkformat' => $record['remarkformat']);
if (isset($record['remark'])) {
$newrecord['remark'] = $record['remark'];
}
$DB->insert_record('gradingform_rubric_fillings', $newrecord);
} else {
$newrecord = array('id' => $currentgrade['criteria'][$criterionid]['id']);
foreach (array('levelid', 'remark'/*, 'remarkformat' */) as $key) {
foreach (array('levelid', 'remark', 'remarkformat') as $key) {
// TODO MDL-31235 format is not supported yet
if (isset($record[$key]) && $currentgrade['criteria'][$criterionid][$key] != $record[$key]) {
$newrecord[$key] = $record[$key];