moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-50283 gradingform_rubric: Minor styling fixes

Browse source
This commit is contained in:
David Monllao 2015-06-19 12:44:07 +08:00
parent e22c8d2ae3
commit a939ae6da7
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
grade/grading/form/rubric/js/rubriceditor.js
View file

@ -205,32 +205,32 @@ M.gradingform_rubriceditor.buttonclick = function(e, confirmed) {
M.util.show_confirm_dialog(e, dialog_options); M.util.show_confirm_dialog(e, dialog_options);
} }
} else if (chunks.length == 4 && action == 'duplicate') { } else if (chunks.length == 4 && action == 'duplicate') {
// DUPLICATE CRITERION // Duplicate criterion.
var levelsdef = [], levelsscores = [0], levidx = 1; var levelsdef = [], levelsscores = [0], levidx = null;
var parentel = Y.one('#'+name+'-criteria'); var parentel = Y.one('#'+name+'-criteria');
if (parentel.one('>tbody')) { parentel = parentel.one('>tbody'); } if (parentel.one('>tbody')) { parentel = parentel.one('>tbody'); }
var source = Y.one('#'+name+'-criteria-'+chunks[2]); var source = Y.one('#'+name+'-criteria-'+chunks[2]);
if (source.all('.level')) { if (source.all('.level')) {
var lastcriterion = source.all('.level'); var lastcriterion = source.all('.level');
for (levidx=0;levidx<lastcriterion.size();levidx++) { for (levidx = 0; levidx < lastcriterion.size(); levidx++) {
levelsdef[levidx] = lastcriterion.item(levidx).one('.definition .textvalue').get('innerHTML'); levelsdef[levidx] = lastcriterion.item(levidx).one('.definition .textvalue').get('innerHTML');
} }
for (levidx=0;levidx<lastcriterion.size();levidx++) { for (levidx = 0; levidx < lastcriterion.size(); levidx++) {
levelsscores[levidx] = lastcriterion.item(levidx).one('.score input[type=text]').get('value'); levelsscores[levidx] = lastcriterion.item(levidx).one('.score input[type=text]').get('value');
} }
} }
for (levidx;levidx<3;levidx++) { levelsscores[levidx] = parseFloat(levelsscores[levidx-1]) + 1; } for (levidx; levidx < 3; levidx++) { levelsscores[levidx] = parseFloat(levelsscores[levidx-1]) + 1; }
var levelsstr = ''; var levelsstr = '';
for (levidx=0;levidx<levelsscores.length;levidx++) { for (levidx = 0; levidx < levelsscores.length; levidx++) {
levelsstr += M.gradingform_rubriceditor.templates[name]['level'] levelsstr += M.gradingform_rubriceditor.templates[name].level
.replace(/\{LEVEL-id\}/g, 'NEWID'+(newlevid+levidx)) .replace(/\{LEVEL-id\}/g, 'NEWID'+(newlevid+levidx))
.replace(/\{LEVEL-score\}/g, levelsscores[levidx]) .replace(/\{LEVEL-score\}/g, levelsscores[levidx])
.replace(/\{LEVEL-definition\}/g, Y.Escape.html(levelsdef[levidx])); .replace(/\{LEVEL-definition\}/g, Y.Escape.html(levelsdef[levidx]));
} }
var description = source.one('.description .textvalue'); var description = source.one('.description .textvalue');
var newcriterion = M.gradingform_rubriceditor.templates[name]['criterion'] var newcriterion = M.gradingform_rubriceditor.templates[name].criterion
.replace(/\{LEVELS\}/, levelsstr) .replace(/\{LEVELS\}/, levelsstr)
.replace(/\{CRITERION-description\}/, Y.Escape.html(description.get('innerHTML'))); .replace(/\{CRITERION-description\}/, Y.Escape.html(description.get('innerHTML')));
parentel.append(newcriterion.replace(/\{CRITERION-id\}/g, 'NEWID'+newid).replace(/\{.+?\}/g, '')); parentel.append(newcriterion.replace(/\{CRITERION-id\}/g, 'NEWID'+newid).replace(/\{.+?\}/g, ''));
@ -276,4 +276,4 @@ M.gradingform_rubriceditor.calculatenewid = function (elements_str) {
if (id.match(/^NEWID(\d+)$/)) newid = Math.max(newid, parseInt(id.substring(5))+1); if (id.match(/^NEWID(\d+)$/)) newid = Math.max(newid, parseInt(id.substring(5))+1);
} ); } );
return newid return newid
} }

2
grade/grading/form/rubric/version.php
View file

@ -25,7 +25,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$plugin->component = 'gradingform_rubric'; $plugin->component = 'gradingform_rubric';
$plugin->version = 2015051100; $plugin->version = 2015051101;
$plugin->requires = 2015050500; $plugin->requires = 2015050500;