Merge branch 'MDL-61290_master' of https://github.com/aanabit/moodle

mod/feedback/classes/responses_table.php

@@ -113,8 +113,12 @@ public function __construct(mod_feedback_structure $feedbackstructure, $group =
      */
     protected function init($group = 0) {
 
-        $tablecolumns = array('userpic', 'fullname');
-        $tableheaders = array(get_string('userpic'), get_string('fullnameuser'));
+        $tablecolumns = array('userpic', 'fullname', 'groups');
+        $tableheaders = array(
+            get_string('userpic'),
+            get_string('fullnameuser'),
+            get_string('groups')
+        );
 
         $extrafields = get_extra_user_fields($this->get_context());
         $ufields = user_picture::fields('u', $extrafields, $this->useridfield);
@@ -258,6 +262,21 @@ public function col_courseid($row) {
         return $name;
     }
 
+    /**
+     * Prepares column groups for display
+     * @param array $row
+     * @return string
+     */
+    public function col_groups($row) {
+        $groups = '';
+        if ($usergrps = groups_get_all_groups($this->feedbackstructure->get_cm()->course, $row->userid, 0, 'name')) {
+            foreach ($usergrps as $group) {
+                $groups .= format_string($group->name). ' ';
+            }
+        }
+        return trim($groups);
+    }
+
     /**
      * Adds common values to the table that do not change the number or order of entries and
      * are only needed when outputting or downloading data.