This patch modifies the logic to include answers which have a grade in the validation.

This does have the effect that to remove an answer you must now unset both the answer, and the grade; but does ensure that a more accurate error message is given.

Basically right, but your patch is a bit sucky.

1. Please change the error string to "Grade set, but the Answer is blank." (If you agree with me that it is clearer.)

2. Your change to the code seems unnecessarily spaghetti-like.

if (empty($trimmedanswer) && empty($data['fraction'][$key])) {

    continue;

}

if (empty($trimmedanswer)) {

    $errors['fraction[' . $key . ']'] = get_string('errnoanswerwithgrade', 'qtype_multichoice');

}

Seems simpler to me.

I mean to add. If you can fix your commit, and cherry-pick to all reasonable branches, I will be happy to submit this for integration. Thanks for working on it.

Cheers Tim,

I've updated with your comments and pushed branches for 2.1, and master. 2.0 makes life harder because it tests whether the answer is empty a couple of times – I can try and find a non-sucky solution if you wish.

I've had to cast the fraction to a float first and test that because $data['fraction'] contains string values of 0.0 (which are never empty).

Thanks for the review

I've updated with your comments, and adjusted to cast the fraction to a float first.

Thank you for the review

Thanks Andrew. Submitting for integration now.

The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

TIA and ciao

Thanks guys, this has been integrated and is up for testing.

All good

Done, your delicious hacks have been sent upstream, many thanks!

Closing as fixed, ciao