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

Merge branch 'MDL-26445' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2011-03-07 01:12:55 +01:00
parent 7d754148c4 8f63ab1f44
commit 34e30d9bce
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/numerical/questiontype.php
+2 -2
View File
@@ -608,7 +608,7 @@ class question_numerical_qtype extends question_shortanswer_qtype {
if($question->options->unitgradingtype == 1){
$raw_unitpenalty = $question->options->unitpenalty * $rawgrade ;
}else {
$raw_unitpenalty = $question->options->unitpenalty * $question->maxgrade;
$raw_unitpenalty = $question->options->unitpenalty ;
}
$state->options->raw_unitpenalty = $raw_unitpenalty ;
}
@@ -818,7 +818,7 @@ class question_numerical_qtype extends question_shortanswer_qtype {
if($question->options->unitgradingtype == 1){
$raw_unitpenalty = $question->options->unitpenalty * $state->raw_grade ;
}else {
$raw_unitpenalty = $question->options->unitpenalty * $question->maxgrade;
$raw_unitpenalty = $question->options->unitpenalty ;
}
$state->raw_grade -= $raw_unitpenalty ;
}
question/type/shortanswer/questiontype.php
+1 -1
View File
@@ -318,7 +318,7 @@ class question_shortanswer_qtype extends default_questiontype {
// waiting for the new question engine code for a permanent one
if(isset($state->options->raw_unitpenalty) && $state->options->raw_unitpenalty > 0.0 ){
echo ' ';
print_string('unitappliedpenalty','qtype_numerical',question_format_grade($cmoptions, $state->options->raw_unitpenalty ));
print_string('unitappliedpenalty','qtype_numerical',question_format_grade($cmoptions, $state->options->raw_unitpenalty * $question->maxgrade ));
}
if ($cmoptions->penaltyscheme) {
// print details of grade adjustment due to penalties