diff --git a/src/web/module/maestro_section_app_activation.html b/src/web/module/maestro_section_app_activation.html index cf5bf96..d510dd6 100644 --- a/src/web/module/maestro_section_app_activation.html +++ b/src/web/module/maestro_section_app_activation.html @@ -161,6 +161,7 @@ function makeTypingAppList(appList) { $("#typing_practice_eng").empty(); $("#typing_test_kor").empty(); $("#typing_test_eng").empty(); + $("#test_exam").empty(); $("#typing_app").empty(); for(var i = 0; i < appList.length; i++) { @@ -186,13 +187,12 @@ function makeTypingAppList(appList) { divTag = $("#typing_test_eng"); groupName = "typing_test_eng"; } - // else { - // divTag = $("#typing_app"); - // groupName = "typing_app_all"; - // } else if(appData.appID < 200) { divTag = $("#typing_app"); groupName = "typing_app_all"; + } else if(appData.appID == 200) { + divTag = $("#test_exam"); + groupName = "test_exam"; } else { continue; } @@ -271,6 +271,13 @@ function triggerAppGroup(groupName) { +
긴글 (시험)
+
+
+
+
+ +
타자 놀이
@@ -280,6 +287,7 @@ function triggerAppGroup(groupName) {
+
마우스 놀이
diff --git a/src/web/php/db/writing_collection.php b/src/web/php/db/writing_collection.php index 0fa1993..507e2ef 100644 --- a/src/web/php/db/writing_collection.php +++ b/src/web/php/db/writing_collection.php @@ -44,9 +44,14 @@ class WritingCollection extends DBMethodContainer $query = " SELECT WritingID FROM writing - WHERE Language=? AND ActivateStatus=1"; + WHERE + ( + SELECT COUNT(1) + FROM active_app + WHERE MaestroID=? AND AppID=200 + )=1 AND Language=? AND ActivateStatus=1"; $stmt = $this->mysqli->prepare($query); - $stmt->bind_param("s", $language); + $stmt->bind_param("ss", $maestroID, $language); $stmt->execute(); $stmt->bind_result($writingID);