Skip to content

Commit

Permalink
Merge pull request #49 from wiris/v4.11.0
Browse files Browse the repository at this point in the history 
V4.11.0
  • Loading branch information
@ptorrent-at-wiris
ptorrent-at-wiris committed Mar 23, 2024
2 parents e1ea178 + c79f811 commit c7f0a4d
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 16 deletions.
42 changes: 30 additions & 12 deletions question.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
require_once($CFG->dirroot . '/question/type/wq/step.php');

class qtype_shortanswerwiris_question extends qtype_wq_question
implements question_automatically_gradable, question_response_answer_comparer {
implements question_automatically_gradable, question_response_answer_comparer {
/**
* A link to last question attempt step and also a helper class for some
* grading issues.
Expand Down Expand Up @@ -81,12 +81,15 @@ public function grade_response(array $response) {
$answer = $this->get_matching_answer($response);
if ($answer) {
$fraction = $answer->fraction;

// Multiply Moodle fraction by quizzes grade (due to custom function
// grading or compound grade distribution).
$grade = $this->step->get_var('_matching_answer_grade');
$grade = $this->step->get_var_in_answer_cache('_matching_answer_grade', $response['answer']);

if (!empty($grade)) {
$fraction = $fraction * $grade;
}

$state = question_state::graded_state_for_fraction($fraction);
return array($fraction, $state);
} else if ($this->step->is_error()) {
Expand All @@ -109,8 +112,11 @@ public function get_matching_answer_fail_test(array $response) {
$conditiona = isset($CFG->wq_fail_shortanswer_grade) && $CFG->wq_fail_shortanswer_grade;
if ($conditiona && $CFG->wq_fail_shortanswer_grade != 'false') {
$fail = explode("@", $CFG->wq_fail_shortanswer_grade);
$attemptid = $DB->get_record('question_attempt_steps',
array('id' => $this->step->step_id), 'questionattemptid')->questionattemptid;
$attemptid = $DB->get_record(
'question_attempt_steps',
array('id' => $this->step->step_id),
'questionattemptid'
)->questionattemptid;
$attemptid = $DB->get_record('question_attempts', array('id' => $attemptid), 'questionusageid')->questionusageid;
$activity = $DB->get_field('question_usages', 'component', array('id' => $attemptid));
if ($activity == 'mod_quiz') {
Expand All @@ -133,8 +139,11 @@ public function get_matching_answer_fail_test(array $response) {
}
// Used to simulate a grade failure when doing tests!
if ($error) {
throw new moodle_exception(get_string('failedtogradetest', 'qtype_shortanswerwiris',
($this->step->get_attempts() + 1)), 'qtype_wq');
throw new moodle_exception(get_string(
'failedtogradetest',
'qtype_shortanswerwiris',
($this->step->get_attempts() + 1)
), 'qtype_wq');
}
// END TEST.
}
Expand All @@ -145,10 +154,13 @@ public function get_matching_answer(array $response) {
if (!isset($response['answer']) || $response['answer'] === null) {
return null;
}

// Optimization in order to avoid a service call.
$responsehash = md5($response['answer']);
if ($this->step->get_var('_response_hash') == $responsehash) {
$matchinganswer = $this->step->get_var('_matching_answer');
$answer = $response['answer'];
$responsehash = md5($answer);

if ($this->step->is_answer_cached($answer)) {
$matchinganswer = $this->step->get_var_in_answer_cache('_matching_answer', $answer);
if (!empty($matchinganswer)) {
return $this->base->answers[$matchinganswer];
} else if (!is_null($matchinganswer)) {
Expand All @@ -162,6 +174,11 @@ public function get_matching_answer(array $response) {
return null;
}

if ($this->parent) {
// Questions with parent should be graded together in multianswerwiris qtype!
throw new moodle_exception('Questions with parent should be graded together');
}

// Test code:
// Does nothing on production, may throw exception on test environment.
$this->get_matching_answer_fail_test($response);
Expand Down Expand Up @@ -192,7 +209,7 @@ public function get_matching_answer(array $response) {
$max = 0.0;
$maxwqgrade = 0.0;
$matchinganswerposition = -1;

for ($i = 0; $i < count($correctanswers); $i++) {
$wqgrade = $qi->getAnswerGrade($i, 0, $this->wirisquestion);
$grade = $wqgrade * $correctanswers[$i]->fraction;
Expand All @@ -210,7 +227,7 @@ public function get_matching_answer(array $response) {
// Backup matching answer.
$matchinganswerid = 0;
$answer = null;

// Reset variable.
$this->step->set_var('_matching_answer_grade', null);
if ($matchinganswerposition != -1) {
Expand All @@ -219,8 +236,9 @@ public function get_matching_answer(array $response) {
if ($max < 1.0) {
$this->step->set_var('_matching_answer_grade', $maxwqgrade, true);
}
$this->step->set_var('_matching_answer_wq_position', $matchinganswerposition, true);
$this->step->set_var('_matching_answer_wq', $matchinganswerposition, true);
}

$this->step->set_var('_matching_answer', $matchinganswerid, true);
$this->step->set_var('_response_hash', $responsehash, true);
$this->step->set_var('_qi', $qi->serialize(), true);
Expand Down
8 changes: 4 additions & 4 deletions version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

defined('MOODLE_INTERNAL') || die();

$plugin->version = 2024010801;
$plugin->version = 2024032200;
$plugin->requires = 2015111600; // Moodle 3.0.
$plugin->release = '4.10.1';
$plugin->release = '4.11.0';
$plugin->maturity = MATURITY_STABLE;
$plugin->component = 'qtype_shortanswerwiris';
$plugin->dependencies = array (
'qtype_wq' => 2024010801
$plugin->dependencies = array(
'qtype_wq' => 2024032200
);

0 comments on commit c7f0a4d

Please sign in to comment.