fix display of teams and student without teams in tables

classes/allocations_table.php

@@ -52,7 +52,7 @@ public function __construct($ratingallocate) {
             $this->is_downloading($download, $ratingallocate->ratingallocate->name . '-allocations', 'allocations');
         }
         // If teamvote is enabled, show allocation of teams.
-        $this->showteams = (bool) $this->ratingallocate->get_teamvote_groups();
+        $this->showteams = (bool) $this->ratingallocate->get_teamvote_groupingid();
     }
 
     /**

classes/ratings_and_allocations_table.php

@@ -100,9 +100,7 @@ public function __construct(\mod_ratingallocate_renderer $renderer, $titles, $ra
         $this->shownames = true;
         // We only show the group column if at least one group is being used in at least one active restriction setting of a choice.
         $this->showgroups = !empty($allgroupsofchoices);
-        $teamvote = $this->ratingallocate->get_teamvote_groups();
-        $this->ratingallocate->delete_groups_for_usersnogroup($teamvote);
-        $this->showteams = (bool) $teamvote;
+        $this->showteams = (bool) $this->ratingallocate->get_teamvote_groupingid();
 
     }
 

locallib.php

@@ -1316,7 +1316,9 @@ public function get_ratings_for_rateable_choices_with_teamvote() {
     }
 
     /**
-     * Returns the groups in the teamvote grouping with the amount of groupmembers
+     * Returns the groups in the teamvote grouping with the amount of groupmembers.
+     * Since this function creates unnecessary groups, only use in advance of running the endmonds karp algorithm.
+     * In order to check wether teamvote is enabled, please use get_teamvote_groupingid().
      *
      * @return array|false Array of the form groupid => membercount if teamvote is enabled, false if not
      * @throws dml_exception
@@ -1337,6 +1339,7 @@ public function get_teamvote_groups() {
                     }
                 }
 
+                // This is a little ugly, but the only way the algortihm can run including teams.
                 $groupdata = new stdClass();
                 $groupdata->courseid = $this->course->id;
                 $groupdata->idnumber = $this->ratingallocateid;
@@ -1385,6 +1388,7 @@ public function get_preventvotenotingroup() {
 
     /**
      * Return the teamvote groupingid if teamvote is enabled, false if not.
+     * Use this method to check wether teamvote is enabled.
      *
      * @return false|mixed false or the groupingid
      * @throws dml_exception