add username to exports, fixes #263

controllers/solutions.php

@@ -1425,11 +1425,7 @@ class SolutionsController extends StudipController
         }
 
         if ($format == 'csv') {
-            $columns = [_vips('Nachname'), _vips('Vorname')];
-
-            if (!$sem_class['studygroup_mode']) {
-                $columns[] = _vips('Matrikelnr.');
-            }
+            $columns = [_vips('Nachname'), _vips('Vorname'), _vips('Kennung'), _vips('Matrikelnr.')];
 
             foreach ($this->items as $category => $list) {
                 foreach ($list as $item) {
@@ -1449,9 +1445,9 @@ class SolutionsController extends StudipController
 
             if ($display == 'points' || $this->overall['weighting']) {
                 if ($display == 'points') {
-                    $row = [_vips('Maximalpunktzahl:'), '', ''];
+                    $row = [_vips('Maximalpunktzahl'), '', '', ''];
                 } else {
-                    $row = [_vips('Gewichtung:'), '', ''];
+                    $row = [_vips('Gewichtung'), '', '', ''];
                 }
 
                 foreach ($this->items as $category => $list) {
@@ -1478,10 +1474,12 @@ class SolutionsController extends StudipController
             }
 
             foreach ($this->participants as $p) {
-                $row = [$p['surname'], $p['forename']];
+                $row = [$p['surname'], $p['forename'], $p['username']];
 
                 if (!$sem_class['studygroup_mode']) {
                     $row[] = $p['stud_id'];
+                } else {
+                    $row[] = '';
                 }
 
                 foreach ($this->items as $category => $list) {
@@ -2057,6 +2055,7 @@ function participants_overview_data($course_id, $param_user_id, $display = null,
     foreach ($participants as $user_id => $rest) {
         $user = User::find($user_id);
 
+        $participants[$user_id]['username'] = $user->username;
         $participants[$user_id]['forename'] = $user->vorname;
         $participants[$user_id]['surname']  = $user->nachname;
         $participants[$user_id]['name']     = $user->nachname . ', ' . $user->vorname;

views/solutions/participants_overview.php

@@ -121,9 +121,9 @@
             <tr class="smaller" style="background-color: #D1D1D1;">
                 <td>
                     <? if ($display == 'points') : ?>
-                        <?= _vips('Maximalpunktzahl:') ?>
+                        <?= _vips('Maximalpunktzahl') ?>
                     <? else : ?>
-                        <?= _vips('Gewichtung:') ?>
+                        <?= _vips('Gewichtung') ?>
                     <? endif ?>
                 </td>