From b2d27837ac4791da8fc6849db251a036a14701a2 Mon Sep 17 00:00:00 2001 From: Taylor Courage Date: Thu, 6 Mar 2025 06:30:50 -0500 Subject: [PATCH] - Added basic display for results, needs work - Added new tool to tools.js used to checking if a page is loaded in a frame or by itself - Removed old division-based .html displays, no longer relevant --- display/general_results.php | 120 ++++++++++++++++++++++++++++++++++++ index.php | 12 +--- intermediate.html | 65 ------------------- main.html | 45 -------------- open.html | 32 ---------- scripts/tools.js | 13 ++++ styles/data_display.css | 7 +++ 7 files changed, 142 insertions(+), 152 deletions(-) create mode 100644 display/general_results.php delete mode 100644 intermediate.html delete mode 100644 main.html delete mode 100644 open.html create mode 100644 styles/data_display.css diff --git a/display/general_results.php b/display/general_results.php new file mode 100644 index 0000000..ec0e19c --- /dev/null +++ b/display/general_results.php @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + GENERAL DATA + + + setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + + // Grab all our tourney and game results + // Prepare SQL + $sqlGetTourneyData = $conn->prepare("SELECT * FROM " . $tournamentDataTableName); + $sqlGetGameData = $conn->prepare("SELECT * FROM " . $gameDataTableName); + $sqlGetUserData = $conn->prepare("SELECT username FROM " . $userTableName); + + // Execute + $sqlGetTourneyData->execute(); + $sqlGetGameData->execute(); + $sqlGetUserData->execute(); + + // fetch rows + $tourneyData = $sqlGetTourneyData->fetchAll(PDO::FETCH_ASSOC); + $gameData = $sqlGetGameData->fetchAll(PDO::FETCH_ASSOC); + $userData = $sqlGetUserData->fetchAll(PDO::FETCH_NUM); + + // Initalize arrays to store tournament winner counts + // Total count + $totalTourneyWinners = array(); + $openTourneyWinners = array(); + $intermediateTourneyWinners = array(); + $mainTourneyWinners = array(); + + // Check the number of players for each entry + // Then, grab that many winners + foreach ($tourneyData as $data) { + for ($i = 1; $i <= $data["numPlayers"]; $i++) { + $winnerIndex = "winner" . $i; + $totalTourneyWinners[] = $data[$winnerIndex]; + if ($data["tournamentDivision"] == "open") { + $openTourneyWinners[] = $data[$winnerIndex]; + } + if ($data["tournamentDivision"] == "intermediate") { + $intermediateTourneyWinners[] = $data[$winnerIndex]; + } + if ($data["tournamentDivision"] == "main") { + $mainTourneyWinners[] = $data[$winnerIndex]; + } + } + } + + // Make 'unique' arrays, so we have TOTAL # played vs. # won + $totalUniqueTourneyWinners = array_unique($totalTourneyWinners); + $openUniqueTourneyWinners = array_unique($openTourneyWinners); + $intermediateUniqueTourneyWinners = array_unique($intermediateTourneyWinners); + $mainUniqueTourneyWinners = array_unique($mainTourneyWinners); + + + // Get counts of rows + $numGames = count($gameData); + $numTourneys = count($tourneyData); + $numUsers = count($userData); + $numTotalTourneyWinners = count($totalTourneyWinners); + $numOpenTourneyWinners = count($openTourneyWinners); + $numIntermediateTourneyWinners = count($intermediateTourneyWinners); + $numMainTourneyWinners = count($mainTourneyWinners); + $numUniqueTotalTourneyWinners = count($totalUniqueTourneyWinners); + $numUniqueOpenTourneyWinners = count($openUniqueTourneyWinners); + $numUniqueIntermediateTourneyWinners = count($intermediateUniqueTourneyWinners); + $numUniqueMainTourneyWinners = count($mainUniqueTourneyWinners); + + // Other data + $userIndex = $numUsers - 1; + $mostRecentUser = $userData[$userIndex][0]; + + + } catch (PDOException $e) { // failed connection + echo "Connection failed: " . $e->getMessage(); + } + + ?> + + +

General Information

+
+ Total registered users: $numUsers

"; + echo "

Most recent user: $mostRecentUser

"; + echo "

Number of Official Tournaments: $numTourneys

"; + echo "

Number of game results uploaded: $numGames

"; + echo "

Total # of titles won: $numTotalTourneyWinners

"; + echo "

# of winners: $numUniqueTotalTourneyWinners

"; + echo "

Total 'Open' titles won: $numOpenTourneyWinners

"; + echo "

# of winners: $numUniqueOpenTourneyWinners

"; + echo "

Total 'Intermediate' titles won: $numIntermediateTourneyWinners

"; + echo "

# of winners: $numUniqueIntermediateTourneyWinners

"; + echo "

Total 'Main' of titles won: $numMainTourneyWinners

"; + echo "

# of winners: $numUniqueMainTourneyWinners

"; + ?> +
+ + + + \ No newline at end of file diff --git a/index.php b/index.php index fa8b658..378694b 100644 --- a/index.php +++ b/index.php @@ -16,16 +16,7 @@ session_start();

Trojan's Trophy Room

Giveaway Disclaimer

-

Choose a division to see results!

-
- OPEN - INTERMEDIATE - MAIN -

- GENERAL (HOME) -
-

 

- +

@@ -33,6 +24,7 @@ session_start(); // Is the user is logged in we'll show them a navigation bar with some fancier options if (isset($_SESSION["userID"])){ echo "ACCOUNT"; + echo "HOME"; echo "LOGOUT"; echo "ADD GAME DETAILS"; // Anything we need to show to logged in admins will be below diff --git a/intermediate.html b/intermediate.html deleted file mode 100644 index ccc8ca1..0000000 --- a/intermediate.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - INTERMEDIATE DIVISION DATA - - - -
-

INTERMEDIATE DIVISION

-
Max rank: Champ 3
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
TrojanDestinyRL3
Endeavor2
KingKuna2
vixify2
Aura1
imKryss1
Priickles1
toxic_deadpool_x1
Vix1
-
- - \ No newline at end of file diff --git a/main.html b/main.html deleted file mode 100644 index ee8bb5c..0000000 --- a/main.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - MAIN DIVISION DATA - - - -
-

MAIN DIVISION

-
Max rank: SSL
- - - - - - - - - - - - - - - - - - - - - - - - - - -
RU33ER DUCK73
Aura1
Seqsons1
Stewy1
Trash1
-
- - \ No newline at end of file diff --git a/open.html b/open.html deleted file mode 100644 index 5b59cf3..0000000 --- a/open.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - OPEN DIVISION DATA - - - -
-

OPEN DIVISION

-
Max rank: Plat 3
- - - - - - - - - - - - - -
No DataNo Data
No DataNo Data
No DataNo Data
-
- - \ No newline at end of file diff --git a/scripts/tools.js b/scripts/tools.js index ffdeba8..fa8c30c 100644 --- a/scripts/tools.js +++ b/scripts/tools.js @@ -6,8 +6,21 @@ function resizeIframe(obj) { } function getURL(path) { + // Gets the URL so we can re-direct the user back to where they came from if (path == undefined) { path = ""; } return window.location.href + path; +} + +function verifyPageInFrame() { + // Verify that the page was loaded in an iFrame + // Otherwise back to the homepage they go! + var mainURL = window.location.origin; + console.log(mainURL); + + if (window.self !== window.top) { + } else { + window.location = mainURL; + } } \ No newline at end of file diff --git a/styles/data_display.css b/styles/data_display.css new file mode 100644 index 0000000..2724c39 --- /dev/null +++ b/styles/data_display.css @@ -0,0 +1,7 @@ +#resultsDisplayBody { + width:800px; +} + +#generalResultsDisplayPanel { + width: 400px; +} \ No newline at end of file