From e2c37b52d12c3a56bdd92757d5c8ef54b06b7226 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?=
 <jisangs@gmail.com>
Date: Sat, 11 Aug 2018 11:59:35 +0900
Subject: [PATCH] Fix: maestro experience account type = 101

---
 src/web/js/lib/maestro_info.js                |  4 ++++
 src/web/module/header.html                    |  2 +-
 src/web/module/maestro_header.html            |  4 +++-
 src/web/module/maestro_section_mouse_app.html | 10 ++++----
 src/web/module/maestro_setup.html             |  4 ++--
 src/web/module/maestro_upgrade.html           |  3 ++-
 src/web/server/app/activate_app.php           | 23 ++++++++++++++++++-
 src/web/server/app/deactivate_app.php         | 23 ++++++++++++++++++-
 .../maestro/maestro_experience_account.php    |  2 +-
 9 files changed, 62 insertions(+), 13 deletions(-)

diff --git a/src/web/js/lib/maestro_info.js b/src/web/js/lib/maestro_info.js
index e4d18d8..1e798cf 100644
--- a/src/web/js/lib/maestro_info.js
+++ b/src/web/js/lib/maestro_info.js
@@ -33,9 +33,13 @@ class MaestroInfo {
 		switch(this.accountType) {
 			case 0:
 			case 1:
+			case 100:
+			case 101:
 			return 20;
+
 			case 2:
 			return 50;
+
 			case 3:
 			return 100;
 		}
diff --git a/src/web/module/header.html b/src/web/module/header.html
index e55586c..6c94bdc 100644
--- a/src/web/module/header.html
+++ b/src/web/module/header.html
@@ -2,7 +2,7 @@
 	<div class="container">
 
 		<div class="navbar-header">
-			<a class="navbar-brand" href="javascript:void(0);" onClick="goHome()" href="">마우스 타자 연습</a>
+			<a class="navbar-brand" href="javascript:void(0);" onClick="goHome()" href="">홈</a>
 		</div>
 
 		<div class="eyebrow ml-auto mt-0 d-md-flex align-items-center">
diff --git a/src/web/module/maestro_header.html b/src/web/module/maestro_header.html
index 9516981..93b87ac 100644
--- a/src/web/module/maestro_header.html
+++ b/src/web/module/maestro_header.html
@@ -56,7 +56,9 @@ function deleteMaestroAllRecords() {
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark py-3">
 	<div class="container">
 
-		<div class="navbar-header">
+		<div class="navbar-header text-white">
+			<a class="navbar-brand" href="javascript:void(0);" onClick="logout()" href="">홈</a>
+			|&nbsp;&nbsp;
 			<a class="navbar-brand" href="javascript:void(0);" onClick="goHome()" href="">마에스트로 계정 홈</a>
 		</div>
 
diff --git a/src/web/module/maestro_section_mouse_app.html b/src/web/module/maestro_section_mouse_app.html
index c4e633f..24fcfca 100644
--- a/src/web/module/maestro_section_mouse_app.html
+++ b/src/web/module/maestro_section_mouse_app.html
@@ -72,11 +72,11 @@ function activateApp(appID) {
 		"maestro_id=" + maestroID + "&app_id=" + appID,
 
 		(jsonData) => {
-			// addPlayerListManager.updateAddPlayerListPage(1);
+			// console.log(jsonData);
+			showErrorMessage("[ " + jsonData["koreanName"] + "] 앱이 메뉴에 추가되었습니다. (위의 [마에스트로 앱 실행] 버튼을 눌러 확인해보세요)", "success");
 		},
 
 		(errorMessage, errorCode) => {
-			console.log("errorMessage : " + errorMessage);
 			showErrorMessage(errorMessage, "error");
 		}
 
@@ -89,11 +89,11 @@ function deactivateApp(appID) {
 		"maestro_id=" + maestroID + "&app_id=" + appID,
 
 		(jsonData) => {
-			// addPlayerListManager.updateAddPlayerListPage(1);
+			// console.log(jsonData);
+			showErrorMessage("[ " + jsonData["koreanName"] + "] 앱이 메뉴에서 삭제되었습니다. (위의 [마에스트로 앱 실행] 버튼을 눌러 확인해보세요)", "danger");
 		},
 
 		(errorMessage, errorCode) => {
-			console.log("errorMessage : " + errorMessage);
 			showErrorMessage(errorMessage, "error");
 		}
 
@@ -104,7 +104,7 @@ function deactivateApp(appID) {
 
 
 
-<div class="row mx-1">
+<div clas됩="row mx-1">
 	<div class="col">
 
 		<h5 class="mt-2 mb-2">마우스 연습</h5>
diff --git a/src/web/module/maestro_setup.html b/src/web/module/maestro_setup.html
index 4cf272f..9609707 100644
--- a/src/web/module/maestro_setup.html
+++ b/src/web/module/maestro_setup.html
@@ -87,7 +87,7 @@ function checkMaestroIDName() {
 }
 
 function changeMaestroInfo() {
-	if(registeredAccountType === 0) {
+	if(registeredAccountType >= 100) {
 		showErrorMessage("체험 계정은 정보 수정이 불가능합니다.", "error");
 		return;
 	}
@@ -137,7 +137,7 @@ function changeMaestroInfo() {
 }
 
 function checkPassword() {
-	if(registeredAccountType === 0) {
+	if(registeredAccountType >= 100) {
 		showErrorMessage("체험 계정은 암호 수정이 불가능합니다.", "error");
 		$('html, body').animate({
 			scrollTop: $("#message_box").offset().top + 'px'
diff --git a/src/web/module/maestro_upgrade.html b/src/web/module/maestro_upgrade.html
index 0ed9c21..a3b7f8a 100644
--- a/src/web/module/maestro_upgrade.html
+++ b/src/web/module/maestro_upgrade.html
@@ -28,7 +28,8 @@ function loadMaestroInfo(maestroID) {
 function updateCards(accountType) {
 	console.log(accountType);
 	switch(accountType) {
-		case 0:
+		case 100:
+		case 101:
 		$("#account_type_1").addClass("border-warning");
 		$("#account_type_1_btn").addClass("btn-secondary disabled");
 		$("#account_type_1_footer").addClass("text-danger");
diff --git a/src/web/server/app/activate_app.php b/src/web/server/app/activate_app.php
index 21c0724..d15b8ef 100644
--- a/src/web/server/app/activate_app.php
+++ b/src/web/server/app/activate_app.php
@@ -9,8 +9,10 @@ $appID = $_POST["app_id"];
 
 
 activate_app($maestroID, $appID);
+$appInfo = get_app_name($appID);
 
-set_data("activatedAppList", $activated_mouse_app_list);
+set_data("appName", $appInfo["AppName"]);
+set_data("koreanName", $appInfo["KoreanName"]);
 send_result_success();
 exit;
 
@@ -28,4 +30,23 @@ function activate_app($maestroID, $appID) {
 	$stmt->bind_result();
 }
 
+function get_app_name($appID) {
+	global $db_conn;
+
+	$query = "
+		SELECT AppName, KoreanName
+		FROM moty_app
+		WHERE AppID = ?
+	";
+	$stmt = $db_conn->prepare($query);
+	$stmt->bind_param('i', $appID);
+	$stmt->execute();
+	$stmt->bind_result($appName, $koreanName);
+	$stmt->fetch();
+
+	$result["AppName"] = $appName;
+	$result["KoreanName"] = $koreanName;
+	return $result;
+}
+
 ?>
\ No newline at end of file
diff --git a/src/web/server/app/deactivate_app.php b/src/web/server/app/deactivate_app.php
index 66b70c2..8b19977 100644
--- a/src/web/server/app/deactivate_app.php
+++ b/src/web/server/app/deactivate_app.php
@@ -9,8 +9,10 @@ $appID = $_POST["app_id"];
 
 
 deactivate_app($maestroID, $appID);
+$appInfo = get_app_name($appID);
 
-set_data("activatedAppList", $activated_mouse_app_list);
+set_data("appName", $appInfo["AppName"]);
+set_data("koreanName", $appInfo["KoreanName"]);
 send_result_success();
 exit;
 
@@ -28,4 +30,23 @@ function deactivate_app($maestroID, $appID) {
 	$stmt->bind_result();
 }
 
+function get_app_name($appID) {
+	global $db_conn;
+
+	$query = "
+		SELECT AppName, KoreanName
+		FROM moty_app
+		WHERE AppID = ?
+	";
+	$stmt = $db_conn->prepare($query);
+	$stmt->bind_param('i', $appID);
+	$stmt->execute();
+	$stmt->bind_result($appName, $koreanName);
+	$stmt->fetch();
+
+	$result["AppName"] = $appName;
+	$result["KoreanName"] = $koreanName;
+	return $result;
+}
+
 ?>
\ No newline at end of file
diff --git a/src/web/server/maestro/maestro_experience_account.php b/src/web/server/maestro/maestro_experience_account.php
index 2ac9a4a..4fb6edb 100644
--- a/src/web/server/maestro/maestro_experience_account.php
+++ b/src/web/server/maestro/maestro_experience_account.php
@@ -39,7 +39,7 @@ function get_maestro_experience_id() {
 	$query = "
 		SELECT MaestroID
 		FROM moty_maestro
-		WHERE AccountType = 0
+		WHERE AccountType = 101
 	";
 	$stmt = $db_conn->prepare($query);
 	// $stmt->bind_param("s", $maestro_name);