From c0e491677faa74efd7cd539456610727c2db13d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?= =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?= Date: Wed, 24 Oct 2018 00:00:54 +0900 Subject: [PATCH] Fix: rebase code - app highest record --- src/game/start/start.js | 3 --- .../app/menu_active_typing_practice_app_list.php | 6 +++--- .../app/menu_active_typing_test_app_list.php | 11 +++-------- src/web/server/lib/app_highest_record.php | 14 +++++++------- .../server/record/update_app_highest_record.php | 12 ++++++------ 5 files changed, 19 insertions(+), 27 deletions(-) diff --git a/src/game/start/start.js b/src/game/start/start.js index dc8106c..047c76d 100644 --- a/src/game/start/start.js +++ b/src/game/start/start.js @@ -60,13 +60,10 @@ var Start = { sessionStorageManager.getPlayingAppID(), (function(replyJSON) { var appHighestRecord = replyJSON["AppHighestRecord"]; - console.log("appHighestRecord : " + appHighestRecord); sessionStorageManager.setAppHighestRecord(Number(appHighestRecord)); screenBottomUI.printLeftTextWithAppHighestRecord(appHighestRecord); }).bind(this), (function(replyJSON) { // no data - var appHighestRecord = replyJSON["AppHighestRecord"]; - console.log("appHighestRecord : " + appHighestRecord); sessionStorageManager.setAppHighestRecord(0); screenBottomUI.printLeftTextWithAppHighestRecord(sessionStorageManager.getAppHighestRecord()); }).bind(this) diff --git a/src/web/server/app/menu_active_typing_practice_app_list.php b/src/web/server/app/menu_active_typing_practice_app_list.php index 9e2e7eb..fdb54ff 100644 --- a/src/web/server/app/menu_active_typing_practice_app_list.php +++ b/src/web/server/app/menu_active_typing_practice_app_list.php @@ -109,7 +109,7 @@ function get_high_score_list($maestro_id, $player_id, $appList) { $stmt = $db_conn->prepare($query); $stmt->bind_param('iii', $app_id_list, $maestro_id, $player_id); $stmt->execute(); - $stmt->bind_result($highest_record); + $stmt->bind_result($app_highest_record); $returnValue = $stmt->fetch(); $stmt->close(); @@ -120,10 +120,10 @@ function get_high_score_list($maestro_id, $player_id, $appList) { // $row_array['maestro_id'] = $maestro_id; // $row_array['player_id'] = $player_id; $row_array['AppID'] = $app_id_list; - if($highest_record === NULL) + if($app_highest_record === NULL) $row_array['AppHighestRecord'] = 0; else - $row_array['AppHighestRecord'] = $highest_record; + $row_array['AppHighestRecord'] = $app_highest_record; array_push($return_array, $row_array); } diff --git a/src/web/server/app/menu_active_typing_test_app_list.php b/src/web/server/app/menu_active_typing_test_app_list.php index 84831b5..4e622bf 100644 --- a/src/web/server/app/menu_active_typing_test_app_list.php +++ b/src/web/server/app/menu_active_typing_test_app_list.php @@ -106,15 +106,10 @@ function get_high_score_list($maestro_id, $player_id, $appList) { INNER JOIN app_highest_record AS AHR ON A.AppID = ? AND A.AppID = AHR.AppID AND AHR.MaestroID = ? AND AHR.PlayerID = ? ORDER BY A.AppID ASC"; - // SELECT MAX(BR.AppHighestRecord) - // FROM app AS A - // INNER JOIN best_record AS BR - // ON A.AppID = ? AND A.AppID = BR.AppID AND BR.MaestroID = ? AND BR.PlayerID = ? - // ORDER BY A.AppID ASC"; $stmt = $db_conn->prepare($query); $stmt->bind_param('iii', $app_id_list, $maestro_id, $player_id); $stmt->execute(); - $stmt->bind_result($highest_record); + $stmt->bind_result($app_highest_record); $returnValue = $stmt->fetch(); $stmt->close(); @@ -125,10 +120,10 @@ function get_high_score_list($maestro_id, $player_id, $appList) { // $row_array['maestro_id'] = $maestro_id; // $row_array['player_id'] = $player_id; $row_array['AppID'] = $app_id_list; - if($highest_record === NULL) + if($app_highest_record === NULL) $row_array['AppHighestRecord'] = 0; else - $row_array['AppHighestRecord'] = $highest_record; + $row_array['AppHighestRecord'] = $app_highest_record; array_push($return_array, $row_array); } diff --git a/src/web/server/lib/app_highest_record.php b/src/web/server/lib/app_highest_record.php index 9828cc6..c15ec3c 100644 --- a/src/web/server/lib/app_highest_record.php +++ b/src/web/server/lib/app_highest_record.php @@ -11,13 +11,13 @@ function get_app_highest_record($maestro_id, $app_id, $player_id) { $stmt = $db_conn->prepare($query); $stmt->bind_param("iii", $maestro_id, $app_id, $player_id); $stmt->execute(); - $stmt->bind_result($highest_record); + $stmt->bind_result($app_highest_record); $stmt->fetch(); $stmt->close(); - return $highest_record; + return $app_highest_record; - echo "\nget_app_highest_record : $highest_record"; + // echo "\nget_app_highest_record : $app_highest_record"; } @@ -32,10 +32,10 @@ function remove_app_highest_record($maestro_id, $app_id, $player_id) { $stmt->bind_param("iii", $maestro_id, $app_id, $player_id); $stmt->execute(); - echo "\ndelete_app_highest_record"; + // echo "\ndelete_app_highest_record"; } -function insert_app_highest_record($maestro_id, $app_id, $player_id, $highest_record) { +function insert_app_highest_record($maestro_id, $app_id, $player_id, $app_highest_record) { global $db_conn; $query = " @@ -43,10 +43,10 @@ function insert_app_highest_record($maestro_id, $app_id, $player_id, $highest_re VALUES (?, ?, ?, ?, NOW()); "; $stmt = $db_conn->prepare($query); - $stmt->bind_param('iiid', $maestro_id, $player_id, $app_id, $highest_record); + $stmt->bind_param('iiid', $maestro_id, $player_id, $app_id, $app_highest_record); $stmt->execute(); - echo "\ninsert_app_highest_record"; + // echo "\ninsert_app_highest_record"; } ?> \ No newline at end of file diff --git a/src/web/server/record/update_app_highest_record.php b/src/web/server/record/update_app_highest_record.php index ffc7357..0e04617 100644 --- a/src/web/server/record/update_app_highest_record.php +++ b/src/web/server/record/update_app_highest_record.php @@ -16,7 +16,7 @@ $prev_best_record_id = -1; $prev_best_record = 0; $prev_best_record_id = get_best_record($maestro_id, $app_id, $player_id); -echo "id : ".$prev_best_record_id." ".$prev_best_record; +// echo "id : ".$prev_best_record_id." ".$prev_best_record; if($prev_best_record_id === null || $prev_best_record_id < 0) { // echo "insert"; @@ -31,18 +31,18 @@ if($prev_best_record_id === null || $prev_best_record_id < 0) { // highest record is the highest record $app_highest_record = get_app_highest_record($maestro_id, $app_id, $player_id); -echo "\napp_highest_record : $app_highest_record"; +// echo "\napp_highest_record : $app_highest_record"; -echo "\nrecord : $record"; +// echo "\nrecord : $record"; if($app_highest_record == null) { insert_app_highest_record($maestro_id, $app_id, $player_id, $record); - echo "\ninsert_app_highest_record : $record"; + // echo "\ninsert_app_highest_record : $record"; } else if($record > $app_highest_record) { remove_app_highest_record($maestro_id, $app_id, $player_id); - echo "\nremove_app_highest_record"; + // echo "\nremove_app_highest_record"; insert_app_highest_record($maestro_id, $app_id, $player_id, $record); - echo "\ninsert_app_highest_record : $record"; + // echo "\ninsert_app_highest_record : $record"; } $db_conn->close();