fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Revert "Modify get_top for TOP3 themes"

Browse source 
This reverts commit b3beb516b0.
This commit is contained in:
nemunaire 2013-12-13 20:03:04 +01:00
parent 134f6be772
commit 6cabc4003f
1 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
onyx/include/common/Team.class.php
View file

@ -2,7 +2,7 @@
if(!defined('ONYX')) exit; if(!defined('ONYX')) exit;
function cmp_team_pts($i1, $i2, $idTheme) function cmp_team_pts($i1, $i2)
{ {
if ($i1->get_pts() == $i2->get_pts()){ if ($i1->get_pts() == $i2->get_pts()){
$db = new BDD(); $db = new BDD();
@ -22,7 +22,7 @@ function cmp_team_pts($i1, $i2, $idTheme)
return -1; return -1;
} }
else{ 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; return $this->members;
} }
function get_pts($themeID=-1) function get_pts()
{ {
if(!isset($this->points)) if(!isset($this->points))
{ {
$db = new BDD(); $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 FROM exercices E
LEFT OUTER JOIN solved S ON E.id = S.id_exercice LEFT OUTER JOIN solved S ON E.id = S.id_exercice
WHERE S.id_team = ".$this->id." WHERE S.id_team = ".$this->id."
GROUP BY S.id_team"); 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(); $db->deconnexion();
@ -284,11 +272,11 @@ class Team
return $array; return $array;
} }
public static function get_top($nb=0, $idTheme=-1) public static function get_top($nb=0)
{ {
$teams = Team::get_teams(); $teams = Team::get_teams();
usort($teams, "cmp_team_pts", $idTheme); usort($teams, "cmp_team_pts");
if ($nb != 0) if ($nb != 0)
$teams = array_slice($teams, 0, $nb); $teams = array_slice($teams, 0, $nb);