diff --git a/onyx/include/common/Team.class.php b/onyx/include/common/Team.class.php index 83aae4e7..35a48d45 100644 --- a/onyx/include/common/Team.class.php +++ b/onyx/include/common/Team.class.php @@ -2,7 +2,7 @@ if(!defined('ONYX')) exit; -function cmp_team_pts($i1, $i2, $idTheme) +function cmp_team_pts($i1, $i2) { if ($i1->get_pts() == $i2->get_pts()){ $db = new BDD(); @@ -22,7 +22,7 @@ function cmp_team_pts($i1, $i2, $idTheme) return -1; } else{ - return ($i1->get_pts($idTheme) < $i2->get_pts($idTheme)) ? 1 : -1; + return ($i1->get_pts() < $i2->get_pts()) ? 1 : -1; } } @@ -151,29 +151,17 @@ class Team return $this->members; } - function get_pts($themeID=-1) + function get_pts() { if(!isset($this->points)) { $db = new BDD(); - $res = null; - if ($themeID != -1) - { - $res = $db->unique_query("SELECT E.id, S.id_team, SUM(E.points) as sum_points + $res = $db->unique_query("SELECT E.id, S.id_team, SUM(E.points) as sum_points FROM exercices E LEFT OUTER JOIN solved S ON E.id = S.id_exercice WHERE S.id_team = ".$this->id." GROUP BY S.id_team"); - } - else - { - $res = $db->unique_query("SELECT E.id, S.id_team, SUM(E.points) as sum_points - FROM exercices E - LEFT OUTER JOIN solved S ON E.id = S.id_exercice - WHERE S.id_team = ".$this->id." AND E.id_theme = ".$themeID." - GROUP BY S.id_team"); - } $db->deconnexion(); @@ -284,11 +272,11 @@ class Team return $array; } - public static function get_top($nb=0, $idTheme=-1) + public static function get_top($nb=0) { $teams = Team::get_teams(); - usort($teams, "cmp_team_pts", $idTheme); + usort($teams, "cmp_team_pts"); if ($nb != 0) $teams = array_slice($teams, 0, $nb);