T201704201454

This commit is contained in:
Leander
2017-04-20 14:54:29 +02:00
parent 8b06b98cbf
commit b1d59dc62b

View File

@@ -24,18 +24,19 @@ if($cid == -1) {
$data[] = array('place' => $place, 'name' => $name, 'score' => $score); $data[] = array('place' => $place, 'name' => $name, 'score' => $score);
} }
} else { } else {
$overview = $db->query('SELECT u."name", h."score" $overview = $db->query('SELECT u."name", h."score" ISNULL(h."score", -1)
FROM "Users" u JOIN "Highscores" h ON u."ID" = h."Users_ID" FROM "Users" u LEFT OUTER JOIN "Highscores" h ON u."ID" = h."Users_ID"
WHERE h."Categories_ID" = $1 WHERE h."Categories_ID" = $1
ORDER BY h."score" DESC ORDER BY h."score" DESC
LIMIT $2 OFFSET $3', array($cid, $limit, $offset))['data']; LIMIT $2 OFFSET $3', array($cid, $limit, $offset))['data'];
foreach($overview as $row) { foreach($overview as $row) {
$name = $row['name']; $name = $row['name'];
$score = $row['score']; //$score = ($row['score'] == NULL) ? -1 : $row['score'];
$place = $db->query('SELECT COUNT(*) FROM "Highscores" WHERE "score" > $1 AND "Categories_ID" = $2', $place = $db->query('SELECT COUNT(*) FROM "Highscores" WHERE "score" > $1 AND "Categories_ID" = $2',
array($score, $cid))['data'][0]['count'] + 1; array($score, $cid))['data'][0]['count'] + 1;
$data[] = array('place' => $place, 'name' => $name, 'score' => $score); $data[] = array('place' => $place, 'name' => $name, 'score' => $score);
} }
/*
$all_cat_highscores = $db->query('SELECT COUNT(*) FROM "Highscores" WHERE "Categories_ID" = $1', array($cid)) $all_cat_highscores = $db->query('SELECT COUNT(*) FROM "Highscores" WHERE "Categories_ID" = $1', array($cid))
['data'][0]['count']; ['data'][0]['count'];
$all_users = $db->query('SELECT "ID", "name" FROM "Users" ORDER BY "name"')['data']; $all_users = $db->query('SELECT "ID", "name" FROM "Users" ORDER BY "name"')['data'];
@@ -47,7 +48,7 @@ if($cid == -1) {
$place = $all_cat_highscores + 1; $place = $all_cat_highscores + 1;
$data[] = array('place' => $place, 'name' => $name, 'score' => $score); $data[] = array('place' => $place, 'name' => $name, 'score' => $score);
} }
} }*/
} }
$response = Database::create_response($data, $error); $response = Database::create_response($data, $error);