Skip to content

Commit

Permalink
Updated questiontype.php to make essay compatible with manual grading…
Browse files Browse the repository at this point in the history 
… (aka removed a lot of code).

Adding display.html as a display html template for the essay question type

TODO: drop the question_essay_states table and migrate comments to question_sessions
  • Loading branch information
mark-nielsen committed Apr 8, 2006
1 parent dbb3c4c commit a472184
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 209 deletions.
27 changes: 27 additions & 0 deletions question/type/essay/display.html
View file
@@ -0,0 +1,27 @@
<div class="qtext">
<?php echo $questiontext; ?>
</div>

<?php if ($image) { ?>
<img class="qimage" src="<?php echo $image; ?>" alt="" />
<?php } ?>

<div class="ablock clearfix">
<div class="prompt">
<?php echo $stranswer; ?>
</div>

<table class="answer">
<tr>
<td>
<?php echo $answer; ?>
</td>
</tr>
<tr>
<td class="c0 feedback">
<?php echo $feedback; ?>
</td>
</tr>
</table>
<?php $this->print_question_submit_buttons($question, $state, $cmoptions, $options); ?>
</div>
243 changes: 34 additions & 209 deletions question/type/essay/questiontype.php
View file
Expand Up @@ -68,16 +68,6 @@ function save_question_options($question) {
return true; return true;
} }


/**
* Deletes states from the question-type specific tables
*
* @param string $stateslist Comma separated list of state ids to be deleted
*/
function delete_states($stateslist) {
delete_records_select("question_essay_states", "stateid IN ($stateslist)");
return true;
}

/** /**
* Deletes a question from the question-type specific tables * Deletes a question from the question-type specific tables
* *
Expand All @@ -89,235 +79,70 @@ function delete_question($questionid) {
} }


function print_question_formulation_and_controls(&$question, &$state, $cmoptions, $options) { function print_question_formulation_and_controls(&$question, &$state, $cmoptions, $options) {
global $CFG;


$answers = &$question->options->answers; $answers = &$question->options->answers;
//$correctanswers = $this->get_correct_responses($question, $state); // no correct answers ;) $readonly = empty($options->readonly) ? '' : 'disabled="disabled"';
$readonly = empty($options->readonly) ? '' : 'disabled="disabled"'; $usehtmleditor = can_use_html_editor();

$formatoptions = new stdClass;
$formatoptions->noclean = true; $formatoptions->noclean = true;
$formatoptions->para = false; $formatoptions->para = false;
$nameprefix = $question->name_prefix;


/// Print question text and media $inputname = $question->name_prefix;
echo format_text($question->questiontext, $stranswer = get_string("answer", "quiz").': ';
$question->questiontextformat,
$formatoptions, $cmoptions->course); /// set question text and media
$questiontext = format_text($question->questiontext,
$question->questiontextformat,
$formatoptions, $cmoptions->course);


echo get_question_image($question, $cmoptions->course); $image = get_question_image($question, $cmoptions->course);


/// Print input controls // feedback handling
$stranswer = get_string("answer", "quiz"); $feedback = '';
$strcomment = get_string("comments", "quiz"); if ($options->feedback) {
$usehtmleditor = can_use_html_editor(); foreach ($answers as $answer) {
$feedback = format_text($answer->feedback, '', $formatoptions, $cmoptions->course);
}
}


// this prints out the student response box // get response value
if (isset($state->responses[''])) { if (isset($state->responses[''])) {
// security problem. responses[''] is never cleaned before it is sent to the db (I think) // security problem. responses[''] is never cleaned before it is sent to the db (I think)
$value = clean_param(addslashes($state->responses['']), PARAM_CLEANHTML); $value = $state->responses[''];
} else { } else {
$value = ""; $value = "";
} }


$inputname = $nameprefix; // answer

echo "<p>$stranswer: </p>".
'<div style="padding-left: 30px;">';
if (empty($options->readonly)) { if (empty($options->readonly)) {
// the student needs to type in their answer so print out a text editor // the student needs to type in their answer so print out a text editor
print_textarea($usehtmleditor, 18, 80, 630, 400, $inputname, $value); $answer = print_textarea($usehtmleditor, 18, 80, 630, 400, $inputname, $value, $cmoptions->course, true);
use_html_editor($inputname);
} else { } else {
// it is read only, so just format the students answer and output it // it is read only, so just format the students answer and output it
echo format_text($value, $question->questiontextformat, $answer = format_text($value, $question->questiontextformat,
$formatoptions, $cmoptions->course); $formatoptions, $cmoptions->course);
echo '<input type="hidden" name="'.$inputname.'" value="'.htmlSpecialChars($value).'" />'; // need hidden one for grading
}
echo '</div>';

if (isset($state->responses['response'])) {
$value = $state->responses['response'];
} else {
$value = "";
} }

include("$CFG->dirroot/question/type/essay/display.html");


$inputname = $nameprefix.'response'; if ($usehtmleditor) {
if(!empty($options->regrade)) { // special option set in regrade.php. This means we want to grade the essay question
// print out a field for the teacher to add a comment
echo "<p>$strcomment: ".
'<div style="padding-left: 30px;">';
print_textarea($usehtmleditor, 18, 80, 630, 400, $inputname, $value);
use_html_editor($inputname); use_html_editor($inputname);
echo '</div></p><br />';

// dropdown for score... for the fraction
$grades = array(1,0.9,0.8,0.75,0.70,0.66666,0.60,0.50,0.40,0.33333,0.30,0.25,0.20,0.16666,0.142857,0.10,0.05,0);
foreach ($grades as $grade) {
$percentage = 100 * $grade;
$neggrade = -$grade;
$gradeoptions["$grade"] = "$percentage %";
$gradeoptionsfull["$grade"] = "$percentage %";
$gradeoptionsfull["$neggrade"] = -$percentage." %";
}
$gradeoptionsfull["0"] = $gradeoptions["0"] = get_string("none");
print_string("grade");
echo ":&nbsp;";
choose_from_menu($gradeoptions, $nameprefix."fraction", $state->responses['fraction'],"");
} else if (!empty($options->readonly)) {
//read only so format the comment and print it out
echo "<p>$strcomment: </p>".
'<div style="padding-left: 30px;">';
if (empty($value)) { // no comment yet
echo format_text(get_string('nocommentsyet', 'quiz'));
} else {
echo format_text($value, '', $formatoptions, $cmoptions->course);
}
echo '</div>';
}

// feedback
if ($options->feedback) {
foreach ($answers as $answer) {
format_text("<p align=\"right\">$answer->feedback</p>", '', $formatoptions, $cmoptions->course);
}
} }
$this->print_question_submit_buttons($question, $state, $cmoptions, $options);
} }


function grade_responses(&$question, &$state, $cmoptions) { function grade_responses(&$question, &$state, $cmoptions) {
$state->raw_grade = 0; // All grading takes place in Manual Grading
// if a fraction is submitted, then we use it, otherwise the raw grade is 0
if (isset($state->responses['fraction']) and $state->responses['fraction']) {
$state->raw_grade = $state->responses['fraction'];
$state->options->graded = 1;
// mark the state as graded
$state->event = ($state->event == QUESTION_EVENTCLOSE) ? QUESTION_EVENTCLOSEANDGRADE : QUESTION_EVENTGRADE;
} else {
$state->raw_grade = 0;
}

// Make sure we don't assign negative or too high marks
$state->raw_grade = min(max((float) $state->raw_grade,
0.0), 1.0) * $question->maxgrade;
$state->penalty = $question->penalty * $question->maxgrade; // should be no penalty for essays

return true;
}

function create_session_and_responses(&$question, &$state, $cmoptions, $attempt) {
$state->options->graded = 0; // our flag to indicated wheather an essay has been graded or not
$state->responses['fraction'] = 0; // this fraction is used for grading. The teacher sets it while grading
$state->responses['response'] = ''; // this is teacher response to the students essay

return true;
}

function restore_session_and_responses(&$question, &$state) {
if (!$options = get_record('question_essay_states', 'stateid', $state->id)) {
return false;
}
$state->options->graded = $options->graded;
$state->responses['fraction'] = $options->fraction;
$state->responses['response'] = $options->response;


return true; clean_param($state->responses[''], PARAM_CLEANHTML);
}

function save_session_and_responses(&$question, &$state) {
$options->stateid = $state->id;


if (isset($state->options->graded)) { $state->raw_grade = 0;
$options->graded = $state->options->graded; $state->penalty = 0;
} else {
$options->graded = 0;
}

if (isset($state->responses['fraction'])) {
$options->fraction = $state->responses['fraction'];
}
if (isset($state->responses['response'])) {
$options->response = addslashes( clean_param($state->responses['response'], PARAM_CLEANHTML) );
}
if (isset($state->update)) {
if (!$options->id = get_field('question_essay_states', 'id', 'stateid', $state->id)) {
return false;
}
if (!update_record('question_essay_states', $options)) {
return false;
}
} else {
if (!insert_record('question_essay_states', $options)) {
return false;
}
}


return true; return true;
} }


/**
* Utility function to count the number of ungraded essays
* and the number of students those essays belong to.
*
* @param object $cmoptions Course module options
* @param mixed $users string/array Specify a specific user or a set of users as an array with ids as keys or as a comma separated list. Defaults to current user.
* @param string $attemptid Specify a specific attempt
* @return array First item in array is the number of ungraded essays and the second is the number of students
* @todo make this function quiz independent
*/
function get_ungraded_count($cmoptions, $users=0, $attemptid=0) {
global $USER, $CFG;

// prep the userids variable
if (empty($users)) {
$userids = $USER->id;
}else if (is_array($users)) {
$userids = implode(', ', array_keys($users));
} else {
$userids = $users;
}

$ungradedcount = 0; // holds the number of ungraded essays
$usercount = array(); // holds the number of users of ungraded essays

// get the essay questions
$questionlist = quiz_questions_in_quiz($cmoptions->questions);
$sql = "SELECT q.*, i.grade AS maxgrade, i.id AS instance".
" FROM {$CFG->prefix}question q,".
" {$CFG->prefix}quiz_question_instances i".
" WHERE i.quiz = '$cmoptions->id' AND q.id = i.question".
" AND q.id IN ($questionlist)".
" AND q.qtype = '".'essay'."'".
" ORDER BY q.name";

if (empty($attemptid)) {
$attemptsql = "quiz = $cmoptions->id and timefinish > 0 and userid IN ($userids)";
} else {
$attemptsql = "id = $attemptid";
}
if ($questions = get_records_sql($sql)) {
// get all the finished attempts by the users
if ($attempts = get_records_select('quiz_attempts', $attemptsql, 'userid, attempt')) {
foreach($questions as $question) {
// determine the number of ungraded attempts essays
foreach ($attempts as $attempt) {
// grab the state then check if it is graded
if (!$neweststate = get_record('question_sessions', 'attemptid', $attempt->uniqueid, 'questionid', $question->id)) {
error("Can not find newest states for attempt $attempt->uniqueid for question $question->id");
}
if (!$questionstate = get_record('question_essay_states', 'stateid', $neweststate->newest)) {
error('Could not find question state');
}
if (!$questionstate->graded) {
$ungradedcount++;
}
// keep track of users
$usercount[$attempt->userid] = 1;
}
}
}
}

return array($ungradedcount, count($usercount));
}

/// BACKUP FUNCTIONS //////////////////////////// /// BACKUP FUNCTIONS ////////////////////////////


/* /*
Expand Down

0 comments on commit a472184

Please sign in to comment.