diff --git a/Backend/Controllers/FileHandler/GetGameData.php b/Backend/Controllers/FileHandler/GetGameData.php index d440440..7954281 100644 --- a/Backend/Controllers/FileHandler/GetGameData.php +++ b/Backend/Controllers/FileHandler/GetGameData.php @@ -15,7 +15,10 @@ if (isset($_GET['gameDataId'])) { } elseif (isset($_GET['gameJamId'])) { $gameDataIds = Registration::where("game_jam_id", $_GET['gameJamId'])->pluck("game_data_id")->toArray(); $openGameDataStream = GameData::whereIn("id", $gameDataIds)->get(); -} else { +} elseif (isset($_GET["newest"])){ + $openGameDataStream = GameData::all()->sortByDesc("updated_at")->take($_GET["newest"]); +} +else { $openGameDataStream = GameData::all(); } diff --git a/Backend/Controllers/GameJam/GetGameJam.php b/Backend/Controllers/GameJam/GetGameJam.php index b7453a3..40b5ae6 100644 --- a/Backend/Controllers/GameJam/GetGameJam.php +++ b/Backend/Controllers/GameJam/GetGameJam.php @@ -11,7 +11,20 @@ use Backend\Models\GameJam; if (isset($_GET['gameJamId'])) { $dbValue = GameJam::find($_GET['gameJamId']); -} else { +}elseif (isset($_GET['hasEnded'])){ + $hasEnded = $_GET['hasEnded']; + if($hasEnded == 0 OR $hasEnded == 1){ + if ($hasEnded){ + $dbValue = GameJam::where("is_finished",1)->get(); + }else{ + $dbValue = GameJam::where("is_finished",0)->get(); + } + } + else{ + $dbValue = GameJam::all(); + } +} +else { $dbValue = GameJam::all(); } diff --git a/Frontend/Html/AdminPage.html b/Frontend/Html/AdminPage.html index 153f17f..a0a3b3f 100755 --- a/Frontend/Html/AdminPage.html +++ b/Frontend/Html/AdminPage.html @@ -183,11 +183,43 @@ +