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 @@ +
+ +
updater Game Jam
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + +
+
+ + diff --git a/Frontend/Javascript/AdminPageScript.js b/Frontend/Javascript/AdminPageScript.js new file mode 100644 index 0000000..fa945bd --- /dev/null +++ b/Frontend/Javascript/AdminPageScript.js @@ -0,0 +1,46 @@ +async function getGamejames(id = 0) { + if(id !== 0){ + var url = "http://localhost/Game-Jaming/Backend/Controllers/GameJam/GetGameJam.php?gameJamId="+id; + }else { + var url = "http://localhost/Game-Jaming/Backend/Controllers/GameJam/GetGameJam.php"; + } + let response = await axios.get(url); + return response.data.data +} +async function updateGameDropdown() { + var UGJDropDown = document.getElementById("game-jame-update-drop-down"); + var jsondata; + var UGJDropDownHtml = ""+ + ""; + //console.log(UGJDropDownHtml); + UGJDropDown.innerHTML = UGJDropDownHtml; + changeGameJamUpdate() + +} + + +async function changeGameJamUpdate() { + var val = document.getElementById("gameJamesDropdown").value; + await getGamejames(parseInt(val)).then(function (data) { + document.getElementById("UGameJamTitle").value = data.name; + var startDateTime = data.start_time.split(" "); + document.getElementById("UStartDate").value = startDateTime[0]; + document.getElementById("UStartTime").value = startDateTime[1]; + var endDateTime = data.end_time.split(" "); + document.getElementById("UEndDate").value = endDateTime[0]; + document.getElementById("UEndTime").value = endDateTime[1]; + document.getElementById("UKeyWord").value = data.key_word; + document.getElementById("UDescription").value = data.description; + } + ); +} +updateGameDropdown(); + +