Merged from MOODLE_14_STABLE - SQL fixes in GROUP BY clause in SCORM module -- merged patch from Patrick Li
This commit is contained in:
+1
-1
@@ -179,7 +179,7 @@ function scorm_grades($scormid) {
|
||||
}
|
||||
|
||||
$return->grades = NULL;
|
||||
if ($scousers=get_records_select('scorm_scoes_track', "scormid='$scormid' GROUP BY userid")) {
|
||||
if ($scousers=get_records_select('scorm_scoes_track', "scormid='$scormid' GROUP BY userid", "", "userid,null")) {
|
||||
foreach ($scousers as $scouser) {
|
||||
$scores = NULL;
|
||||
$scores->scoes = 0;
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
}
|
||||
if (!empty($id)) {
|
||||
if ($scoes = get_records_select("scorm_scoes","scorm='$scorm->id' ORDER BY id")) {
|
||||
if ($scousers=get_records_select("scorm_scoes_track", "scormid='$scorm->id' GROUP BY userid")) {
|
||||
if ($scousers=get_records_select("scorm_scoes_track", "scormid='$scorm->id' GROUP BY userid,scormid", "", "userid,scormid")) {
|
||||
$table->head = array(' ', $strname);
|
||||
$table->align = array('center', 'left');
|
||||
$table->wrap = array('nowrap', 'nowrap');
|
||||
|
||||
+2
-2
@@ -66,8 +66,8 @@
|
||||
"", "", true, update_module_button($cm->id, $course->id, $strscorm), navmenu($course, $cm));
|
||||
|
||||
if (isteacher($course->id)) {
|
||||
if ($sco_users = get_records_select("scorm_scoes_track", "scormid='$scorm->id' GROUP BY userid")) {
|
||||
echo "<div class=\"reportlink\"><a target=\"{$CFG->framename}\" href=\"report.php?id=$cm->id\">".get_string("viewallreports","scorm",count($sco_users))."</a></div>";
|
||||
if ($sco_users = count_records_select("scorm_scoes_track", "scormid='$scorm->id' GROUP BY userid", "COUNT(userid)")) {
|
||||
echo "<div class=\"reportlink\"><a target=\"{$CFG->framename}\" href=\"report.php?id=$cm->id\">".get_string("viewallreports","scorm",$sco_users)."</a></div>";
|
||||
} else {
|
||||
echo "<div class=\"reportlink\">".get_string("noreports","scorm")."</div>";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user