MDL-33822 SCORM Interactions report - fix formatting of empty cells.

timhunt · Jul 9, 2012 · 751f5b0 · 751f5b0
1 parent f5fe536
commit 751f5b0
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/mod/scorm/report/interactions/report.php b/mod/scorm/report/interactions/report.php
@@ -185,6 +185,7 @@ function display($scorm, $cm, $course, $download) {
             $countsql .= $from.$where;
             $attempts = $DB->get_records_sql($select.$from.$where, $params);
             $questioncount = get_scorm_question_count($scorm->id);
+            $nbmaincolumns = count($columns);
             for($id = 0; $id < $questioncount; $id++) {
                 if ($displayoptions['qtext']) {
                     $columns[] = 'question' . $id;
@@ -476,9 +477,7 @@ function display($scorm, $cm, $course, $download) {
                                     $row[] = $score;
                                 }
                                 // interaction data
-                                $i=0;
-                                $element='cmi.interactions_'.$i.'.id';
-                                while(isset($trackdata->$element)) {
+                                for ($i=0; $i < $questioncount; $i++) {
                                     if ($displayoptions['qtext']) {
                                         $element='cmi.interactions_'.$i.'.id';
                                         if (isset($trackdata->$element)) {
@@ -513,8 +512,6 @@ function display($scorm, $cm, $course, $download) {
                                             $row[] = '&nbsp;';
                                         }
                                     }
-                                    $i++;
-                                    $element = 'cmi.interactions_'.$i.'.id';
                                 }
                             //---end of interaction data*/
                             } else {
@@ -525,6 +522,10 @@ function display($scorm, $cm, $course, $download) {
                                 } else {
                                     $row[] = $strstatus;
                                 }
+                                // complete the empty cells
+                                for ($i=0; $i < count($columns) - $nbmaincolumns; $i++) {
+                                    $row[] = '&nbsp;';
+                                }
                             }
                         }
                     }