jisangs/chocomae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: press enter to search

Browse Source
This commit is contained in:
Jisang Park
2018-09-16 21:10:36 +09:00
parent cbde6256d6
commit 807afdc3ff
6 changed files with 97 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web/admin/admin_expiration_list.html
+11 -15
View File
@@ -30,26 +30,22 @@
<div id="message_box"></div> <div id="message_box"></div>
<div class="row mx-1"> <div class="row mx-1">
<div class="col-4"> <div class="col">
<h5 class="my-3">마에스트로 검색</h5> <h5 class="my-3">마에스트로 검색</h5>
<form class="mx-2"> <div class="input-group mb-3">
<div class="form-group row"> <div class="input-group-prepend">
<label for="search_name" class="col-sm-5 col-form-label">마에스트로 아이디</label> <label class="input-group-text" for="search_name">마에스트로 아이디</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>
<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="form-group row"> <div class="input-group-append">
<div class="offset-sm-3 col-sm-9 mt-3"> <button type="button" class="btn btn-primary">검색 실행</button>
<button type="button" class="col-sm-7 btn btn-primary btn-lg" onClick="searchMaestroUpgrade()">검색</button>
</div>
</div> </div>
</form> </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> <h5 class="my-3">검색 결과</h5>
<form id="search_player_list"> <form id="search_player_list">
src/web/admin/admin_register_list.html
+19 -16
View File
@@ -13,14 +13,20 @@
<script type="text/javascript" src="./../js/lib/account_info.js"></script> <script type="text/javascript" src="./../js/lib/account_info.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#search_name").keydown(function(key) {
if(key.keyCode == 13) {
searchMaestro();
}
});
$("#header").load("admin_header.html"); $("#header").load("admin_header.html");
loadMaestroList(""); loadMaestroList("");
}); });
function searchMaestro() { function searchMaestro() {
var maestroName = $("#search_name").val(); var maestroName = $("#search_name").val();
console.log("searchMaestro : " + maestroName);
if(maestroName.length === 0) { if(maestroName.length === 0) {
showErrorMessage("검색할 마에스트로 아이디를 입력하세요.", "error"); showErrorMessage("검색할 마에스트로 아이디를 입력하세요.", "error");
@@ -122,26 +128,23 @@
<div id="message_box"></div> <div id="message_box"></div>
<div class="row mx-1"> <div class="row mx-1">
<div class="col-4"> <div class="col">
<h5 class="my-3">마에스트로 검색</h5> <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="input-group mb-3">
<div class="offset-sm-3 col-sm-9 mt-3"> <div class="input-group-prepend">
<button type="button" class="col-sm-7 btn btn-primary btn-lg" onClick="searchMaestro()">검색</button> <label class="input-group-text" for="search_name">마에스트로 아이디</label>
</div>
</div> </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>
<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> <h5 class="my-3">검색 결과</h5>
<form id="search_player_list"> <form id="search_player_list">
src/web/admin/admin_upgrade_list.html
+47 -28
View File
@@ -15,6 +15,12 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#search_name").keydown(function(key) {
if(key.keyCode == 13) {
searchMaestroUpgrade();
}
});
$("#header").load("admin_header.html"); $("#header").load("admin_header.html");
loadMaestroUpgradeList(""); loadMaestroUpgradeList("");
@@ -56,19 +62,35 @@
} }
for(var i = 0; i < jsonList.length; i++) { for(var i = 0; i < jsonList.length; i++) {
$("#maestro_list_result_contents").append( if(jsonList[i].status == 1) {
"<div class='form-group player-list row mx-2 mb-1'>" $("#maestro_list_result_contents").append(
+ " <input type='text' class='maestro_upgrade_id d-none' disabled value='" + jsonList[i].maestroUpgradeID + "'>" "<div class='form-group player-list row mx-2 mb-1'>"
+ " <input type='text' class='maestro_id d-none' disabled value='" + jsonList[i].maestroID + "'>" + " <input type='text' class='maestro_upgrade_id d-none' disabled value='" + jsonList[i].maestroUpgradeID + "'>"
+ " <input type='text' class='col-sm' disabled value='" + jsonList[i].maestroName + "'>" + " <input type='text' class='maestro_id d-none' disabled value='" + jsonList[i].maestroID + "'>"
+ " <input type='text' class='col-sm' disabled value='" + accoutType(jsonList[i].registeredAccountType) + "'>" + " <input type='text' class='col-sm' disabled value='" + jsonList[i].maestroName + "'>"
+ " <input type='text' class='new_account_type col-sm' disabled value='" + accoutType(jsonList[i].requestedAccountType) + "'>" + " <input type='text' class='col-sm' disabled value='" + accoutType(jsonList[i].registeredAccountType) + "'>"
+ " <input type='text' class='col-sm' disabled value='" + NumberUtil.numberWithCommas(price(jsonList[i].requestedAccountType, 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='" + jsonList[i].requestedDateTime + "'>" + " <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='" + status(jsonList[i].status) + "'>" + " <input type='text' class='col-sm' disabled value='" + jsonList[i].requestedDateTime + "'>"
+ " <input type='button' class='col-sm-1' value='↑' onClick='upgrade(this)'>" + " <input type='text' class='col-sm' disabled value='" + status(jsonList[i].status) + "'>"
+ "</div>" + " <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 id="message_box"></div>
<div class="row mx-1"> <div class="row mx-1">
<div class="col-4"> <div class="col">
<h5 class="my-3">마에스트로 검색</h5> <h5 class="my-3">마에스트로 검색</h5>
<form class="mx-2"> <div class="input-group mb-3">
<div class="form-group row"> <div class="input-group-prepend">
<label for="search_name" class="col-sm-5 col-form-label">마에스트로 아이디</label> <label class="input-group-text" for="search_name">마에스트로 아이디</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>
<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="form-group row"> <div class="input-group-append">
<div class="offset-sm-3 col-sm-9 mt-3"> <button type="button" class="btn btn-primary" onClick="searchMaestroUpgrade()">검색 실행</button>
<button type="button" class="col-sm-7 btn btn-primary btn-lg" onClick="searchMaestroUpgrade()">검색</button>
</div>
</div> </div>
</form> </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> <h5 class="my-3">검색 결과</h5>
<form id="search_player_list"> <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 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> <label class="col-form-label col-sm-1 text-center"></label>
</div> </div>
<div id="maestro_list_result_contents"></div> <div id="maestro_list_result_contents"></div>
src/web/module/maestro_section_add_player.html
+6
View File
@@ -1,6 +1,12 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#entercode").keydown(function(key) {
if(key.keyCode == 13) {
addPlayer();
}
});
addPlayerListManager = new PlayerListManager( addPlayerListManager = new PlayerListManager(
$("#add_player_list"), $("#add_player_list"),
// $(".pagination") // $(".pagination")
src/web/module/maestro_section_login.html
+2 -2
View File
@@ -3,8 +3,8 @@
$(document).ready(function() { $(document).ready(function() {
$("#maestro_name").focus(); $("#maestro_name").focus();
$("#password").keyup(function(e) { $("#password").keydown(function(key) {
if(e.keyCode == 13) if(key.keyCode == 13)
login(); login();
}) })
}); });
src/web/module/maestro_section_search.html
+12 -1
View File
@@ -1,6 +1,17 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(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( searchPlayerListManager = new PlayerListManager(
$("#search_player_list"), $("#search_player_list"),
// $(".pagination") // $(".pagination")
@@ -29,7 +40,7 @@ function searchPlayer() {
<div class="col-5"> <div class="col-5">
<h5 class="my-3">학생 검색</h5> <h5 class="my-3">학생 검색</h5>
<form class="mx-2"> <form class="mx-2" onsubmit="return false">
<div class="form-group row"> <div class="form-group row">
<label for="search_name" class="col-sm-3 col-form-label">이름</label> <label for="search_name" class="col-sm-3 col-form-label">이름</label>
<div class="col-sm-9"> <div class="col-sm-9">