From 0c145523ea38d1a6f5098dc3bd8206c84e1a1a22 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: Sun, 8 Sep 2019 18:02:14 +0900 Subject: [PATCH] Add ActiveState for Writing DB table --- src/web/php/db/writing_collection.php | 5 +++-- src/web/sql/make_db.sql | 17 +++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/web/php/db/writing_collection.php b/src/web/php/db/writing_collection.php index 53dab7a..0fa1993 100644 --- a/src/web/php/db/writing_collection.php +++ b/src/web/php/db/writing_collection.php @@ -16,7 +16,8 @@ class WritingCollection extends DBMethodContainer $query = " SELECT WritingID, Name, Filename, LetterCount FROM writing - WHERE Language=?"; + WHERE Language=? AND ActivateStatus=1 + ORDER BY LetterCount"; $stmt = $this->mysqli->prepare($query); $stmt->bind_param("s", $language); $stmt->execute(); @@ -43,7 +44,7 @@ class WritingCollection extends DBMethodContainer $query = " SELECT WritingID FROM writing - WHERE Language=?"; + WHERE Language=? AND ActivateStatus=1"; $stmt = $this->mysqli->prepare($query); $stmt->bind_param("s", $language); $stmt->execute(); diff --git a/src/web/sql/make_db.sql b/src/web/sql/make_db.sql index 2ffe10d..66717b6 100644 --- a/src/web/sql/make_db.sql +++ b/src/web/sql/make_db.sql @@ -129,6 +129,7 @@ INSERT INTO `ads_client` (`AdsClientID`, `ClientName`) VALUES CREATE TABLE writing ( WritingID INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY, + ActivateStatus INT UNSIGNED NOT NULL, Language CHAR(10) NOT NULL, Name CHAR(50) NOT NULL, Filename CHAR(50) NOT NULL, @@ -138,14 +139,14 @@ CREATE TABLE writing ( LetterCount INT UNSIGNED NOT NULL ); INSERT INTO `writing` (`WritingID`, `Language`, `Name`, `Filename`, `Writer`, `WriterID`, `UpdateDate`, `LetterCount`) VALUES -(1, 'korean', '봄2', 'korean_spring.txt', 'system', NULL, '2019-07-04 00:00:00', 93), -(2, 'korean', '애국가', 'korean_national_anthem.txt', 'system', NULL, '2019-07-04 00:00:00', 208), -(3, 'korean', '냉면', 'korean_cold_noodle.txt', 'system', NULL, '2019-07-04 00:00:00', 2101), -(4, 'korean', '허생전', 'korean_heoseng.txt', 'system', NULL, '2019-07-04 00:00:00', 8839), -(5, 'english', 'Time is', 'english_time_is.txt', 'system', NULL, '2019-07-11 00:00:00', 186), -(6, 'english', 'Beautiful dreamer', 'english_beautiful_dreamer.txt', 'system', NULL, '2019-07-11 00:00:00', 729), -(7, 'english', 'The wolf and the seven little kids', 'english_wolf_7kids.txt', 'system', NULL, '2019-07-11 00:00:00', 5765), -(8, 'english', 'The happy prince', 'english_happy_prince.txt', 'system', NULL, '2019-07-11 00:00:00', 18355); +(1, 'korean', 1, '봄2', 'korean_spring.txt', 'system', NULL, '2019-07-04 00:00:00', 93), +(2, 'korean', 1, '애국가', 'korean_national_anthem.txt', 'system', NULL, '2019-07-04 00:00:00', 208), +(3, 'korean', 1, '냉면', 'korean_cold_noodle.txt', 'system', NULL, '2019-07-04 00:00:00', 2101), +(4, 'korean', 1, '허생전', 'korean_heoseng.txt', 'system', NULL, '2019-07-04 00:00:00', 8839), +(5, 'english', 1, 'Time is', 'english_time_is.txt', 'system', NULL, '2019-07-11 00:00:00', 186), +(6, 'english', 1, 'Beautiful dreamer', 'english_beautiful_dreamer.txt', 'system', NULL, '2019-07-11 00:00:00', 729), +(7, 'english', 1, 'The wolf and the seven little kids', 'english_wolf_7kids.txt', 'system', NULL, '2019-07-11 00:00:00', 5765), +(8, 'english', 1, 'The happy prince', 'english_happy_prince.txt', 'system', NULL, '2019-07-11 00:00:00', 18355); CREATE TABLE typing_exam_record (