Compare commits
5 Commits
da41c781df
...
m-ozawa
| Author | SHA1 | Date | |
|---|---|---|---|
|
9c591c9ff2 | ||
| 61e89fc36f | |||
| 10182adc6d | |||
|
|
e73b98e76d | ||
|
|
b36bce38e1 |
@@ -30,8 +30,8 @@
|
||||
<td th:text="${r.isbn}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>書籍名</th>
|
||||
<td th:text="${r.nmBook}" style="width: 700px;"></td>
|
||||
<th>書籍名</th>
|
||||
<td th:text="${r.nmBook}" style="width: 700px;"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>出版社</th>
|
||||
@@ -51,30 +51,33 @@
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
<div class="buttonSection" style="margin-top: 20px;">
|
||||
<div class="buttonSection" style="margin-top: 20px;">
|
||||
|
||||
<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post"
|
||||
style="display: inline;">
|
||||
<button type="submit">承認</button>
|
||||
</form>
|
||||
<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post"
|
||||
style="display: inline;">
|
||||
<button type="submit">承認</button>
|
||||
</form>
|
||||
|
||||
|
||||
<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
|
||||
style="display: inline; margin-left: 10px;">
|
||||
<button type="submit" class="sub">却下</button>
|
||||
</form>
|
||||
</div>
|
||||
<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
|
||||
style="display: inline; margin-left: 10px;">
|
||||
<button type="submit" class="sub">却下</button>
|
||||
</form>
|
||||
<a th:href="@{/admin/applications}" style="text-decoration: none; margin-left: 10px;">
|
||||
<button type="button" class="sub">承認待ち一覧に戻る</button>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
|
||||
|
||||
<script>
|
||||
function logoutSubmit() {
|
||||
if (confirm("ログアウトしますか？")) {
|
||||
window.location.href = "/logout";
|
||||
|
||||
|
||||
<script>
|
||||
function logoutSubmit() {
|
||||
if (confirm("ログアウトしますか？")) {
|
||||
window.location.href = "/logout";
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
@@ -1,16 +1,22 @@
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>社員登録確認画面</title>
|
||||
<title>社員登録確認</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<!-- 共通ヘッダー -->
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
|
||||
<main>
|
||||
<h1>社員登録確認</h1>
|
||||
<h2>社員登録確認</h2>
|
||||
|
||||
<!-- エラーメッセージ -->
|
||||
<div class="error"
|
||||
th:if="${errors != null and !errors.isEmpty()}">
|
||||
@@ -18,62 +24,78 @@
|
||||
th:text="${error}">
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- 登録内容確認 -->
|
||||
<div class="card">
|
||||
|
||||
<p>以下の内容で登録します。内容を確認してください。</p>
|
||||
<!-- 登録ボタン -->
|
||||
|
||||
<form th:action="@{/admin/employees/new/execute}"
|
||||
th:object="${form}"
|
||||
method="post">
|
||||
|
||||
<!-- 登録内容一覧 -->
|
||||
<table>
|
||||
<tr>
|
||||
<th>社員名</th>
|
||||
<td th:text="*{nmEmployee}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>社員名よみ</th>
|
||||
<td th:text="*{knEmployee}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>メールアドレス</th>
|
||||
<td th:text="*{mailAddress}"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>パスワード</th>
|
||||
<td>********</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>権限</th>
|
||||
<td th:text="*{flgAdmin == '1' ? '管理者' : '一般'}"></td>
|
||||
</tr>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>社員名</th>
|
||||
<td th:text="*{nmEmployee}"></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>社員名よみ</th>
|
||||
<td th:text="*{knEmployee}"></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>メールアドレス</th>
|
||||
<td th:text="*{mailAddress}"></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>パスワード</th>
|
||||
<td>********</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th>権限</th>
|
||||
<td th:text="*{flgAdmin == '1' ? '管理者' : '一般'}"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!-- 登録処理に必要な値を引き継ぐ -->
|
||||
<input type="hidden" th:field="*{nmEmployee}">
|
||||
<input type="hidden" th:field="*{knEmployee}">
|
||||
<input type="hidden" th:field="*{mailAddress}">
|
||||
<input type="hidden" th:field="*{password}">
|
||||
<input type="hidden" th:field="*{flgAdmin}">
|
||||
<div class="actions">
|
||||
|
||||
<!-- ボタン：左に戻る、右に登録 -->
|
||||
<!-- <div style="display: flex;-->
|
||||
<!-- justify-content: space-between;-->
|
||||
<!-- align-items: center;-->
|
||||
<!-- width: 100%;-->
|
||||
<!-- margin-top: 20px;">-->
|
||||
|
||||
<!-- 社員情報入力に戻る -->
|
||||
<p>
|
||||
<a class="btn sub"
|
||||
th:href="@{/admin/employees/new}">
|
||||
社員情報入力に戻る
|
||||
</a>
|
||||
|
||||
<!-- 登録 -->
|
||||
<button type="submit" class="btn">
|
||||
登録
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
<!-- 入力画面へ戻る -->
|
||||
<form th:action="@{/admin/employees/new/input}"
|
||||
th:object="${form}"
|
||||
method="post">
|
||||
<input type="hidden" th:field="*{nmEmployee}">
|
||||
<input type="hidden" th:field="*{knEmployee}">
|
||||
<input type="hidden" th:field="*{mailAddress}">
|
||||
<input type="hidden" th:field="*{password}">
|
||||
<input type="hidden" th:field="*{flgAdmin}">
|
||||
<div class="back-link">
|
||||
<button type="submit" class="sub">
|
||||
社員情報入力に戻る
|
||||
</button>
|
||||
</div>
|
||||
</p>
|
||||
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</main>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -1,69 +1,117 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>社員登録画面</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>社員登録</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<!-- 共通ヘッダー -->
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<!-- 社員登録入力画面 -->
|
||||
<main>
|
||||
<h2>社員登録</h2>
|
||||
<!-- 入力エラー表示 -->
|
||||
<div th:if="${errors != null and !errors.isEmpty()}">
|
||||
<p th:each="error : ${errors}"
|
||||
th:text="${error}"
|
||||
class="error">
|
||||
</p>
|
||||
</div>
|
||||
<form th:action="@{/admin/employees/new/confirm}"
|
||||
th:object="${form}"
|
||||
method="post">
|
||||
<div>
|
||||
<label for="nmEmployee">社員名</label>
|
||||
<input type="text"
|
||||
id="nmEmployee"
|
||||
th:field="*{nmEmployee}">
|
||||
</div>
|
||||
<div>
|
||||
<label for="knEmployee">社員名よみ</label>
|
||||
<input type="text"
|
||||
id="knEmployee"
|
||||
th:field="*{knEmployee}">
|
||||
</div>
|
||||
<div>
|
||||
<label for="mailAddress">メールアドレス</label>
|
||||
<input type="email"
|
||||
id="mailAddress"
|
||||
th:field="*{mailAddress}">
|
||||
</div>
|
||||
<div>
|
||||
<label for="password">パスワード</label>
|
||||
<input type="password"
|
||||
id="password"
|
||||
th:field="*{password}">
|
||||
</div>
|
||||
<fieldset>
|
||||
<legend>権限</legend>
|
||||
<label>
|
||||
<input type="radio"
|
||||
th:field="*{flgAdmin}"
|
||||
value="0">
|
||||
一般
|
||||
</label>
|
||||
<label>
|
||||
<input type="radio"
|
||||
th:field="*{flgAdmin}"
|
||||
value="1">
|
||||
管理者
|
||||
</label>
|
||||
</fieldset>
|
||||
<button type="submit">登録確認</button>
|
||||
</form>
|
||||
<a th:href="@{/menu}">メニューへ戻る</a>
|
||||
</main>
|
||||
|
||||
<!-- 共通ヘッダー -->
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
|
||||
<main>
|
||||
<h2>社員登録</h2>
|
||||
|
||||
<!-- 入力エラー表示 -->
|
||||
<div class="error" th:if="${errors != null and !errors.isEmpty()}">
|
||||
<p th:each="error : ${errors}" th:text="${error}">
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- 社員登録フォーム -->
|
||||
<div class="card">
|
||||
|
||||
<form th:action="@{/admin/employees/new/confirm}" th:object="${form}" method="post">
|
||||
|
||||
<!-- 社員名 -->
|
||||
<div>
|
||||
<label for="nmEmployee">社員名</label>
|
||||
<input type="text" id="nmEmployee" th:field="*{nmEmployee}">
|
||||
</div>
|
||||
|
||||
<!-- 社員名よみ -->
|
||||
<div>
|
||||
<label for="knEmployee">社員名よみ</label>
|
||||
<input type="text" id="knEmployee" th:field="*{knEmployee}">
|
||||
</div>
|
||||
|
||||
<!-- メールアドレス -->
|
||||
<div>
|
||||
<label for="mailAddress">メールアドレス</label>
|
||||
<input type="email" id="mailAddress" th:field="*{mailAddress}">
|
||||
</div>
|
||||
|
||||
<!-- パスワード -->
|
||||
<div>
|
||||
<label for="password">パスワード</label>
|
||||
<input type="password" id="password" th:field="*{password}">
|
||||
</div>
|
||||
<label for="flgAdmin">管理者フラグ</label>
|
||||
<select id="flgAdmin" name="flgAdmin">
|
||||
<option value="0" th:selected="${form.flgAdmin == '0'}">0：一般</option>
|
||||
<option value="1" th:selected="${form.flgAdmin == '1'}">1：管理者</option>
|
||||
</select>
|
||||
<p><a class="btn sub" th:href="@{/menu}">メニューへ戻る</a>
|
||||
<button type="submit">登録確認</button>
|
||||
</p>
|
||||
|
||||
<!-- 権限：枠線なし・横並び -->
|
||||
<!-- <div style="border: none;-->
|
||||
<!-- display: flex;-->
|
||||
<!-- flex-direction: row;-->
|
||||
<!-- align-items: center;-->
|
||||
<!-- gap: 25px;-->
|
||||
<!-- margin: 15px 0 25px;">-->
|
||||
|
||||
<!-- <label style="display: inline-flex;-->
|
||||
<!-- align-items: center;-->
|
||||
<!-- gap: 5px;-->
|
||||
<!-- white-space: nowrap;">-->
|
||||
<!-- <input type="radio"-->
|
||||
<!-- th:field="*{flgAdmin}"-->
|
||||
<!-- value="1">-->
|
||||
<!-- 管理者-->
|
||||
<!-- </label>-->
|
||||
|
||||
<!-- <label style="display: inline-flex;-->
|
||||
<!-- align-items: center;-->
|
||||
<!-- gap: 5px;-->
|
||||
<!-- white-space: nowrap;">-->
|
||||
<!-- <input type="radio"-->
|
||||
<!-- th:field="*{flgAdmin}"-->
|
||||
<!-- value="0">-->
|
||||
<!-- 一般ユーザー-->
|
||||
<!-- </label>-->
|
||||
|
||||
<!-- </div>-->
|
||||
|
||||
<!-- ボタン：左に戻る・右に確認 -->
|
||||
<!-- <div style="display: flex;-->
|
||||
<!-- justify-content: space-between;-->
|
||||
<!-- align-items: center;-->
|
||||
<!-- width: 100%;-->
|
||||
<!-- margin-top: 20px;">-->
|
||||
|
||||
<!-- <a class="btn sub"-->
|
||||
<!-- th:href="@{/menu}">-->
|
||||
<!-- メニューに戻る-->
|
||||
<!-- </a>-->
|
||||
|
||||
<!-- <button type="submit" class="btn">-->
|
||||
<!-- 確認-->
|
||||
<!-- </button>-->
|
||||
|
||||
<!-- </div>-->
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</main>
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
Reference in New Issue
Block a user