From 57472983bbb860e9475b78a0874540f4dcd54dee Mon Sep 17 00:00:00 2001
From: martinlanghoff <martinlanghoff>
Date: Tue, 10 May 2005 00:31:34 +0000
Subject: [PATCH] Merged from MOODLE_14_STABLE - SQL fixes in GROUP BY clause
 in SCORM module -- merged patch from Patrick Li

---
 mod/scorm/lib.php    | 2 +-
 mod/scorm/report.php | 2 +-
 mod/scorm/view.php   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index 927e666ec9b..34853531cfd 100755
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -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;
diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index acb8d389307..46d9c7355a0 100755
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -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('&nbsp;', $strname);
         	$table->align = array('center', 'left');
         	$table->wrap = array('nowrap', 'nowrap');
diff --git a/mod/scorm/view.php b/mod/scorm/view.php
index f39e0d6e873..0920a6203b1 100755
--- a/mod/scorm/view.php
+++ b/mod/scorm/view.php
@@ -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>";
             }