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

Fix: modify table contents

Browse Source
This commit is contained in:
Jisang Park
2019-04-17 10:06:33 +09:00
parent 5ff2c8b2f2
commit 0952a876da
7 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web/admin/admin_all_list.html
+13 -8
View File
@@ -97,14 +97,18 @@
var statusColorClass = accountStatusColorClass(status);
var type = accountType(jsonList[i].accountType);
var registerDate = jsonList[i].acceptClausesDateTime.substring(0, 10);
var availableDate = jsonList[i].availableActivateDateTime.substring(0, 10);
if(availableDate.charAt(0) == '0')
availableDate = "";
$("#maestro_list_result_contents").append(
"<div class='form-group player-list row mx-2 mb-1'>"
+ " <input type='text' class='maestro_id d-none' value='" + jsonList[i].maestroID + "'>"
+ " <input type='text' class='col-sm-1 text-left" + statusColorClass + "' value='" + status + "'>"
+ " <input type='text' class='col-sm' value='" + jsonList[i].maestroName + "'>"
+ " <input type='text' class='col-sm' value='" + type + "'>"
+ " <input type='text' class='col-sm' value='" + registerDate + "'>"
+ " <input type='text' class='col-sm-1 text-right" + statusColorClass + "' value='" + status + "'>"
+ " <input type='text' class='col-sm text-left' value='" + jsonList[i].maestroName + "'>"
+ " <input type='text' class='col-sm text-right' value='" + type + "'>"
+ " <input type='text' class='col-sm text-right' value='" + registerDate + "'>"
+ " <input type='text' class='col-sm text-right' value='" + availableDate + "'>"
+ " <input type='text' class='col-sm-1 text-right' value='" + jsonList[i].playerCount + "'>"
+ " <input type='button' class='col-sm-1' disabled value='-' onClick=';'>"
+ "</div>"
@@ -183,10 +187,11 @@
<div class="form-group row mx-2 mb-0 font-weight-bold">
<label class="col-form-label col-sm-1 text-center">타입</label>
<label class="col-form-label d-none">ID</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 text-left">마에스트로 아이디</label>
<label class="col-form-label col-sm text-right">요금제</label>
<label class="col-form-label col-sm text-right">등록일</label>
<label class="col-form-label col-sm text-right">유효기간</label>
<label class="col-form-label col-sm-1 text-right">학생수</label>
<label class="col-form-label col-sm-1 text-center">비활성화</label>
</div>
<div id="maestro_list_result_contents"></div>
src/web/admin/admin_header.html
+4 -4
View File
@@ -35,10 +35,10 @@
</div>
<div class="eyebrow ml-auto mt-0 d-md-flex align-items-center">
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_all_list.html">전체 목록</a>
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_register_list.html">등록 목록</a>
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_upgrade_list.html">업그레이드 목록</a>
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_expiration_list.html">계정 만료 목록</a>
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_all_list.html">전체</a>
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_register_list.html">신규 등록</a>
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_upgrade_list.html">업그레이드</a>
<a class="btn btn-outline-warning btn-lg mr-2" href="./../admin/admin_expiration_list.html">계정 만료</a>
<a class="btn btn-primary btn-lg" href="./../admin/admin_send_email.html">이메일 발송</a>
</div>
src/web/admin/admin_register_list.html
+5 -5
View File
@@ -96,8 +96,8 @@
"<div class='form-group player-list row mx-2 mb-1'>"
+ " <input type='text' class='maestro_id d-none' value='" + jsonList[i].maestroID + "'>"
+ " <input type='text' class='col-sm' value='" + jsonList[i].maestroName + "'>"
+ " <input type='text' class='col-sm' value='" + accountType(jsonList[i].accountType) + "'>"
+ " <input type='text' class='col-sm' value='" + jsonList[i].acceptClausesDateTime.substring(0, 10) + "'>"
+ " <input type='text' class='col-sm text-right' value='" + accountType(jsonList[i].accountType) + "'>"
+ " <input type='text' class='col-sm text-right' value='" + jsonList[i].acceptClausesDateTime.substring(0, 10) + "'>"
+ " <input type='button' class='col-sm-1' value='+' onClick='register(this)'>"
+ " <input type='button' class='col-sm-1' disabled value='-'>"
+ "</div>"
@@ -175,9 +175,9 @@
<form id="search_player_list">
<div class="form-group row mx-2 mb-0 font-weight-bold">
<label class="col-form-label d-none">ID</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-left">마에스트로 아이디</label>
<label class="col-form-label col-sm text-right">요금제</label>
<label class="col-form-label col-sm text-right">등록일</label>
<label class="col-form-label col-sm-1 text-center">승인</label>
<label class="col-form-label col-sm-1 text-center">삭제</label>
</div>
src/web/admin/admin_upgrade_list.html
+16 -13
View File
@@ -91,10 +91,11 @@
+ " <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='registered_account_type col-sm' disabled value='" + accountType(jsonList[i].registeredAccountType) + "'>"
+ " <input type='text' class='new_account_type col-sm' disabled value='" + accountType(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='registered_account_type col-sm text-right' disabled value='" + accountType(jsonList[i].registeredAccountType) + "'>"
+ " <input type='text' class='col-sm text-right' disabled value='" + jsonList[i].availableActivateDateTime.substring(0, 10) + "'>"
+ " <input type='text' class='new_account_type col-sm text-right' disabled value='" + accountType(jsonList[i].requestedAccountType) + "'>"
+ " <input type='text' class='col-sm text-right' disabled value='" + jsonList[i].requestedDateTime.substring(0, 10) + "'>"
+ " <input type='text' class='col-sm text-right' 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='button' class='col-sm-1' value='↑' onClick='upgrade(this)'>"
+ "</div>"
@@ -105,10 +106,11 @@
+ " <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='registered_account_type col-sm text-success' disabled value='" + accountType(jsonList[i].registeredAccountType) + "'>"
+ " <input type='text' class='new_account_type col-sm text-success' disabled value='" + accountType(jsonList[i].requestedAccountType) + "'>"
+ " <input type='text' class='registered_account_type col-sm text-right text-success' disabled value='" + accountType(jsonList[i].registeredAccountType) + "'>"
+ " <input type='text' class='col-sm text-right' disabled value='" + jsonList[i].availableActivateDateTime.substring(0, 10) + "'>"
+ " <input type='text' class='new_account_type col-sm text-right text-success' disabled value='" + accountType(jsonList[i].requestedAccountType) + "'>"
+ " <input type='text' class='col-sm text-success text-right' disabled value='" + jsonList[i].requestedDateTime.substring(0, 10) + "'>"
+ " <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>"
@@ -221,12 +223,13 @@
<form id="search_player_list">
<div class="form-group row mx-2 mb-0 font-weight-bold">
<label class="col-form-label d-none">Upgrade ID</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 text-left">아이디</label>
<label class="col-form-label col-sm text-right">현 요금제</label>
<label class="col-form-label col-sm text-right">유효기간</label>
<label class="col-form-label col-sm text-right">Upg 요금제</label>
<label class="col-form-label col-sm text-right">Upg 신청일</label>
<label class="col-form-label col-sm text-right">추가 금액</label>
<label class="col-form-label col-sm text-left">상태</label>
<label class="col-form-label col-sm-1 text-center">승인</label>
</div>
<div id="maestro_list_result_contents"></div>
src/web/js/lib/account_info.js
+4
View File
@@ -35,6 +35,10 @@ function accountType(accountType) {
case 5:
return "1,000명 (5만원)";
case 100:
case 101:
return "해당없음";
}
return accountType + "? (N/A)";
src/web/server/admin/maestro_all_list.php
+3 -2
View File
@@ -29,7 +29,7 @@ function get_maestro_list() {
global $db_conn;
$query = "
SELECT MaestroID, Name, AccountType, ActivateStatus, AcceptClausesDateTime, PlayerCount
SELECT MaestroID, Name, AccountType, ActivateStatus, AvailableActivateDateTime, AcceptClausesDateTime, PlayerCount
FROM maestro
ORDER BY MaestroID DESC
";
@@ -37,7 +37,7 @@ function get_maestro_list() {
// $stmt->bind_param("iii", $maestroID, $startNo, $endNo);
// $stmt->bind_param("ii", $maestroName, $startNo);
$stmt->execute();
$stmt->bind_result($maestroID, $name, $accountType, $activateStatus, $acceptClausesDateTime, $playerCount);
$stmt->bind_result($maestroID, $name, $accountType, $activateStatus, $availableActivateDateTime , $acceptClausesDateTime, $playerCount);
$maestroList = array();
while($stmt->fetch()) {
@@ -45,6 +45,7 @@ function get_maestro_list() {
$maestro["maestroName"] = $name;
$maestro["accountType"] = $accountType;
$maestro["activateStatus"] = $activateStatus;
$maestro["availableActivateDateTime"] = $availableActivateDateTime;
$maestro["acceptClausesDateTime"] = $acceptClausesDateTime;
$maestro["playerCount"] = $playerCount;
array_push($maestroList, $maestro);
src/web/server/admin/maestro_upgrade_list.php
+6 -4
View File
@@ -29,7 +29,7 @@ function get_maestro_upgrade_list() {
global $db_conn;
$query = "
SELECT U.MaestroUpgradeID, U.MaestroID, M.Name, U.RegisteredAccountType, U.RequestedAccountType, U.RequestedDateTime, U.Status
SELECT U.MaestroUpgradeID, U.MaestroID, M.Name, U.RegisteredAccountType, U.RequestedAccountType, U.RequestedDateTime, M.AvailableActivateDateTime, U.Status
FROM maestro_upgrade U, maestro M
WHERE U.Status < 2 AND U.MaestroID = M.MaestroID
ORDER BY U.MaestroUpgradeID DESC
@@ -38,7 +38,7 @@ function get_maestro_upgrade_list() {
// $stmt->bind_param("iii", $maestroID, $startNo, $endNo);
// $stmt->bind_param("ii", $maestroName, $startNo);
$stmt->execute();
$stmt->bind_result($maestroUpgradeID, $maestroID, $maestroName, $registeredAccountType, $requestedAccountType, $requestedDateTime, $status);
$stmt->bind_result($maestroUpgradeID, $maestroID, $maestroName, $registeredAccountType, $requestedAccountType, $requestedDateTime, $availableActivateDateTime, $status);
$maestroUpgradeList = array();
while($stmt->fetch()) {
@@ -48,6 +48,7 @@ function get_maestro_upgrade_list() {
$maestro["registeredAccountType"] = $registeredAccountType;
$maestro["requestedAccountType"] = $requestedAccountType;
$maestro["requestedDateTime"] = $requestedDateTime;
$maestro["availableActivateDateTime"] = $availableActivateDateTime;
$maestro["status"] = $status;
array_push($maestroUpgradeList, $maestro);
}
@@ -59,7 +60,7 @@ function get_maestro_update_list_by_name($searchMaestroName) {
global $db_conn;
$query = "
SELECT U.MaestroUpgradeID, U.MaestroID, M.Name, U.RegisteredAccountType, U.RequestedAccountType, U.RequestedDateTime, U.Status
SELECT U.MaestroUpgradeID, U.MaestroID, M.Name, U.RegisteredAccountType, U.RequestedAccountType, U.RequestedDateTime, M.AvailableActivateDateTime, U.Status
FROM maestro_upgrade U, maestro M
WHERE M.Name LIKE CONCAT('%', ?, '%') AND U.MaestroID = M.MaestroID
ORDER BY U.MaestroUpgradeID DESC
@@ -67,7 +68,7 @@ function get_maestro_update_list_by_name($searchMaestroName) {
$stmt = $db_conn->prepare($query);
$stmt->bind_param("s", $searchMaestroName);
$stmt->execute();
$stmt->bind_result($maestroUpgradeID, $maestroID, $maestroName, $registeredAccountType, $requestedAccountType, $requestedDateTime, $status);
$stmt->bind_result($maestroUpgradeID, $maestroID, $maestroName, $registeredAccountType, $requestedAccountType, $requestedDateTime, $availableActivateDateTime, $status);
$maestroUpgradeList = array();
while($stmt->fetch()) {
@@ -77,6 +78,7 @@ function get_maestro_update_list_by_name($searchMaestroName) {
$maestro["registeredAccountType"] = $registeredAccountType;
$maestro["requestedAccountType"] = $requestedAccountType;
$maestro["requestedDateTime"] = $requestedDateTime;
$maestro["availableActivateDateTime"] = $availableActivateDateTime;
$maestro["status"] = $status;
array_push($maestroUpgradeList, $maestro);
}