From 8268852c9d0718b11a57eb49e732c874c3e00183 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, 17 Jul 2019 09:19:52 +0900 Subject: [PATCH] Fix: update result record to DB --- resources/file/typing_exam/system/sample.txt | 2 + src/game/typing/examination/game.js | 51 ++++++++++---------- src/web/php/db/tdd_run.php | 8 +-- src/web/php/db/typing_exam_collection.php | 8 +-- src/web/php/writing/get_highest_record.php | 2 +- src/web/php/writing/update_result_record.php | 12 ++--- test/tdd.js | 14 +++--- 7 files changed, 49 insertions(+), 48 deletions(-) create mode 100644 resources/file/typing_exam/system/sample.txt diff --git a/resources/file/typing_exam/system/sample.txt b/resources/file/typing_exam/system/sample.txt new file mode 100644 index 0000000..0b14f60 --- /dev/null +++ b/resources/file/typing_exam/system/sample.txt @@ -0,0 +1,2 @@ +초코마에 +지나주 \ No newline at end of file diff --git a/src/game/typing/examination/game.js b/src/game/typing/examination/game.js index b6c1106..c50baf9 100644 --- a/src/game/typing/examination/game.js +++ b/src/game/typing/examination/game.js @@ -3,18 +3,19 @@ var TypingExamination = { create: function() { // for developing - sessionStorageManager.setMaestroName("삼화초"); - sessionStorageManager.setMaestroID(3); - sessionStorageManager.setMaestroAccountType(4); - sessionStorageManager.setPlayerName("박지상"); - sessionStorageManager.setPlayerID(35); - sessionStorageManager.setPlayerAccountType(0); - sessionStorageManager.setPlayingAppID(100); - sessionStorageManager.setPlayingAppName("examination_korean"); + // sessionStorageManager.setMaestroName("삼화초"); + // sessionStorageManager.setMaestroID(3); + // sessionStorageManager.setMaestroAccountType(4); + // sessionStorageManager.setPlayerName("박지상"); + // sessionStorageManager.setPlayerID(35); + // sessionStorageManager.setPlayerAccountType(0); + // sessionStorageManager.setPlayingAppID(100); + // sessionStorageManager.setPlayingAppName("examination_korean"); + // sessionStorageManager.setPlayingAppKoreanName("타자 검정"); + // sessionStorageManager.setRecord(0); + // sessionStorageManager.setAppHighestRecord(100.123); + sessionStorageManager.setPlayingAppName("typing_examination_korean"); sessionStorageManager.setPlayingAppKoreanName("타자 검정"); - sessionStorageManager.setRecord(0); - sessionStorageManager.setAppHighestRecord(100.123); - // this.dbConnectManager = new DBConnectManager(); @@ -303,25 +304,21 @@ var TypingExamination = { if(!isExperienceMaestroAccount()) this.updateResultRecord(); - game.time.events.add(Phaser.Timer.SECOND * 2, this.goResult, this); + // game.time.events.add(Phaser.Timer.SECOND * 2, this.goResult, this); }, updateResultRecord: function() { if(sessionStorageManager.getMaestroAccountType() < 100) { // experience account this.dbService.updateTypingExamRecord( - sessionStorageManager.getMaestroID(), - sessionStorageManager.getPlayerID(), - sessionStorageManager.getPlayingAppID(), - sessionStorageManager.getRecord() + sessionStorageManager.getWritingID(), + sessionStorageManager.getRecord(), + (function(replyJSON) { + console.log(replyJSON); + }).bind(this), + (function(replyJSON) { + console.log(replyJSON); + }).bind(this) ); - /* - this.dbConnectManager.updateResultRecord( - sessionStorageManager.getMaestroID(), - sessionStorageManager.getPlayerID(), - sessionStorageManager.getPlayingAppID(), - sessionStorageManager.getRecord() - ); - */ } }, @@ -369,11 +366,13 @@ var TypingExamination = { var directory = writer + writerID + "/"; var filename = writingInfo["filename"]; var url = path + directory + filename; + if(isDebugMode()) { + url = path + "system/sample.txt"; + console.log(url); + } game.load.onLoadComplete.add(this.completeLoadingWriting, this); - game.load.text("writing", url); - game.load.start(); }, diff --git a/src/web/php/db/tdd_run.php b/src/web/php/db/tdd_run.php index 2ada015..579774f 100644 --- a/src/web/php/db/tdd_run.php +++ b/src/web/php/db/tdd_run.php @@ -32,24 +32,24 @@ if ($command === "addTypingExamHighestRecord") { $typingExam = new TypingExamCollection($dbConnector->getMysqli()); $typingExam->addHighestRecord(MAESTRO_ID, PLAYER_ID, WRITING_ID, WRITING_RECORD); - // $typingExamHighestRecordData = $typingExam->getHighestRecordForWriting(MAESTRO_ID, PLAYER_ID, WRITING_ID); + // $typingExamHighestRecordData = $typingExam->getHighestRecord(MAESTRO_ID, PLAYER_ID, WRITING_ID); // $jsonBuilder->setData("typingExamHighestRecordData", $typingExamHighestRecordData); } elseif ($command === "updateTypingExamHighestRecord") { include "./db_method_container.php"; include "./typing_exam_collection.php"; $typingExam = new TypingExamCollection($dbConnector->getMysqli()); - $typingExamHighestRecordData = $typingExam->getHighestRecordForWriting(MAESTRO_ID, PLAYER_ID, WRITING_ID); + $typingExamHighestRecordData = $typingExam->getHighestRecord(MAESTRO_ID, PLAYER_ID, WRITING_ID); // $jsonBuilder->setData("typingExamHighestRecordData", $typingExamHighestRecordData); $typingExam->updateHighestRecord($typingExamHighestRecordData["typingExamHighestRecordID"], WRITING_RECORD + 10); - // $typingExamHighestRecordData = $typingExam->getHighestRecordForWriting(MAESTRO_ID, PLAYER_ID, WRITING_ID); + // $typingExamHighestRecordData = $typingExam->getHighestRecord(MAESTRO_ID, PLAYER_ID, WRITING_ID); // $jsonBuilder->setData("updateTypingExamHighestRecord", $typingExamHighestRecordData); } elseif ($command === "getTypingExamHigestRecord") { include "./db_method_container.php"; include "./typing_exam_collection.php"; $typingExam = new TypingExamCollection($dbConnector->getMysqli()); - $typingExamHighestRecordData = $typingExam->getHighestRecordForWriting(MAESTRO_ID, PLAYER_ID, WRITING_ID); + $typingExamHighestRecordData = $typingExam->getHighestRecord(MAESTRO_ID, PLAYER_ID, WRITING_ID); $jsonBuilder->setData("typingExamHighestRecordData", $typingExamHighestRecordData); } diff --git a/src/web/php/db/typing_exam_collection.php b/src/web/php/db/typing_exam_collection.php index f19e61a..2fad7d9 100644 --- a/src/web/php/db/typing_exam_collection.php +++ b/src/web/php/db/typing_exam_collection.php @@ -85,14 +85,14 @@ class TypingExamCollection extends DBMethodContainer $stmt->close(); } - public function getThisHourRecord($maestroID, $playerID) + public function getThisHourRecord($maestroID, $playerID, $writingID) { $query = " SELECT TypingExamRecordID, Record FROM typing_exam_record - WHERE MaestroID = ? AND PlayerID = ? AND DATE(RecordDateTime) = DATE(NOW()) AND HOUR(RecordDateTime) = HOUR(NOW())"; + WHERE MaestroID = ? AND PlayerID = ? AND WritingID = ? AND DATE(RecordDateTime) = DATE(NOW()) AND HOUR(RecordDateTime) = HOUR(NOW())"; $stmt = $this->mysqli->prepare($query); - $stmt->bind_param("ii", $maestroID, $playerID); + $stmt->bind_param("iii", $maestroID, $playerID, $writingID); $stmt->execute(); $stmt->bind_result($typingExamRecordID, $record); @@ -105,7 +105,7 @@ class TypingExamCollection extends DBMethodContainer return $result; } - public function getHighestRecordForWriting($maestroID, $playerID, $writingID) + public function getHighestRecord($maestroID, $playerID, $writingID) { $query = " SELECT TypingExamHighestRecordID, WritingID, HighestRecord diff --git a/src/web/php/writing/get_highest_record.php b/src/web/php/writing/get_highest_record.php index 21ca1f7..25984d5 100644 --- a/src/web/php/writing/get_highest_record.php +++ b/src/web/php/writing/get_highest_record.php @@ -24,7 +24,7 @@ include "./../db/typing_exam_collection.php"; $typingExam = new TypingExamCollection($dbConnector->getMysqli()); -$highestRecordData = $typingExam->getHighestRecordForWriting($maestroID, $playerID, $writingID); +$highestRecordData = $typingExam->getHighestRecord($maestroID, $playerID, $writingID); $jsonBuilder->setData("highestRecordData", $highestRecordData); if ($highestRecordData === null) { diff --git a/src/web/php/writing/update_result_record.php b/src/web/php/writing/update_result_record.php index bed4c70..a46ea60 100644 --- a/src/web/php/writing/update_result_record.php +++ b/src/web/php/writing/update_result_record.php @@ -33,7 +33,7 @@ if (isset($isPrevHourFlag)) { exit; } -addHighestRecord($maestroID, $playerID, $writingID, $record); +updateRecord($maestroID, $playerID, $writingID, $record); updateHighestRecord($maestroID, $playerID, $writingID, $record); $jsonBuilder->sendResultSuccess(); @@ -49,19 +49,19 @@ function addPrevHourRecord($maestroID, $playerID, $writingID, $record) // $jsonBuilder->setData("prevHourRecord", "added"); } -function addHighestRecord($maestroID, $playerID, $writingID, $record) +function updateRecord($maestroID, $playerID, $writingID, $record) { global $typingExam, $jsonBuilder; - $thisHourRecordData = $typingExam->getThisHourRecord($maestroID, $playerID); + $thisHourRecordData = $typingExam->getThisHourRecord($maestroID, $playerID, $writingID); // $jsonBuilder->setData("thisHourRecordData", $thisHourRecordData); if ($thisHourRecordData["record"] === null) { $typingExam->addRecord($maestroID, $playerID, $writingID, $record); - // $jsonBuilder->setData("record", "added : ".$record); + $jsonBuilder->setData("record", "added : ".$record); } else { if ($record > $thisHourRecordData["record"]) { $typingExam->updateRecord($thisHourRecordData["typingExamRecordID"], $record); - // $jsonBuilder->setData("record", "updated : ".$record); + $jsonBuilder->setData("record", "updated : ".$record); } } } @@ -70,7 +70,7 @@ function updateHighestRecord($maestroID, $playerID, $writingID, $record) { global $typingExam, $jsonBuilder; - $highestRecordData = $typingExam->getHighestRecordForWriting($maestroID, $playerID, $writingID); + $highestRecordData = $typingExam->getHighestRecord($maestroID, $playerID, $writingID); // $jsonBuilder->setData("highestRecordData", $highestRecordData); if ($highestRecordData["highestRecord"] === null) { $typingExam->addHighestRecord($maestroID, $playerID, $writingID, $record); diff --git a/test/tdd.js b/test/tdd.js index f898bec..278e676 100644 --- a/test/tdd.js +++ b/test/tdd.js @@ -122,7 +122,7 @@ QUnit.test( "TypingExamDB", function( assert ) { WRITING_ID, //writingRecord RECORD - 10, // record (function(jsonData) { // onSucceeded - console.log(jsonData); + // console.log(jsonData); updateTypingExamRecord2(); }).bind(this), (function(jsonData) { // onFailed @@ -138,11 +138,11 @@ QUnit.test( "TypingExamDB", function( assert ) { WRITING_ID, //writingRecord RECORD, // record (function(jsonData) { // onSucceeded - console.log(jsonData); + // console.log(jsonData); getTypingExamHighestRecord(); }).bind(this), (function(jsonData) { // onFailed - console.log(jsonData); + // console.log(jsonData); }).bind(this) ); } @@ -154,7 +154,7 @@ QUnit.test( "TypingExamDB", function( assert ) { dbService.getTypingExamHighestRecord( WRITING_ID, (function(jsonData) { // onSucceeded - console.log(jsonData); + // console.log(jsonData); var highestRecord = jsonData["highestRecordData"]; assert.equal(highestRecord["highestRecord"], RECORD + 10, "highest record"); @@ -175,11 +175,11 @@ QUnit.test( "TypingExamDB", function( assert ) { WRITING_ID, //writingRecord RECORD + 20, // record (function(jsonData) { // onSucceeded - console.log(jsonData); + // console.log(jsonData); getTypingExamHighestRecord2(); }).bind(this), (function(jsonData) { // onFailed - console.log(jsonData); + // console.log(jsonData); done(); }).bind(this) ); @@ -190,7 +190,7 @@ QUnit.test( "TypingExamDB", function( assert ) { dbService.getTypingExamHighestRecord( WRITING_ID, (function(jsonData) { // onSucceeded - console.log(jsonData); + // console.log(jsonData); var highestRecord = jsonData["highestRecordData"]; assert.equal(highestRecord["highestRecord"], RECORD + 20, "highest record");