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

Merge branch 'MDL-26486_m20' of git://github.com/rwijaya/moodle into MOODLE_20_STABLE

Browse Source
This commit is contained in:
Aparup Banerjee
2011-10-03 16:03:03 +08:00
parent 5dd5818c9a d754f1b012
commit e2c3a02bb8
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lesson/pagetypes/matching.php
+11 -14
View File
@@ -383,26 +383,23 @@ class lesson_page_type_matching extends lesson_page {
} else {
$answerdata->response = $answer->response;
}
if ($this->lesson->custom) {
$answerdata->score = get_string("pointsearned", "lesson").": ".$answer->score;
} else {
$answerdata->score = get_string("receivedcredit", "lesson");
}
} elseif ($n == 1 && $useranswer != NULL && !$useranswer->correct) {
if ($answer->response == NULL && $useranswer != NULL) {
$answerdata->response = get_string("thatsthewronganswer", "lesson");
} else {
$answerdata->response = $answer->response;
}
} elseif ($n > 1) {
if ($n == 2 && $useranswer != NULL && $useranswer->correct) {
if ($this->lesson->custom) {
$answerdata->score = get_string("pointsearned", "lesson").": ".$answer->score;
} else {
$answerdata->score = get_string("receivedcredit", "lesson");
}
} elseif ($n == 3 && $useranswer != NULL && !$useranswer->correct) {
if ($this->lesson->custom) {
$answerdata->score = get_string("pointsearned", "lesson").": ".$answer->score;
} else {
$answerdata->score = get_string("didnotreceivecredit", "lesson");
}
if ($this->lesson->custom) {
$answerdata->score = get_string("pointsearned", "lesson").": ".$answer->score;
} else {
$answerdata->score = get_string("didnotreceivecredit", "lesson");
}
} elseif ($n > 1) {
$data = "<select disabled=\"disabled\"><option selected=\"selected\">".strip_tags(format_string($answer->answer))."</option></select>";
if ($useranswer != NULL) {
$userresponse = explode(",", $useranswer->useranswer);
@@ -427,7 +424,7 @@ class lesson_page_type_matching extends lesson_page {
$percent = get_string("nooneansweredthisquestion", "lesson");
}
} else {
$percent = "";
$percent = '';
}
$answerdata->answers[] = array($data, $percent);
mod/lesson/pagetypes/shortanswer.php
+1 -1
View File
@@ -260,7 +260,7 @@ class lesson_page_type_shortanswer extends lesson_page {
$answerdata->answers[] = array(get_string("nooneansweredthisquestion", "lesson"), " ");
}
$i++;
} else if ($useranswer != null && ($answer->id == $useranswer->answerid || ($answer == end($answers) && empty($answerdata)))) {
} else if ($useranswer != null && ($answer->id == $useranswer->answerid || $answer == end($answers))) {
// get in here when what the user entered is not one of the answers
$data = '<input type="text" size="50" disabled="disabled" readonly="readonly" value="'.s($useranswer->useranswer).'">';
if (isset($pagestats[$this->properties->id][$useranswer->useranswer])) {