From d567787071b17f43010341eb04b07374dc6d1fe1 Mon Sep 17 00:00:00 2001
From: Jay Oswald <jayoswald@catalyst-au.net>
Date: Mon, 15 May 2023 18:09:29 +1000
Subject: [PATCH] remove bad data added to export

---
 btec.php     |  2 +-
 guide.php    |  2 +-
 locallib.php | 20 ++++++++------------
 rubric.php   |  2 +-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/btec.php b/btec.php
index 880ae29..17c68aa 100755
--- a/btec.php
+++ b/btec.php
@@ -132,7 +132,7 @@
 if ($showgroups) {
     $groups = report_componentgrades_get_user_groups($course->id);
 }
-report_componentgrades_add_data($sheet, $students, $gradinginfopos, 'btec', $groups);
+report_componentgrades_add_data($sheet, $students, $gradinginfopos, 'btec', $groups, $showgroups);
 
 $workbook->close();
 
diff --git a/guide.php b/guide.php
index ac19ef5..cb4d9d7 100755
--- a/guide.php
+++ b/guide.php
@@ -116,7 +116,7 @@
     $groups = report_componentgrades_get_user_groups($course->id);
 }
 
-report_componentgrades_add_data($sheet, $students, $gradinginfopos, 'guide', $groups);
+report_componentgrades_add_data($sheet, $students, $gradinginfopos, 'guide', $groups, $showgroups);
 
 $workbook->close();
 
diff --git a/locallib.php b/locallib.php
index d58d521..210d052 100755
--- a/locallib.php
+++ b/locallib.php
@@ -105,10 +105,8 @@ function report_componentgrades_add_header(MoodleExcelWorkbook $workbook, Moodle
         $sheet->write_string(HEADINGSROW, $col, get_string('studentid', 'report_componentgrades'), $format2);
         $col++;
     }
-    if (get_config('report_componentgrades', 'showgroups')) {
-        if ($showgroups) {
-            $sheet->write_string(HEADINGSROW, $col++, get_string('groups'), $format2);
-        }
+    if ($showgroups) {
+        $sheet->write_string(HEADINGSROW, $col++, get_string('groups'), $format2);
     }
     $sheet->set_column(0, $col, 10); // Set column widths to 10.
 
@@ -170,7 +168,7 @@ function report_componentgrades_process_data(array $students, array $data) {
  * @param array $groups - user group information (optional).
  * @return void
  */
-function report_componentgrades_add_data(MoodleExcelWorksheet $sheet, array $students, $gradinginfopos, $method, $groups = null) {
+function report_componentgrades_add_data(MoodleExcelWorksheet $sheet, array $students, $gradinginfopos, $method, $groups = null, $showgroups = false) {
     // Actual data.
     $row = 5;
     foreach ($students as $student) {
@@ -182,13 +180,11 @@ function report_componentgrades_add_data(MoodleExcelWorksheet $sheet, array $stu
         if (get_config('report_componentgrades', 'showstudentid')) {
              $sheet->write_string($row, $col++, $student->idnumber);
         }
-        if (get_config('report_componentgrades', 'showgroups')) {
-            if (!is_null($groups)) {
-                if (isset($groups[$student->userid])) {
-                    $sheet->write_string($row, $col++, implode(', ', $groups[$student->userid]));
-                } else {
-                    $sheet->write_string($row, $col++, 'empty');
-                }
+        if ($showgroups) {
+            if (!is_null($groups) && isset($groups[$student->userid])) {
+                $sheet->write_string($row, $col++, implode(', ', $groups[$student->userid]));
+            } else {
+                $sheet->write_string($row, $col++, 'empty');
             }
         }
 
diff --git a/rubric.php b/rubric.php
index 42a0fbc..5bfe155 100755
--- a/rubric.php
+++ b/rubric.php
@@ -118,7 +118,7 @@
 if ($showgroups) {
     $groups = report_componentgrades_get_user_groups($course->id);
 }
-$row = report_componentgrades_add_data($sheet, $students, $gradinginfopos, 'rubric', $groups);
+report_componentgrades_add_data($sheet, $students, $gradinginfopos, 'rubric', $groups, $showgroups);
 
 $workbook->close();