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

Code cleaned

Browse source
This commit is contained in:
Li Chen 2013-11-12 16:52:50 +01:00
commit 2d77512cdc
13 changed files with 58 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,8 +28,8 @@ class Team
if (!empty($id))
{
$db = new BDD();
$res = $db->unique_query("SELECT id, team_name, key_hash, slogan, auth_level
FROM teams WHERE id=" . intval($id)) or die($db->erreur());
$res = $db->unique_query("SELECT `id`, `team_name`, `key_hash`, `slogan`, `auth_level`
FROM teams WHERE id = ".intval($id)) or die($db->erreur());
if (!empty($res))
{
@ -97,8 +97,8 @@ class Team
{
$db = new BDD();
$res = $db->query("SELECT id FROM team_members
WHERE id_team = " . intval($this->id));
$res = $db->query("SELECT `id` FROM team_members
WHERE id_team = ".intval($this->id));
$db->deconnexion();
@ -115,11 +115,11 @@ class Team
{
$db = new BDD();
$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");
$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");
$db->deconnexion();
@ -132,7 +132,7 @@ class Team
return $this->points;
}
function get_groupIds()
function get_group_ids()
{
$db = new BDD();
@ -154,42 +154,40 @@ class Team
return 0;
}
function get_nbResExercisesByTheme($id_theme)
function get_nb_res_exercises_by_theme($id_theme)
{
$db = new BDD();
$res = $db->unique_query("SELECT e.id_theme AS theme, count( s.id ) AS solved
FROM solved AS s
RIGHT OUTER JOIN exercices AS e ON e.id = s.id_exercice
AND s.id_team = ".$this->id."
AND e.id_theme = ".$id_theme);
$res = $db->unique_query("SELECT E.id_theme AS theme, count(S.id) AS solved
FROM solved S
RIGHT OUTER JOIN exercices E ON E.id = S.id_exercice
AND S.id_team = ".$this->id."
AND E.id_theme = ".$id_theme);
$db->deconnexion();
return $res['solved'];
}
function get_solvedExercices($id_theme=-1)
function get_solved_exercices($id_theme=-1)
{
if ($id_theme != -1)
{
$db = new BDD();
$ids = $db->query("SELECT id_theme, id_exercice
FROM `solved`
LEFT OUTER JOIN exercices ON `solved`.id_exercice = `exercices`.id
$ids = $db->query("SELECT `id_theme`, `id_exercice`
FROM solved S
LEFT OUTER JOIN exercices E ON S.id_exercice = E.id
WHERE id_team =".$this->id." AND id_theme =".$id_theme);
$db->deconnexion();
$array = array();
$i = 0;
if ($ids)
{
foreach ($ids as $id){
$array[] = new Exercice($id['id_exercice']);
$array = array();
$i = 0;
if ($ids)
{
foreach ($ids as $id){
$array[] = new Exercice($id['id_exercice']);
}
}
}
return $array;
return $array;
}
return NULL;
}
@ -226,7 +224,7 @@ class Team
return $teams;
}
public static function get_nbTeams()
public static function get_nb_teams()
{
$db = new BDD();
$res = $db->unique_query("SELECT COUNT(id) as count_teams FROM teams");
@ -234,5 +232,4 @@ class Team
return $res['count_teams'];
}
}