From 807afdc3ffb6565ea8ea7fc602dd75fa79781510 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: Sun, 16 Sep 2018 21:10:36 +0900
Subject: [PATCH] Fix: press enter to search

---
 src/web/admin/admin_expiration_list.html      | 26 +++----
 src/web/admin/admin_register_list.html        | 35 +++++----
 src/web/admin/admin_upgrade_list.html         | 75 ++++++++++++-------
 .../module/maestro_section_add_player.html    |  6 ++
 src/web/module/maestro_section_login.html     |  4 +-
 src/web/module/maestro_section_search.html    | 13 +++-
 6 files changed, 97 insertions(+), 62 deletions(-)

diff --git a/src/web/admin/admin_expiration_list.html b/src/web/admin/admin_expiration_list.html
index 8bd9366..e35a4d6 100644
--- a/src/web/admin/admin_expiration_list.html
+++ b/src/web/admin/admin_expiration_list.html
@@ -30,26 +30,22 @@
 		<div id="message_box"></div>
 
 		<div class="row mx-1">
-			<div class="col-4">
+			<div class="col">
 				<h5 class="my-3">마에스트로 검색</h5>
-				<form class="mx-2">
-					<div class="form-group row">
-						<label for="search_name" class="col-sm-5 col-form-label">마에스트로 아이디</label>
-						<div class="col-sm-7">
-							<input type="text" class="form-control" id="search_name" placeholder="이름 입력">
-							<!-- <small class="form-text text-muted">1~8 글자 / [ 한글,영문,숫자,-,_ ]</small> -->
-						</div>
+				<div class="input-group mb-3">
+					<div class="input-group-prepend">
+						<label class="input-group-text" for="search_name">마에스트로 아이디</label>
 					</div>
-
-					<div class="form-group row">
-						<div class="offset-sm-3 col-sm-9 mt-3">
-							<button type="button" class="col-sm-7 btn btn-primary btn-lg" onClick="searchMaestroUpgrade()">검색</button>
-						</div>
+					<input type="text" class="form-control" id="search_name" placeholder="Input maestro ID here" aria-label="Recipient's username" aria-describedby="basic-addon2">
+					<div class="input-group-append">
+						<button type="button" class="btn btn-primary">검색 실행</button>
 					</div>
-				</form>
+				</div>
 			</div>
+		</div>
 
-			<div class="col-8 border border-warning rounded" style="background-color: #ffeab6">
+		<div class="row mx-1">
+			<div class="col border border-warning rounded" style="background-color: #ffeab6">
 				<h5 class="my-3">검색 결과</h5>
 
 				<form id="search_player_list">
diff --git a/src/web/admin/admin_register_list.html b/src/web/admin/admin_register_list.html
index d8be8dc..80542ef 100644
--- a/src/web/admin/admin_register_list.html
+++ b/src/web/admin/admin_register_list.html
@@ -13,14 +13,20 @@
 	<script type="text/javascript" src="./../js/lib/account_info.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function() {
+			$("#search_name").keydown(function(key) {
+				if(key.keyCode == 13) {
+					searchMaestro();
+				}
+			});
+
 			$("#header").load("admin_header.html");
 
 			loadMaestroList("");
-
 		});
 
 		function searchMaestro() {
 			var maestroName = $("#search_name").val();
+			console.log("searchMaestro : " + maestroName);
 
 			if(maestroName.length === 0) {
 				showErrorMessage("검색할 마에스트로 아이디를 입력하세요.", "error");
@@ -122,26 +128,23 @@
 		<div id="message_box"></div>
 
 		<div class="row mx-1">
-			<div class="col-4">
+			<div class="col">
 				<h5 class="my-3">마에스트로 검색</h5>
-				<form class="mx-2">
-					<div class="form-group row">
-						<label for="search_name" class="col-sm-5 col-form-label">마에스트로 아이디</label>
-						<div class="col-sm-7">
-							<input type="text" class="form-control" id="search_name" placeholder="이름 입력">
-							<!-- <small class="form-text text-muted">1~8 글자 / [ 한글,영문,숫자,-,_ ]</small> -->
-						</div>
-					</div>
 
-					<div class="form-group row">
-						<div class="offset-sm-3 col-sm-9 mt-3">
-							<button type="button" class="col-sm-7 btn btn-primary btn-lg" onClick="searchMaestro()">검색</button>
-						</div>
+				<div class="input-group mb-3">
+					<div class="input-group-prepend">
+						<label class="input-group-text" for="search_name">마에스트로 아이디</label>
 					</div>
-				</form>
+					<input type="text" class="form-control" id="search_name" placeholder="Input maestro ID here" aria-label="Recipient's username" aria-describedby="basic-addon2">
+					<div class="input-group-append">
+						<button type="button" class="btn btn-primary" onClick="searchMaestro()">검색 실행</button>
+					</div>
+				</div>
 			</div>
+		</div>
 
-			<div class="col-8 border border-warning rounded" style="background-color: #ffeab6">
+		<div class="row mx-1">
+			<div class="col border border-warning rounded" style="background-color: #ffeab6">
 				<h5 class="my-3">검색 결과</h5>
 
 				<form id="search_player_list">
diff --git a/src/web/admin/admin_upgrade_list.html b/src/web/admin/admin_upgrade_list.html
index 8f2787f..faede54 100644
--- a/src/web/admin/admin_upgrade_list.html
+++ b/src/web/admin/admin_upgrade_list.html
@@ -15,6 +15,12 @@
 	<script type="text/javascript">
 
 		$(document).ready(function() {
+			$("#search_name").keydown(function(key) {
+				if(key.keyCode == 13) {
+					searchMaestroUpgrade();
+				}
+			});
+
 			$("#header").load("admin_header.html");
 
 			loadMaestroUpgradeList("");
@@ -56,19 +62,35 @@
 			}
 
 			for(var i = 0; i < jsonList.length; i++) {
-				$("#maestro_list_result_contents").append(
-					"<div class='form-group player-list row mx-2 mb-1'>"
-					+ "	<input type='text' class='maestro_upgrade_id d-none' disabled value='" + jsonList[i].maestroUpgradeID + "'>"
-					+ "	<input type='text' class='maestro_id d-none' disabled value='" + jsonList[i].maestroID + "'>"
-					+ "	<input type='text' class='col-sm' disabled value='" + jsonList[i].maestroName + "'>"
-					+ "	<input type='text' class='col-sm' disabled value='" + accoutType(jsonList[i].registeredAccountType) + "'>"
-					+ "	<input type='text' class='new_account_type col-sm' disabled value='" + accoutType(jsonList[i].requestedAccountType) + "'>"
-					+ "	<input type='text' class='col-sm' disabled value='" + NumberUtil.numberWithCommas(price(jsonList[i].requestedAccountType, jsonList[i].registeredAccountType)) + "'>"
-					+ "	<input type='text' class='col-sm' disabled value='" + jsonList[i].requestedDateTime + "'>"
-					// + "	<input type='text' class='col-sm' disabled value='" + status(jsonList[i].status) + "'>"
-					+ "	<input type='button' class='col-sm-1' value='↑' onClick='upgrade(this)'>"
-					+ "</div>"
-				);
+				if(jsonList[i].status == 1) {
+					$("#maestro_list_result_contents").append(
+						"<div class='form-group player-list row mx-2 mb-1'>"
+						+ "	<input type='text' class='maestro_upgrade_id d-none' disabled value='" + jsonList[i].maestroUpgradeID + "'>"
+						+ "	<input type='text' class='maestro_id d-none' disabled value='" + jsonList[i].maestroID + "'>"
+						+ "	<input type='text' class='col-sm' disabled value='" + jsonList[i].maestroName + "'>"
+						+ "	<input type='text' class='col-sm' disabled value='" + accoutType(jsonList[i].registeredAccountType) + "'>"
+						+ "	<input type='text' class='new_account_type col-sm' disabled value='" + accoutType(jsonList[i].requestedAccountType) + "'>"
+						+ "	<input type='text' class='col-sm' disabled value='" + NumberUtil.numberWithCommas(price(jsonList[i].requestedAccountType, jsonList[i].registeredAccountType)) + "'>"
+						+ "	<input type='text' class='col-sm' disabled value='" + jsonList[i].requestedDateTime + "'>"
+						+ "	<input type='text' class='col-sm' disabled value='" + status(jsonList[i].status) + "'>"
+						+ "	<input type='button' class='col-sm-1' value='↑' onClick='upgrade(this)'>"
+						+ "</div>"
+					);
+				} else {
+					$("#maestro_list_result_contents").append(
+						"<div class='form-group player-list row mx-2 mb-1'>"
+						+ "	<input type='text' class='maestro_upgrade_id d-none' disabled value='" + jsonList[i].maestroUpgradeID + "'>"
+						+ "	<input type='text' class='maestro_id d-none' disabled value='" + jsonList[i].maestroID + "'>"
+						+ "	<input type='text' class='col-sm text-success' disabled value='" + jsonList[i].maestroName + "'>"
+						+ "	<input type='text' class='col-sm text-success' disabled value='" + accoutType(jsonList[i].registeredAccountType) + "'>"
+						+ "	<input type='text' class='new_account_type col-sm text-success' disabled value='" + accoutType(jsonList[i].requestedAccountType) + "'>"
+						+ "	<input type='text' class='col-sm text-success' disabled value='" + NumberUtil.numberWithCommas(price(jsonList[i].requestedAccountType, jsonList[i].registeredAccountType)) + "'>"
+						+ "	<input type='text' class='col-sm text-success' disabled value='" + jsonList[i].requestedDateTime + "'>"
+						+ "	<input type='text' class='col-sm text-success' disabled value='" + status(jsonList[i].status) + "'>"
+						+ "	<input type='button' class='col-sm-1' disabled value='Ω' onClick='upgrade(this)'>"
+						+ "</div>"
+					);
+				}
 			}
 		}
 
@@ -150,26 +172,22 @@
 		<div id="message_box"></div>
 
 		<div class="row mx-1">
-			<div class="col-4">
+			<div class="col">
 				<h5 class="my-3">마에스트로 검색</h5>
-				<form class="mx-2">
-					<div class="form-group row">
-						<label for="search_name" class="col-sm-5 col-form-label">마에스트로 아이디</label>
-						<div class="col-sm-7">
-							<input type="text" class="form-control" id="search_name" placeholder="이름 입력">
-							<!-- <small class="form-text text-muted">1~8 글자 / [ 한글,영문,숫자,-,_ ]</small> -->
-						</div>
+				<div class="input-group mb-3">
+					<div class="input-group-prepend">
+						<label class="input-group-text" for="search_name">마에스트로 아이디</label>
 					</div>
-
-					<div class="form-group row">
-						<div class="offset-sm-3 col-sm-9 mt-3">
-							<button type="button" class="col-sm-7 btn btn-primary btn-lg" onClick="searchMaestroUpgrade()">검색</button>
-						</div>
+					<input type="text" class="form-control" id="search_name" placeholder="Input maestro ID here" aria-label="Recipient's username" aria-describedby="basic-addon2">
+					<div class="input-group-append">
+						<button type="button" class="btn btn-primary" onClick="searchMaestroUpgrade()">검색 실행</button>
 					</div>
-				</form>
+				</div>
 			</div>
+		</div>
 
-			<div class="col-8 border border-warning rounded" style="background-color: #ffeab6">
+		<div class="row mx-1">
+			<div class="col border border-warning rounded" style="background-color: #ffeab6">
 				<h5 class="my-3">검색 결과</h5>
 
 				<form id="search_player_list">
@@ -180,6 +198,7 @@
 						<label class="col-form-label col-sm text-center">업그레이드</label>
 						<label class="col-form-label col-sm text-center">추가 금액</label>
 						<label class="col-form-label col-sm text-center">요청 날짜</label>
+						<label class="col-form-label col-sm text-center">상태</label>
 						<label class="col-form-label col-sm-1 text-center"></label>
 					</div>
 					<div id="maestro_list_result_contents"></div>
diff --git a/src/web/module/maestro_section_add_player.html b/src/web/module/maestro_section_add_player.html
index 1683a88..de8d505 100644
--- a/src/web/module/maestro_section_add_player.html
+++ b/src/web/module/maestro_section_add_player.html
@@ -1,6 +1,12 @@
 <script type="text/javascript">
 
 $(document).ready(function() {
+	$("#entercode").keydown(function(key) {
+		if(key.keyCode == 13) {
+			addPlayer();
+		}
+	});
+
 	addPlayerListManager = new PlayerListManager(
 		$("#add_player_list"),
 		// $(".pagination")
diff --git a/src/web/module/maestro_section_login.html b/src/web/module/maestro_section_login.html
index b219fa6..6ac08fa 100644
--- a/src/web/module/maestro_section_login.html
+++ b/src/web/module/maestro_section_login.html
@@ -3,8 +3,8 @@
 $(document).ready(function() {
 	$("#maestro_name").focus();
 
-	$("#password").keyup(function(e) {
-		if(e.keyCode == 13)
+	$("#password").keydown(function(key) {
+		if(key.keyCode == 13)
 			login();
 	})
 });
diff --git a/src/web/module/maestro_section_search.html b/src/web/module/maestro_section_search.html
index b5813bd..afe24cc 100644
--- a/src/web/module/maestro_section_search.html
+++ b/src/web/module/maestro_section_search.html
@@ -1,6 +1,17 @@
 <script type="text/javascript">
 
 $(document).ready(function() {
+	$("#search_name").keydown(function(key) {
+		if(key.keyCode == 13) {
+			searchPlayer();
+		}
+	});
+
+	$("input[id=search_name]").keydown(function(key) {
+		if(key.keyCode == 13)
+			searchPlayer();
+	});
+
 	searchPlayerListManager = new PlayerListManager(
 		$("#search_player_list"),
 		// $(".pagination")
@@ -29,7 +40,7 @@ function searchPlayer() {
 	<div class="col-5">
 		<h5 class="my-3">학생 검색</h5>
 
-		<form class="mx-2">
+		<form class="mx-2" onsubmit="return false">
 			<div class="form-group row">
 				<label for="search_name" class="col-sm-3 col-form-label">이름</label>
 				<div class="col-sm-9">