From e857fa1674749154e6047198d7b937605f28b032 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: Fri, 13 Jul 2018 10:34:09 +0900
Subject: [PATCH] Add: maestro login fail

---
 src/web/js/request_server.js              | 25 ++++++++++++++---------
 src/web/module/header.html                |  2 +-
 src/web/module/home_section.html          |  2 +-
 src/web/module/maestro_section_login.html | 25 +++++++++++++++++++----
 src/web/server/lib/send_reply_json.php    |  4 ++++
 src/web/server/maestro/login.php          |  2 ++
 6 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/src/web/js/request_server.js b/src/web/js/request_server.js
index 21cb1e8..e216937 100644
--- a/src/web/js/request_server.js
+++ b/src/web/js/request_server.js
@@ -15,8 +15,9 @@
 			// console.log(xhr.responseText.length);
 
 			if(xhr.responseText.length === 0 || xhr.responseText === null) {
-				let error_message = "서버에서 요청을 수행하지 못했습니다.";
-				printErrorMessage(error_message, onFail, isDebugMode);
+				let errorMessage = "서버에서 요청을 수행하지 못했습니다.";
+				let errorCode = "no_reply_from_server";
+				printErrorMessage(errorMessage, errorCode, onFail, isDebugMode);
 				return;
 			}
 
@@ -24,14 +25,16 @@
 			// console.log(jsonReply);
 
 			if(jsonReply === null) {
-				let error_message = "서버에서 데이터가 넘어오지 않았습니다.";
-				printErrorMessage(error_message, onFail, isDebugMode);
+				let errorMessage = "서버에서 데이터가 넘어오지 않았습니다.";
+				let errorCode = "no_data_from_server";
+				printErrorMessage(errorMessage, errorCode, onFail, isDebugMode);
 				return;
 			}
 
 			if(!isSuccess(jsonReply)) {
-				let error_message = getErrorMessage(jsonReply);
-				printErrorMessage(error_message, onFail, isDebugMode);
+				let errorMessage = getErrorMessage(jsonReply);
+				let errorCode = jsonReply["error_code"];
+				printErrorMessage(errorMessage, errorCode, onFail, isDebugMode);
 				return;
 			}
 
@@ -54,10 +57,12 @@ function getErrorMessage(jsonReply) {
 	return jsonReply["error"];
 }
 
-function printErrorMessage(message, onFail, isDebugMode) {
+function printErrorMessage(errorMessage, errorCode, onFail, isDebugMode) {
 	if(onFail !== undefined && onFail !== null)
-		onFail(message);
+		onFail(errorMessage, errorCode);
 
-	if(isDebugMode === true)
-		console.log(message);
+	if(isDebugMode === true) {
+		console.log("Error message : " + errorMessage);
+		console.log("Error code : " + errorCode);
+	}
 }
\ No newline at end of file
diff --git a/src/web/module/header.html b/src/web/module/header.html
index 9935d2c..fe9be97 100644
--- a/src/web/module/header.html
+++ b/src/web/module/header.html
@@ -33,7 +33,7 @@
 		<ul class="header_menu">
 			<li>
 				<span class="col">
-					<a href="./../client/login.html" target="_blank" id="login_player" class="btn btn-rouge">학생 앱<br/>실행</a>
+					<a href="./../client/login.html" target="_blank" id="login_player" class="btn btn-rouge">등록 학생 앱<br/>실행</a>
 				</span>
 			</li>
 			<li>
diff --git a/src/web/module/home_section.html b/src/web/module/home_section.html
index 2b80c64..e3557be 100644
--- a/src/web/module/home_section.html
+++ b/src/web/module/home_section.html
@@ -55,7 +55,7 @@ function experienceMaestro() {
 <div class="container">
 	<div class="player_free">
 		<div class="col alignCenter">
-			<a href="./../main/free_player_app_menu.html" target="_blank" id="player_free_play" class="btn btn-rouge width400" >학생 연습 앱<br/>무료 체험</a>
+			<a href="./../main/free_player_app_menu.html" target="_blank" id="player_free_play" class="btn btn-rouge width400" >미등록 학생 앱<br/>무료 체험</a>
 		</div>
 
 		<ul id="free_app_list">
diff --git a/src/web/module/maestro_section_login.html b/src/web/module/maestro_section_login.html
index c7b7b2e..df6bbe5 100644
--- a/src/web/module/maestro_section_login.html
+++ b/src/web/module/maestro_section_login.html
@@ -26,10 +26,24 @@ function login() {
 			location.href = './../maestro/main_menu.html';
 		},
 
-		(errorMessage) => {
+		(errorMessage, errorCode) => {
 			if($("#error_message").length) {
 				$("#error_message").text(errorMessage);
 			}
+
+			console.log("errorCode : " + errorCode);
+
+			switch(errorCode) {
+				case "not_registered_id":
+				$("#maestro_name").val("");
+				$("#maestro_name").focus();
+				break;
+
+				case "wrong_password":
+				$("#password").val("");
+				$("#password").focus();
+				break;
+			}
 		}
 
 	);
@@ -39,6 +53,12 @@ function login() {
 
 
 <div class="container">
+	<div>
+		<span id="error_message">
+		</span>
+	</div>
+
+
 	<div class="login">
 
 		<div>
@@ -52,9 +72,6 @@ function login() {
 			<a id="login" class="btn btn-sea width400" onClick="login()">로그인</a>
 		</div>
 
-		<textarea id="error_message">
-		</textarea>
-
 	</div>
 
 
diff --git a/src/web/server/lib/send_reply_json.php b/src/web/server/lib/send_reply_json.php
index a0339bc..39f52e1 100644
--- a/src/web/server/lib/send_reply_json.php
+++ b/src/web/server/lib/send_reply_json.php
@@ -23,6 +23,10 @@ function send_result_success() {
 	$db_conn->close();
 }
 
+function set_error_code($data) {
+	set_data("error_code", $data);
+}
+
 function send_result_fail() {
 	global $jsonReply;
 	global $db_conn;
diff --git a/src/web/server/maestro/login.php b/src/web/server/maestro/login.php
index 18113bd..6b441a8 100644
--- a/src/web/server/maestro/login.php
+++ b/src/web/server/maestro/login.php
@@ -18,6 +18,7 @@ if(!is_numeric($enterCode)) {
 
 $maestro_id = get_maestro_id($maestro_name);
 if($maestro_id === null) {
+	set_error_code("not_registered_id");
 	set_error_message("등록되지 않은 마에스트로 아이디입니다.");
 	send_result_fail();
 	exit;
@@ -25,6 +26,7 @@ if($maestro_id === null) {
 
 $login_data = login($maestro_name, $password);
 if($login_data === null || $login_data[maestroID] === null) {
+	set_error_code("wrong_password");
 	set_error_message("비밀번호가 틀렸습니다.");
 	send_result_fail();
 	exit;