diff --git a/src/web/js/player_list.js b/src/web/js/player_list.js index 53ef946..6caa673 100644 --- a/src/web/js/player_list.js +++ b/src/web/js/player_list.js @@ -53,6 +53,8 @@ class PlayerList { $(item.playerID).empty(); $(item.playerName).prop("disabled", true); $(item.enterCode).prop("disabled", true); + // $(item.playerName).prop("readonly", true); + // $(item.enterCode).prop("readonly", true); $(item.editButton).prop("disabled", true); $(item.deleteButton).prop("disabled", true); } @@ -60,6 +62,8 @@ class PlayerList { enableItem(item) { $(item.playerName).prop("disabled", false); $(item.enterCode).prop("disabled", false); + // $(item.playerName).prop("readonly", false); + // $(item.enterCode).prop("readonly", false); $(item.editButton).prop("disabled", false); $(item.deleteButton).prop("disabled", false); } diff --git a/src/web/module/home_section.html b/src/web/module/home_section.html index d464815..b28b214 100644 --- a/src/web/module/home_section.html +++ b/src/web/module/home_section.html @@ -22,9 +22,7 @@ function loadMaestroExperienceAccount() { }, (errorMessage, errorCode) => { - if($("#error_message").length) { - $("#error_message").text(errorMessage); - } + showErrorMessage(errorMessage, "error"); } ); diff --git a/src/web/module/maestro_section_main.html b/src/web/module/maestro_section_main.html index 54add07..938e9d5 100644 --- a/src/web/module/maestro_section_main.html +++ b/src/web/module/maestro_section_main.html @@ -69,15 +69,15 @@ function onChangePlayerCount() {
-
+
-
+
diff --git a/src/web/module/maestro_section_mouse_app.html b/src/web/module/maestro_section_mouse_app.html index 491f55f..c4e633f 100644 --- a/src/web/module/maestro_section_mouse_app.html +++ b/src/web/module/maestro_section_mouse_app.html @@ -17,9 +17,7 @@ function loadMouseApp() { }, (errorMessage, errorCode) => { - if($("#error_message").length) { - $("#error_message").text(errorMessage); - } + showErrorMessage(errorMessage, "error"); } ); @@ -31,14 +29,24 @@ function makeMouseAppList(appList) { for(let i = 0; i < appList.length; i++) { let appData = appList[i]; - $("#mouse_app_content").append( + $("#mouse_app_content").append('\ +
\ + \ + \ +
\ +\ + '); + /* "" + "" + "" + "" ); + */ - $("#checkbox" + appData.appID).change(function() { + $("#" + appData.appID).change(function() { if($(this).is(":checked")) { activateApp($(this).data("appId")); } else { @@ -52,7 +60,7 @@ function activateMouseApp(activatedList) { for(let i = 0; i < activatedList.length; i++) { let activatedAppID = activatedList[i].appID; - let input = $("#checkbox" + activatedAppID); + let input = $("#" + activatedAppID); input.prop("checked", true); } } @@ -68,9 +76,8 @@ function activateApp(appID) { }, (errorMessage, errorCode) => { - if($("#error_message").length) { - $("#error_message").text(errorMessage); - } + console.log("errorMessage : " + errorMessage); + showErrorMessage(errorMessage, "error"); } ); @@ -86,9 +93,8 @@ function deactivateApp(appID) { }, (errorMessage, errorCode) => { - if($("#error_message").length) { - $("#error_message").text(errorMessage); - } + console.log("errorMessage : " + errorMessage); + showErrorMessage(errorMessage, "error"); } ); @@ -98,21 +104,15 @@ function deactivateApp(appID) { -
+
+
- - - - +
마우스 연습
- - - - - - - - - +
+
+
+
+
\ No newline at end of file diff --git a/src/web/module/maestro_section_typing_app.html b/src/web/module/maestro_section_typing_app.html index 7292923..b1b53b7 100644 --- a/src/web/module/maestro_section_typing_app.html +++ b/src/web/module/maestro_section_typing_app.html @@ -17,10 +17,7 @@ function loadTypingApp() { }, (errorMessage, errorCode) => { - console.log(errorMessage); - if($("#error_message").length) { - $("#error_message").text(errorMessage); - } + showErrorMessage(errorMessage, "error"); } ); @@ -49,14 +46,18 @@ function makeTypingAppList(appList) { divTag = $("#typing_test_eng"); else divTag = $("#typing_app"); - divTag.append( - "" - + "" - + "" - + "" - ); - $("#checkbox" + appData.appID).change(function() { + divTag.append('\ +
\ + \ + \ +
\ +\ + '); + + $("#" + appData.appID).change(function() { if($(this).is(":checked")) { activateApp($(this).data("appId")); } else { @@ -70,7 +71,7 @@ function activateTypingApp(activatedList) { for(let i = 0; i < activatedList.length; i++) { let activatedAppID = activatedList[i].appID; - let input = $("#checkbox" + activatedAppID); + let input = $("#" + activatedAppID); input.prop("checked", true); } } @@ -79,23 +80,42 @@ function activateTypingApp(activatedList) { -
+
+
+ +
자리 연습
+
+

한글

+
+
+
+ +

English

+
+
+
+
+ + +
타자 시험
+
+

한글

+
+
+
+ +

English

+
+
+
+
+ + +
타자 앱
+
+
+
+
-
-

자리 연습

-
-
- -
-

타자 시험

-
-
-
- -
-

타자 앱

-
-
-
\ No newline at end of file diff --git a/src/web/server/app/activate_app.php b/src/web/server/app/activate_app.php index c257ce9..21c0724 100644 --- a/src/web/server/app/activate_app.php +++ b/src/web/server/app/activate_app.php @@ -1,17 +1,18 @@ close(); +set_data("activatedAppList", $activated_mouse_app_list); +send_result_success(); +exit; function activate_app($maestroID, $appID) { diff --git a/src/web/server/app/deactivate_app.php b/src/web/server/app/deactivate_app.php index 00ecb0e..66b70c2 100644 --- a/src/web/server/app/deactivate_app.php +++ b/src/web/server/app/deactivate_app.php @@ -1,17 +1,18 @@ close(); +set_data("activatedAppList", $activated_mouse_app_list); +send_result_success(); +exit; function deactivate_app($maestroID, $appID) {