jisangs/chocomae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: DB jisangs -> moty

Browse Source
This commit is contained in:
Jisang Park
2018-08-22 17:25:07 +09:00
parent 5c0e823980
commit 6fcb459550
45 changed files with 141 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web/server/app/activate_app.php
+2 -2
View File
@@ -21,7 +21,7 @@ function activate_app($maestroID, $appID) {
global $db_conn;
$query = "
INSERT INTO moty_active_app (MaestroID, AppID)
INSERT INTO active_app (MaestroID, AppID)
VALUES (?, ?);
";
$stmt = $db_conn->prepare($query);
@@ -35,7 +35,7 @@ function get_app_name($appID) {
$query = "
SELECT AppName, KoreanName
FROM moty_app
FROM app
WHERE AppID = ?
";
$stmt = $db_conn->prepare($query);
src/web/server/app/deactivate_app.php
+2 -2
View File
@@ -21,7 +21,7 @@ function deactivate_app($maestroID, $appID) {
global $db_conn;
$query = "
DELETE FROM moty_active_app
DELETE FROM active_app
WHERE MaestroID = ? AND AppID = ?;
";
$stmt = $db_conn->prepare($query);
@@ -35,7 +35,7 @@ function get_app_name($appID) {
$query = "
SELECT AppName, KoreanName
FROM moty_app
FROM app
WHERE AppID = ?
";
$stmt = $db_conn->prepare($query);
src/web/server/app/how_to_play.php
+1 -1
View File
@@ -23,7 +23,7 @@ function get_how_to_play($app_id) {
$query = "
SELECT HowToPlay
FROM moty_app
FROM app
WHERE AppID = ?;
";
$stmt = $db_conn->prepare($query);
src/web/server/app/menu_active_app_list.php
+8 -8
View File
@@ -28,8 +28,8 @@ function get_mouse_app_list($maestro_id) {
$query = "
SELECT A.AppID, A.AppName, A.KoreanName, A.AppType
FROM moty_app AS A
INNER JOIN moty_active_app AS AA ON A.AppID = AA.AppID AND A.AppType = 100 AND AA.MaestroID=?";
FROM app AS A
INNER JOIN active_app AS AA ON A.AppID = AA.AppID AND A.AppType = 100 AND AA.MaestroID=?";
$stmt = $db_conn->prepare($query);
$stmt->bind_param("i", $maestro_id);
$stmt->execute();
@@ -53,8 +53,8 @@ function get_typing_practice_app_count($maestro_id) {
$query = "
SELECT COUNT(*)
FROM moty_app AS A
INNER JOIN moty_active_app AS AA ON A.AppID = AA.AppID AND A.AppType <= 2 AND AA.MaestroID=?";
FROM app AS A
INNER JOIN active_app AS AA ON A.AppID = AA.AppID AND A.AppType <= 2 AND AA.MaestroID=?";
$stmt = $db_conn->prepare($query);
$stmt->bind_param("i", $maestro_id);
$stmt->execute();
@@ -70,8 +70,8 @@ function get_typing_test_app_count($maestro_id) {
$query = "
SELECT COUNT(*)
FROM moty_app AS A
INNER JOIN moty_active_app AS AA ON A.AppID = AA.AppID AND A.AppType > 10 AND A.AppType <= 12 AND AA.MaestroID=?";
FROM app AS A
INNER JOIN active_app AS AA ON A.AppID = AA.AppID AND A.AppType > 10 AND A.AppType <= 12 AND AA.MaestroID=?";
$stmt = $db_conn->prepare($query);
$stmt->bind_param("i", $maestro_id);
$stmt->execute();
@@ -87,8 +87,8 @@ function get_typing_app_list($maestro_id) {
$query = "
SELECT A.AppID, A.AppName, A.KoreanName, A.AppType
FROM moty_app AS A
INNER JOIN moty_active_app AS AA ON A.AppID = AA.AppID AND A.AppType = 50 AND AA.MaestroID=?";
FROM app AS A
INNER JOIN active_app AS AA ON A.AppID = AA.AppID AND A.AppType = 50 AND AA.MaestroID=?";
$stmt = $db_conn->prepare($query);
$stmt->bind_param("i", $maestro_id);
$stmt->execute();
src/web/server/app/menu_active_typing_practice_app_list.php
+2 -2
View File
@@ -26,8 +26,8 @@ function get_active_typing_practice_app_list($maestro_id, $type) {
$query = "
SELECT A.AppID, A.AppName, A.KoreanName
FROM moty_app AS A
INNER JOIN moty_active_app AS AA
FROM app AS A
INNER JOIN active_app AS AA
ON A.AppID = AA.AppID AND AA.MaestroID = ? AND A.AppType = ?
ORDER BY A.AppID ASC";
$stmt = $db_conn->prepare($query);
src/web/server/app/menu_active_typing_test_app_list.php
+2 -2
View File
@@ -26,8 +26,8 @@ function get_active_typing_practice_app_list($maestro_id, $type) {
$query = "
SELECT A.AppID, A.AppName, A.KoreanName
FROM moty_app AS A
INNER JOIN moty_active_app AS AA
FROM app AS A
INNER JOIN active_app AS AA
ON A.AppID = AA.AppID AND AA.MaestroID = ? AND A.AppType = ?
ORDER BY A.AppID ASC";
$stmt = $db_conn->prepare($query);
src/web/server/app/mouse_app_list.php
+3 -3
View File
@@ -27,7 +27,7 @@ function get_mouse_app_list() {
global $db_conn;
$query = "
SELECT AppID, AppName, KoreanName FROM moty_app
SELECT AppID, AppName, KoreanName FROM app
WHERE AppType=100
ORDER BY AppID ASC
";
@@ -51,8 +51,8 @@ function get_activated_mouse_app_list($maestroID) {
$query = "
SELECT A.AppID
FROM moty_app AS A
INNER JOIN moty_active_app AS AA ON A.AppID = AA.AppID AND A.AppType = 100 AND AA.MaestroID=?"
FROM app AS A
INNER JOIN active_app AS AA ON A.AppID = AA.AppID AND A.AppType = 100 AND AA.MaestroID=?"
;
$stmt = $db_conn->prepare($query);
$stmt->bind_param("i", $maestroID);
src/web/server/app/typing_app_list.php
+3 -3
View File
@@ -27,7 +27,7 @@ function get_typing_app_list() {
global $db_conn;
$query = "
SELECT AppID, AppName, KoreanName FROM moty_app
SELECT AppID, AppName, KoreanName FROM app
WHERE AppType < 100
ORDER BY AppID ASC
";
@@ -51,8 +51,8 @@ function get_activated_typing_app_list($maestroID) {
$query = "
SELECT A.AppID
FROM moty_app AS A
INNER JOIN moty_active_app AS AA ON A.AppID = AA.AppID AND A.AppType < 100 AND AA.MaestroID=?"
FROM app AS A
INNER JOIN active_app AS AA ON A.AppID = AA.AppID AND A.AppType < 100 AND AA.MaestroID=?"
;
$stmt = $db_conn->prepare($query);
$stmt->bind_param("i", $maestroID);