MDL-15960 "Overview report does not work correctly with groups" Fixed a problem that group mode was not working as the logic selecting the attempts mode was erroneously showing the all attempts mode.
MDL-15958 "Error on selecting to hide marks for each question" problem with trying to sort on question grades when grades not displayed fixed.
MDL-15953 "Summary chart to show in 5% ranges please" allowed the graph to show up to or equal to 20 bands, instead of just up to 20.
MDL-14201 "Summary graph" showing two graphs now as it was felt that when there were few students in a group compared with all the students who took a quiz then it would be difficult to see the data for the group.
$string['overview'] = 'Grades';
$string['overviewdownload'] = 'Overview download';
$string['overviewdownload'] = 'Overview download';
-$string['overviewreportgraph'] = 'Bar Graph of Number of Students Achieving Grade Ranges';
+$string['overviewreportgraph'] = 'Overall Number of Students Achieving Grade Ranges';
+$string['overviewreportgraphgroup'] = 'Number of Students in Group \'$a\' Achieving Grade Ranges';
$string['pagesize'] = 'Page size';
$string['preferencespage'] = 'Preferences just for this page';
-$string['preferencessave'] = 'Save preferences';
+$string['preferencessave'] = 'Show report';
$string['preferencesuser'] = 'Your preferences for this report';
$string['qprogress'] = 'Question $a->done of $a->todo';
$string['regrade'] = 'Regrade';
var $candelete;
var $reporturl;
var $displayoptions;
+ var $regradedqs = array();
function quiz_report_overview_table($quiz , $qmsubselect, $groupstudents,
$students, $detailedmarks, $questions, $candelete, $reporturl, $displayoptions, $context){
$this->sql->params['qid'.$qid] = $qid;
}
}
+ } else {
+ //unset any sort columns that sort on question grade as the
+ //grades are not being fetched as fields
+ $sess = &$this->sess;
+ foreach($sess->sortby as $column => $order) {
+ if (preg_match('/^qsgrade([0-9]+)/', trim($column))){
+ unset($sess->sortby[$column]);
+ }
+ }
}
}
parent::query_db($pagesize, $useinitialsbar);
- if ($this->detailedmarks){
- //get all the attempt ids we want to display on this page
- //or to export for download.
- if (!$this->is_downloading()) {
- $attemptids = array();
- foreach ($this->rawdata as $attempt){
- if ($attempt->attemptuniqueid > 0){
- $attemptids[] = $attempt->attemptuniqueid;
- }
+ //get all the attempt ids we want to display on this page
+ //or to export for download.
+ if (!$this->is_downloading()) {
+ $attemptids = array();
+ foreach ($this->rawdata as $attempt){
+ if ($attempt->attemptuniqueid > 0){
+ $attemptids[] = $attempt->attemptuniqueid;
}
- $this->gradedstatesbyattempt = quiz_get_newgraded_states($attemptids, true, 'qs.id, qs.grade, qs.event, qs.question, qs.attempt');
+ }
+ $this->gradedstatesbyattempt = quiz_get_newgraded_states($attemptids, true, 'qs.id, qs.grade, qs.event, qs.question, qs.attempt');
+ if (has_capability('mod/quiz:grade', $this->context)){
$this->regradedqs = quiz_get_regraded_qs($attemptids);
- } else {
- $this->gradedstatesbyattempt = quiz_get_newgraded_states($this->sql, true, 'qs.id, qs.grade, qs.event, qs.question, qs.attempt');
+ }
+ } else {
+ $this->gradedstatesbyattempt = quiz_get_newgraded_states($this->sql, true, 'qs.id, qs.grade, qs.event, qs.question, qs.attempt');
+ if (has_capability('mod/quiz:grade', $this->context)){
$this->regradedqs = quiz_get_regraded_qs($this->sql);
}
}
include '../../../../config.php';
include $CFG->dirroot."/lib/graphlib.php";
include $CFG->dirroot."/mod/quiz/report/reportlib.php";
-function graph_get_new_colour(){
- static $colourindex = 0;
- $colours = array('red', 'green', 'yellow', 'orange', 'purple', 'black', 'maroon', 'blue', 'ltgreen', 'navy', 'ltred', 'ltltgreen', 'ltltorange', 'olive', 'gray', 'ltltred', 'ltorange', 'lime', 'ltblue', 'ltltblue');
- $colour = $colours[$colourindex];
- $colourindex++;
- if ($colourindex > (count($colours)-1)){
- $colourindex =0;
- }
- return $colour;
-}
-define('QUIZ_REPORT_MAX_PARTICIPANTS_TO_SHOW_ALL_GROUPS', 500);
$quizid = required_param('id', PARAM_INT);
+$groupid = optional_param('groupid', 0, PARAM_INT);
$quiz = $DB->get_record('quiz', array('id' => $quizid));
$course = $DB->get_record('course', array('id' => $quiz->course));
require_login($course);
$cm = get_coursemodule_from_instance('quiz', $quizid);
-if ($groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used
+$modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
+if ($groupid && $groupmode = groups_get_activity_groupmode($cm)) { // Groups are being used
$groups = groups_get_activity_allowed_groups($cm);
+ if (array_key_exists($groupid, $groups)){
+ $group = $groups[$groupid];
+ if (!$groupusers = get_users_by_capability($modcontext, 'mod/quiz:attempt','','','','',$group->id,'',false)){
+ print_error('nostudentsingroup');
+ } else {
+ $groupusers = array_keys($groupusers);
+ }
+ } else {
+ print_error('errorinvalidgroup', 'group', null, $groupid);
+ }
} else {
$groups = false;
+ $group = false;
+ $groupusers = array();
}
-$modcontext = get_context_instance(CONTEXT_MODULE, $cm->id);
require_capability('mod/quiz:viewreports', $modcontext);
$line = new graph(800,600);
//pick a sensible number of bands depending on quiz maximum grade.
$bands = $quiz->grade;
-while ($bands >= 20 || $bands < 10){
- if ($bands >= 50){
+while ($bands > 20 || $bands <= 10){
+ if ($bands > 50){
$bands = $bands /5;
- } else if ($bands >= 20) {
+ } else if ($bands > 20) {
$bands = $bands /2;
}
if ($bands < 4){
$bands = $bands * 5;
- } else if ($bands < 10){
+ } else if ($bands <= 10){
$bands = $bands * 2;
}
}
$line->x_data = $bandlabels;
$line->y_format['allusers'] =
- array('colour' => graph_get_new_colour(), 'bar' => 'fill', 'shadow_offset' => 1, 'legend' => get_string('allparticipants'));
-$line->y_data['allusers'] = quiz_report_grade_bands($bandwidth, $bands, $quizid);
-if (array_sum($line->y_data['allusers'])>QUIZ_REPORT_MAX_PARTICIPANTS_TO_SHOW_ALL_GROUPS ||
- count($groups)>4){
- if ($groups){
- if ($currentgroup = groups_get_activity_group($cm)){
- $groups = array($currentgroup=>'');
- } else {
- $groups = false;//all participants mode
- }
- }
-}
-$line->y_order = array('allusers');
-if ($groups){
- foreach (array_keys($groups) as $group){
- $useridingroup = get_users_by_capability($modcontext, 'mod/quiz:attempt','','','','',$group,'',false);
- if ($useridingroup){
- $groupdata = quiz_report_grade_bands($bandwidth, $bands, $quizid, array_keys($useridingroup));
- if ($groupdata){
- $line->parameter['bar_size'] = 1.2;
- $line->y_data['groupusers'.$group] = $groupdata;
- //only turn on legends if there is more than one set of bars
- $line->parameter['legend'] = 'outside-top';
- $line->parameter['legend_border'] = 'black';
- $line->parameter['legend_offset'] = 4;
- $line->y_format['groupusers'.$group] =
- array('colour' => graph_get_new_colour(), 'bar' => 'fill', 'shadow_offset' => 1, 'legend' => groups_get_group_name($group));
- $line->y_order[] ='groupusers'.$group;
- }
- }
- }
-}
-
-
+ array('colour' => 'red', 'bar' => 'fill', 'shadow_offset' => 1, 'legend' => get_string('allparticipants'));
+$line->y_data['allusers'] = quiz_report_grade_bands($bandwidth, $bands, $quizid, $groupusers);
+$line->y_order = array('allusers');
$line->parameter['y_min_left'] = 0; // start at 0
$line->parameter['y_max_left'] = max($line->y_data['allusers']);
$gm = '<span class="highlight">'.quiz_get_grading_option_name($this->_customdata['quiz']->grademethod).'</span>';
$showattemptsgrp[] =& $mform->createElement('advcheckbox', 'qmfilter', get_string('showattempts', 'quiz_overview'), get_string('optonlygradedattempts', 'quiz_overview', $gm), null, array(0,1));
}
-
- $showattemptsgrp[] =& $mform->createElement('advcheckbox', 'regradefilter', get_string('showattempts', 'quiz_overview'), get_string('optonlyregradedattempts', 'quiz_overview'), null, array(0,1));
- $mform->addGroup($showattemptsgrp, null, get_string('showattempts', 'quiz_overview'), '<br />', false);
+ if (has_capability('mod/quiz:grade', $this->_customdata['context'])){
+ $showattemptsgrp[] =& $mform->createElement('advcheckbox', 'regradefilter', get_string('showattempts', 'quiz_overview'), get_string('optonlyregradedattempts', 'quiz_overview'), null, array(0,1));
+ }
+ if ($showattemptsgrp){
+ $mform->addGroup($showattemptsgrp, null, get_string('showattempts', 'quiz_overview'), '<br />', false);
+ }
//-------------------------------------------------------------------------------
$mform->addElement('header', 'preferencesuser', get_string('preferencesuser', 'quiz_overview'));
$reporturl = new moodle_url($CFG->wwwroot.'/mod/quiz/report.php', $pageoptions);
$qmsubselect = quiz_report_qm_filter_select($quiz);
-
- $mform = new mod_quiz_report_overview_settings($reporturl, array('qmsubselect'=> $qmsubselect, 'quiz'=>$quiz, 'currentgroup'=>$currentgroup));
+ $mform = new mod_quiz_report_overview_settings($reporturl, array('qmsubselect'=> $qmsubselect, 'quiz'=>$quiz,
+ 'currentgroup'=>$currentgroup, 'context'=>$this->context));
if ($fromform = $mform->get_data()){
$regradeall = false;
$regradealldry = false;
$qmfilter = 0;
}
$regradefilter = optional_param('regradefilter', 0, PARAM_INT);
- if ($attemptsmode === null){
- //default
- $attemptsmode = QUIZ_REPORT_ATTEMPTS_ALL;
- } else if ($currentgroup){
- //default for when a group is selected
- if ($attemptsmode === null || $attemptsmode == QUIZ_REPORT_ATTEMPTS_ALL){
- $attemptsmode = QUIZ_REPORT_ATTEMPTS_STUDENTS_WITH;
- }
- } else if (!$currentgroup && $course->id == SITEID) {
- //force report on front page to show all, unless a group is selected.
- $attemptsmode = QUIZ_REPORT_ATTEMPTS_ALL;
- }
+
$detailedmarks = get_user_preferences('quiz_report_overview_detailedmarks', 1);
$pagesize = get_user_preferences('quiz_report_pagesize', 0);
}
+ if ($currentgroup){
+ //default for when a group is selected
+ if ($attemptsmode === null || $attemptsmode == QUIZ_REPORT_ATTEMPTS_ALL){
+ $attemptsmode = QUIZ_REPORT_ATTEMPTS_STUDENTS_WITH;
+ }
+ } else if (!$currentgroup && $course->id == SITEID) {
+ //force report on front page to show all, unless a group is selected.
+ $attemptsmode = QUIZ_REPORT_ATTEMPTS_ALL;
+ } else if ($attemptsmode === null){
+ //default
+ $attemptsmode = QUIZ_REPORT_ATTEMPTS_ALL;
+ }
if (!$reviewoptions->scores) {
$detailedmarks = 0;
}
- if (!$table->is_downloading()) { //do not print notices when downloading
- $countregradeneeded = $this->count_regrade_all_needed($quiz, $groupstudents);
- //regrade buttons
- if ($currentgroup){
- $a= new object();
- $a->groupname = groups_get_group_name($currentgroup);
- $a->coursestudents = $COURSE->students;
- $a->countregradeneeded = $countregradeneeded;
- $regradealldrydolabel = get_string('regradealldrydogroup', 'quiz_overview', $a);
- $regradealldrylabel = get_string('regradealldrygroup', 'quiz_overview', $a);
- $regradealllabel = get_string('regradeallgroup', 'quiz_overview', $a);
- } else {
- $regradealldrydolabel = get_string('regradealldrydo', 'quiz_overview', $countregradeneeded);
- $regradealldrylabel = get_string('regradealldry', 'quiz_overview');
- $regradealllabel = get_string('regradeall', 'quiz_overview');
- }
- if (has_capability('mod/quiz:grade', $this->context)){
- echo '<div class="mdl-align">';
- echo '<form action="'.$reporturl->out(true).'">';
- echo '<div>';
- echo $reporturl->hidden_params_out(array(), 0, $displayoptions);
- echo '<input type="submit" name="regradeall" value="'.$regradealllabel.'"/>';
- echo '<input type="submit" name="regradealldry" value="'.$regradealldrylabel.'"/>';
- if ($countregradeneeded){
- echo '<input type="submit" name="regradealldrydo" value="'.$regradealldrydolabel.'"/>';
- }
- echo '</div>';
- echo '</form>';
- echo '</div>';
- }
- }
+
if (!$nostudents || ($attemptsmode == QUIZ_REPORT_ATTEMPTS_ALL)){
- // Print information on the grading method and whether we are displaying
- //
- if (!$table->is_downloading()) { //do not print notices when downloading
- if ($strattempthighlight = quiz_report_highlighting_grading_method($quiz, $qmsubselect, $qmfilter)) {
- echo '<div class="quizattemptcounts">' . $strattempthighlight . '</div>';
- }
- }
$showgrades = $quiz->grade && $quiz->sumgrades && $reviewoptions->scores;
// Define table columns
$columns = array();
$headers = array();
-
+ if (!$table->is_downloading()) { //do not print notices when downloading
+ //regrade buttons
+ if (has_capability('mod/quiz:grade', $this->context)){
+ $countregradeneeded = $this->count_regrade_all_needed($quiz, $groupstudents);
+ if ($currentgroup){
+ $a= new object();
+ $a->groupname = groups_get_group_name($currentgroup);
+ $a->coursestudents = $COURSE->students;
+ $a->countregradeneeded = $countregradeneeded;
+ $regradealldrydolabel = get_string('regradealldrydogroup', 'quiz_overview', $a);
+ $regradealldrylabel = get_string('regradealldrygroup', 'quiz_overview', $a);
+ $regradealllabel = get_string('regradeallgroup', 'quiz_overview', $a);
+ } else {
+ $regradealldrydolabel = get_string('regradealldrydo', 'quiz_overview', $countregradeneeded);
+ $regradealldrylabel = get_string('regradealldry', 'quiz_overview');
+ $regradealllabel = get_string('regradeall', 'quiz_overview');
+ }
+ echo '<div class="mdl-align">';
+ echo '<form action="'.$reporturl->out(true).'">';
+ echo '<div>';
+ echo $reporturl->hidden_params_out(array(), 0, $displayoptions);
+ echo '<input type="submit" name="regradeall" value="'.$regradealllabel.'"/>';
+ echo '<input type="submit" name="regradealldry" value="'.$regradealldrylabel.'"/>';
+ if ($countregradeneeded){
+ echo '<input type="submit" name="regradealldrydo" value="'.$regradealldrydolabel.'"/>';
+ }
+ echo '</div>';
+ echo '</form>';
+ echo '</div>';
+ }
+ // Print information on the grading method
+ if ($strattempthighlight = quiz_report_highlighting_grading_method($quiz, $qmsubselect, $qmfilter)) {
+ echo '<div class="quizattemptcounts">' . $strattempthighlight . '</div>';
+ }
+ }
if (!$table->is_downloading() && $candelete) {
$columns[]= 'checkbox';
$headers[] = $header;
}
}
- if ($regradedattempts){
+ if (!$table->is_downloading() && has_capability('mod/quiz:grade', $this->context) && $regradedattempts){
$columns[] = 'regraded';
$headers[] = get_string('regrade', 'quiz_overview');
}
$table->out($pagesize, true);
}
if (!$table->is_downloading()) {
- //should be quicker than a COUNT to test if there is at least one record :
+ if ($currentgroup && $groupstudents){
+ list($usql, $params) = $DB->get_in_or_equal($groupstudents);
+ $params[] = $quiz->id;
+ //should be quicker than a COUNT to test if there is at least one record :
+ if ($DB->get_records_select('quiz_grades', "userid $usql AND quiz = ?", $params, '', '*', 0, 1)){
+ $imageurl = "{$CFG->wwwroot}/mod/quiz/report/overview/overviewgraph.php?id={$quiz->id}&groupid=$currentgroup";
+ $graphname = get_string('overviewreportgraphgroup', 'quiz_overview', groups_get_group_name($currentgroup));
+ print_heading($graphname);
+ echo '<div class="mdl-align"><img src="'.$imageurl.'" alt="'.$graphname.'" /></div>';
+ }
+ }
if ($DB->get_records('quiz_grades', array('quiz'=> $quiz->id), '', '*', 0, 1)){
+ $graphname = get_string('overviewreportgraph', 'quiz_overview');
$imageurl = $CFG->wwwroot.'/mod/quiz/report/overview/overviewgraph.php?id='.$quiz->id;
- print_heading(get_string('overviewreportgraph', 'quiz_overview'));
- echo '<div class="mdl-align"><img src="'.$imageurl.'" alt="'.get_string('overviewreportgraph', 'quiz_overview').'" /></div>';
+ print_heading($graphname);
+ echo '<div class="mdl-align"><img src="'.$imageurl.'" alt="'.$graphname.'" /></div>';
}
}
return true;
//recalculate $attempt->sumgrade
//already updated in regrade_question_in_attempt
$sql = "UPDATE {quiz_attempts} SET sumgrades= " .
- "(SELECT SUM(qs.grade) FROM {question_sessions} qns, {question_states} qs " .
- "WHERE qns.newgraded = qs.id AND qns.attemptid = {quiz_attempts}.uniqueid ) WHERE ";
+ "COALESCE((SELECT SUM(qs.grade) FROM {question_sessions} qns, {question_states} qs " .
+ "WHERE qns.newgraded = qs.id AND qns.attemptid = {quiz_attempts}.uniqueid ), 0) WHERE ";
$attemptsql='';
if (!$attemptids){
if ($userids){
if ($attemptids){
//make sure we fetch all attempts for users to calculate grade.
//not just those that have changed.
- $sql = "SELECT qa2.* FROM {quiz_attempts} qa2 WHERE qa2.userid IN (SELECT DISTINCT userid FROM {quiz_attempts} WHERE $attemptsql)";
+ $sql = "SELECT qa2.* FROM {quiz_attempts} qa2 WHERE " .
+ "qa2.userid IN (SELECT DISTINCT userid FROM {quiz_attempts} WHERE $attemptsql) " .
+ "AND qa2.timefinish > 0";
} else {
- $sql = "SELECT * FROM {quiz_attempts} WHERE $attemptsql";
+ $sql = "SELECT * FROM {quiz_attempts} WHERE $attemptsql AND timefinish > 0";
}
if ($attempts = $DB->get_records_sql($sql, $params)) {
$attemptsbyuser = quiz_report_index_by_keys($attempts, array('userid', 'id'));
projects / moodle.git / commitdiff