diff --git a/src/game/global/global_variables.js b/src/game/global/global_variables.js index f94f4b1..e3e27e9 100644 --- a/src/game/global/global_variables.js +++ b/src/game/global/global_variables.js @@ -25,6 +25,7 @@ let sessionStorageManager = new SessionStorageManager(); // if(isDebugMode()) { // sessionStorageManager.playerName = "부현율"; // sessionStorageManager.playerUserID = 8; + // sessionStorageManager.playingAppID = 101; // sessionStorageManager.playingAppName = "space_invaders"; // sessionStorageManager.score = 1000; // sessionStorageManager.highScore = 2000; @@ -33,6 +34,7 @@ let sessionStorageManager = new SessionStorageManager(); console.log("maestroID : " + sessionStorageManager.maestroID); console.log("playerName : " + sessionStorageManager.playerName); console.log("playerUserID : " + sessionStorageManager.playerUserID); + console.log("playingAppID : " + sessionStorageManager.playingAppID); console.log("playingAppName : " + sessionStorageManager.playingAppName); console.log("score : " + sessionStorageManager.score); console.log("highscore : " + sessionStorageManager.highScore); diff --git a/src/game/lib/session_storage_manager.js b/src/game/lib/session_storage_manager.js index ddda845..4186802 100644 --- a/src/game/lib/session_storage_manager.js +++ b/src/game/lib/session_storage_manager.js @@ -35,6 +35,14 @@ class SessionStorageManager { return sessionStorage.getItem("playerUserID"); } + // playing app id + set playingAppID(value) { + sessionStorage.setItem("playingAppID", value); + } + get playingAppID() { + return sessionStorage.getItem("playingAppID"); + } + // playing app name set playingAppName(value) { sessionStorage.setItem("playingAppName", value); diff --git a/src/game/menu/menu_app.js b/src/game/menu/menu_app.js index ee70480..f189eab 100644 --- a/src/game/menu/menu_app.js +++ b/src/game/menu/menu_app.js @@ -57,6 +57,7 @@ class MenuApp { mouseAppIndex++; new AppButton(startX + 150 * mouseAppIndex, 300, AppButton.TYPE_MOUSE, activeApp.AppName, () => { + sessionStorageManager.playingAppID = activeApp.AppID; sessionStorageManager.playingAppName = activeApp.AppName; location.href = '../../web/client/start.html'; } diff --git a/src/web/server/app/active_app.php b/src/web/server/app/active_app.php index 783fb4e..f795813 100644 --- a/src/web/server/app/active_app.php +++ b/src/web/server/app/active_app.php @@ -25,15 +25,16 @@ function get_active_app_list($maestro_id) { $return_array = array(); $query = " - SELECT A.AppName, A.AppType + SELECT A.AppID, A.AppName, A.AppType FROM moty_app AS A INNER JOIN moty_active_app AS AA ON A.AppID = AA.AppID AND AA.MaestroID=?"; $stmt = $db_conn->prepare($query); $stmt->bind_param('i', $maestro_id); $stmt->execute(); - $stmt->bind_result($app_name, $app_type); + $stmt->bind_result($app_id, $app_name, $app_type); while($stmt->fetch()) { + $row_array['AppID'] = $app_id; $row_array['AppName'] = $app_name; $row_array['AppType'] = $app_type; array_push($return_array, $row_array); diff --git a/src/web/server/record/history_record.php b/src/web/server/record/history_record.php index bd3a988..e251f3f 100644 --- a/src/web/server/record/history_record.php +++ b/src/web/server/record/history_record.php @@ -12,7 +12,7 @@ include "./../setup/connect_db.php"; // my ranking $query = " - SELECT DATE(DateTime) AS Date, MAX(Score) AS HighScore, AppName AS AppName + SELECT DATE(RecordDateTime) AS Date, MAX(BestRecord) AS HighScore, AppName AS AppName FROM moty_record D WHERE UserID = ? AND DATE(D.DateTime) < DATE(?) AND AppName = ? GROUP BY DATE(DateTime)