Manual grading report plugin is now no longer essay-specific.

diff --git a/lang/en_utf8/quiz.php b/lang/en_utf8/quiz.php
index d4e2f3f49e55fe28bb4731312865db2262384847..97ee55342a1dea6673f082e72d9636cf08cde052 100644 (file)
--- a/lang/en_utf8/quiz.php
+++ b/lang/en_utf8/quiz.php
@@ -505,11 +505,11 @@ $string['changessaved'] = 'Grading Changes Saved';
 $string['comments'] = 'Comments';
 $string['editingessay'] = 'Editing Essay';
 $string['essay'] = 'Essay';
-$string['essayquestions'] = 'Essay Questions';
+$string['essayquestions'] = 'Questions';
 $string['gradeall'] = 'Grade All';
 $string['gradeessays'] = 'Grade Essays';
 $string['nocommentsyet'] = 'No comments yet.';
-$string['noessayquestionsfound'] = 'No Essay Questions Found';
+$string['noessayquestionsfound'] = 'No manually graded questions found';
 $string['ungraded'] = 'Ungraded';
 
 ?>

diff --git a/lang/en_utf8/quiz_grading.php b/lang/en_utf8/quiz_grading.php
index ca67be9009d81545cbcc597f0eeb9c34851673dc..bb85423681c33ab1f5edc26509d5e618b30467db 100644 (file)
--- a/lang/en_utf8/quiz_grading.php
+++ b/lang/en_utf8/quiz_grading.php
@@ -1,5 +1,5 @@
 <?php // $Id$
 
 $string['grading'] = 'Manual grading';
-$string['essayonly'] = 'Manual grading has so far been implemented for essay questions only';
+$string['essayonly'] = 'The following questions need to be graded manually';
 ?>

diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index 819854896826c653ebaca7cd01ad15b63af0001d..dee349ec64aec10ef795e46184448d76569f25e1 100644 (file)
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -24,7 +24,7 @@ class quiz_report extends quiz_default_report {
         $questionid = optional_param('questionid', 0, PARAM_INT);
 
         $this->print_header_and_tabs($cm, $course, $quiz, $reportmode="grading");
-        
+
         if (!empty($questionid)) {
             if (! $question = get_record('question', 'id', $questionid)) {
                 error("Question with id $questionid not found");
@@ -85,10 +85,10 @@ class quiz_report extends quiz_default_report {
 
         // the second view displays the users who have answered the essay question
         // and all of their attempts at answering the question
-        
+
         // the third prints the question with a comment
         // and grade form underneath it
-        
+
         switch($action) {
             case 'viewquestions':
                 $this->view_questions($quiz);
@@ -102,7 +102,7 @@ class quiz_report extends quiz_default_report {
         }
         return true;
     }
-    
+
     /**
      * Prints a table containing all manually graded questions
      *
@@ -113,17 +113,15 @@ class quiz_report extends quiz_default_report {
      * @todo Look for the TODO in this code to see what still needs to be done
      **/
     function view_questions($quiz) {
-        global $CFG;
-        
+        global $CFG, $QTYPE_MANUAL;
+
         $users = get_course_students($quiz->course);
 
         if(empty($users)) {
             print_heading(get_string("noattempts", "quiz"));
             return true;
         }
-        
-        notify(get_string('essayonly', 'quiz_grading'));
-        
+
         // setup the table
         $table = new stdClass;
         $table->head = array(get_string("essayquestions", "quiz"), get_string("ungraded", "quiz"));
@@ -140,14 +138,15 @@ class quiz_report extends quiz_default_report {
                "       {$CFG->prefix}quiz_question_instances i".
                " WHERE i.quiz = '$quiz->id' AND q.id = i.question".
                "   AND q.id IN ($questionlist)".
-// TODO: create an array of manually graded questions OR new function (preferred) in question class $QTYPE->is_manually_graded return boolean
-               "   AND q.qtype = 'essay'".
+               "   AND q.qtype IN ($QTYPE_MANUAL)".
                "   ORDER BY q.name";
         if (empty($questionlist) or !$questions = get_records_sql($sql)) {
-// TODO: Make this none essay specific            
             print_heading(get_string('noessayquestionsfound', 'quiz'));
             return false;
         }
+
+        notify(get_string('essayonly', 'quiz_grading'));
+
         // get all the finished attempts by the users
         $userids = implode(', ', array_keys($users));
         if ($attempts = get_records_select('quiz_attempts', "quiz = $quiz->id and timefinish > 0 AND userid IN ($userids) AND preview = 0", 'userid, attempt')) {
@@ -169,10 +168,10 @@ class quiz_report extends quiz_default_report {
         } else {
             print_heading(get_string('noattempts', 'quiz'));
         }
-        
+
         return true;
     }
-    
+
     /**
      * Prints a table with users and their attempts
      *
@@ -182,11 +181,11 @@ class quiz_report extends quiz_default_report {
      **/
     function view_question($quiz, $question) {
         global $CFG, $db;
-        
+
         $users     = get_course_students($quiz->course);
         $userids   = implode(',', array_keys($users));
         $usercount = count($users);
-        
+
         // set up table
         $tablecolumns = array('picture', 'fullname', 'attempt');
         $tableheaders = array('', get_string('fullname'), get_string("attempts", "quiz"));
@@ -223,7 +222,7 @@ class quiz_report extends quiz_default_report {
         $where .= 'AND '.$db->IfNull('qa.attempt', '0').' != 0 ';
         $where .= 'AND '.$db->IfNull('qa.timefinish', '0').' != 0 ';
         $where .= 'AND preview = 0 '; // ignore previews
- 
+
         if($table->get_sql_where()) { // forgot what this does
             $where .= 'AND '.$table->get_sql_where();
         }
@@ -282,7 +281,7 @@ class quiz_report extends quiz_default_report {
         echo '</div>';
         echo $links;
     }
-    
+
     /**
      * Checks to see if a question in a particular attempt is graded
      *
@@ -291,18 +290,18 @@ class quiz_report extends quiz_default_report {
      **/
     function is_graded($question, $attempt) {
         global $CFG;
-        
-        if (!$state = get_record_sql("SELECT state.id, state.event FROM 
-                                        {$CFG->prefix}question_states state, {$CFG->prefix}question_sessions sess 
-                                        WHERE sess.newest = state.id AND 
+
+        if (!$state = get_record_sql("SELECT state.id, state.event FROM
+                                        {$CFG->prefix}question_states state, {$CFG->prefix}question_sessions sess
+                                        WHERE sess.newest = state.id AND
                                         sess.attemptid = $attempt->uniqueid AND
                                         sess.questionid = $question->id")) {
             error('Could not find question state');
         }
-        
+
         return question_state_is_graded($state);
     }
-    
+
     /**
      * Prints questions with comment and grade form underneath each question
      *
@@ -311,17 +310,17 @@ class quiz_report extends quiz_default_report {
      **/
     function print_questions_and_form($quiz, $question) {
         global $CFG, $db;
-        
+
         // grade question specific parameters
         $gradeall  = optional_param('gradeall', 0, PARAM_INT);
         $userid    = optional_param('userid', 0, PARAM_INT);
         $attemptid = optional_param('attemptid', 0, PARAM_INT);
-        
+
         $questions[$question->id] = &$question;
         $usehtmleditor = can_use_richtext_editor();
         $users     = get_course_students($quiz->course);
         $userids   = implode(',', array_keys($users));
-        
+
         // this sql joins the attempts table and the user table
         $select = 'SELECT '.$db->Concat('u.id', '\'#\'', $db->IfNull('qa.attempt', '0')).' AS userattemptid,
                     qa.id AS attemptid, qa.uniqueid, qa.attempt, qa.timefinish, qa.preview,
@@ -374,18 +373,18 @@ class quiz_report extends quiz_default_report {
                 get_string('attempt', 'quiz').$attempt->attempt;
 
             print_question($question, $state, '', $quiz, $options);
-            
+
             $prefix         = "manualgrades[$attempt->uniqueid]";
             $grade          = round($state->last_graded->grade, 3);
             $state->comment = $copy;
-            
+
             include($CFG->wwwroot.'/question/comment.html');
-            
+
             echo '</div>';
         }
         echo '<div align="center"><input type="submit" value="'.get_string('savechanges').'"></div>'.
             '</form>';
-            
+
         if ($usehtmleditor) {
             use_html_editor();
         }

diff --git a/question/type/essay/questiontype.php b/question/type/essay/questiontype.php
index d84bbbea5fa543b50217ad0e892e38ab348854ad..82309608411ae4eb68bdc839f7d7a3767e730bf5 100644 (file)
--- a/question/type/essay/questiontype.php
+++ b/question/type/essay/questiontype.php
@@ -250,5 +250,7 @@ class question_essay_qtype extends default_questiontype {
 $QTYPES['essay'] = new question_essay_qtype();
 // The following adds the questiontype to the menu of types shown to teachers
 $QTYPE_MENU['essay'] = get_string("essay", "quiz");
+// Add essay to the list of manually graded questions
+$QTYPE_MANUAL = isset($QTYPE_MANUAL) ? $QTYPE_MANUAL.",'essay'" : "'essay'";
 
 ?>