From 7d5d038a9e267461780e2ac29afdbc2944879d5e Mon Sep 17 00:00:00 2001
From: m-shimizu <26-m-e-stella-tecnica@it-college.jp>
Date: Wed, 21 Oct 2026 14:27:40 +0900
Subject: [PATCH] FR-09

---
 .../templates/employeeRegistComplete.html     |  40 ++----
 .../templates/employeeRegistConfirm.html      |  79 +++++++++++
 .../templates/employeeRegistConfrim.html      |  95 -------------
 .../templates/employeeRegistInput.html        | 126 +++++++-----------
 4 files changed, 133 insertions(+), 207 deletions(-)
 create mode 100644 book-rent/src/main/resources/templates/employeeRegistConfirm.html
 delete mode 100644 book-rent/src/main/resources/templates/employeeRegistConfrim.html

diff --git a/book-rent/src/main/resources/templates/employeeRegistComplete.html b/book-rent/src/main/resources/templates/employeeRegistComplete.html
index 4de5730..ac13d6c 100644
--- a/book-rent/src/main/resources/templates/employeeRegistComplete.html
+++ b/book-rent/src/main/resources/templates/employeeRegistComplete.html
@@ -4,41 +4,17 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>社員登録完了画面</title>
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <style>
-        .complete-container {
-            width: 420px;
-            min-height: 140px;
-            margin: 50px auto;
-            padding: 20px;
-            border: 1px solid #ccc;
-            background-color: #eaf7f8;
-        }
-        .header {
-            display: flex;
-            justify-content: flex-end;
-            margin-bottom: 25px;
-        }
-        .message {
-            margin: 20px 0;
-        }
-        .back-link {
-            margin-top: 25px;
-            font-size: 13px;
-        }
-    </style>
+    <link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 <body>
+    <!-- 共通ヘッダー -->
+    <div th:replace="~{fragments/header :: header}"></div>
     <main class="complete-container">
-        <div class="header">
-            <form th:action="@{/logout}" method="post">
-                <button type="submit">ログアウト</button>
-            </form>
-        </div>
-        <p class="message">社員登録が完了しました。</p>
-        <div class="back-link">
-            <a th:href="@{/menu}">メニューに戻る</a>
-        </div>
+        <h2>社員登録完了</h2>
+        <p th:text="${message != null ? message : '社員登録が完了しました。'}">
+            社員登録が完了しました。
+        </p>
+        <a th:href="@{/menu}">メニューへ戻る</a>
     </main>
 </body>
 </html>
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/employeeRegistConfirm.html b/book-rent/src/main/resources/templates/employeeRegistConfirm.html
new file mode 100644
index 0000000..865f6c6
--- /dev/null
+++ b/book-rent/src/main/resources/templates/employeeRegistConfirm.html
@@ -0,0 +1,79 @@
+<!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}">
+</head>
+<body>
+    <!-- 共通ヘッダー -->
+    <div th:replace="~{fragments/header :: header}"></div>
+    <main>
+        <h1>社員登録確認</h1>
+        <!-- エラーメッセージ -->
+        <div class="error"
+             th:if="${errors != null and !errors.isEmpty()}">
+            <p th:each="error : ${errors}"
+               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>
+                </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">
+                    <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>
+            </form>
+        </div>
+    </main>
+</body>
+</html>
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/employeeRegistConfrim.html b/book-rent/src/main/resources/templates/employeeRegistConfrim.html
deleted file mode 100644
index 1e8dd6e..0000000
--- a/book-rent/src/main/resources/templates/employeeRegistConfrim.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!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/all.css}">
-    <style>
-        .register-container {
-            width: 420px;
-            margin: 50px auto;
-            padding: 20px;
-            border: 1px solid #ccc;
-            background-color: #eaf7f8;
-        }
-        .header {
-            display: flex;
-            justify-content: flex-end;
-            margin-bottom: 25px;
-        }
-        .form-row {
-            display: flex;
-            align-items: center;
-            margin-bottom: 10px;
-        }
-        .form-row label {
-            width: 130px;
-            font-size: 13px;
-        }
-        .form-row span {
-            font-size: 13px;
-            overflow-wrap: anywhere;
-        }
-        .role-row {
-            margin: 18px 0;
-            font-size: 13px;
-        }
-        .actions {
-            text-align: right;
-            margin: 20px 45px 10px 0;
-        }
-        .back-link {
-            margin-top: 25px;
-            font-size: 13px;
-        }
-    </style>
-</head>
-<body>
-    <main class="register-container">
-        <div class="header">
-            <form th:action="@{/logout}" method="post">
-                <button type="submit">ログアウト</button>
-            </form>
-        </div>
-        <h2>社員登録確認</h2>
-        <form th:action="@{/employees/register/complete}" method="post">
-            <div class="form-row">
-                <label>社員名</label>
-                <span th:text="${nmEmployee}"></span>
-                <input type="hidden" name="nmEmployee"
-                       th:value="${nmEmployee}">
-            </div>
-            <div class="form-row">
-                <label>社員名よみ</label>
-                <span th:text="${knEmployee}"></span>
-                <input type="hidden" name="knEmployee"
-                       th:value="${knEmployee}">
-            </div>
-            <div class="form-row">
-                <label>メールアドレス</label>
-                <span th:text="${mailAddress}"></span>
-                <input type="hidden" name="mailAddress"
-                       th:value="${mailAddress}">
-            </div>
-            <div class="form-row">
-                <label>パスワード</label>
-                <span>********</span>
-                <input type="hidden" name="password"
-                       th:value="${password}">
-            </div>
-            <div class="role-row">
-                <span th:text="${role}"></span>
-                <input type="hidden" name="role"
-                       th:value="${role}">
-            </div>
-            <div class="actions">
-                <button type="submit">登録</button>
-            </div>
-        </form>
-        <div class="back-link">
-            <a th:href="@{/employees/register}">社員情報入力に戻る</a>
-        </div>
-    </main>
-</body>
-</html>
diff --git a/book-rent/src/main/resources/templates/employeeRegistInput.html b/book-rent/src/main/resources/templates/employeeRegistInput.html
index 635bf26..d59be27 100644
--- a/book-rent/src/main/resources/templates/employeeRegistInput.html
+++ b/book-rent/src/main/resources/templates/employeeRegistInput.html
@@ -3,101 +3,67 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>社員登録入力画面</title>
-    <link rel="stylesheet" th:href="@{/css/all.css}">
-    <style>
-        .register-container {
-            width: 420px;
-            margin: 50px auto;
-            padding: 20px;
-            border: 1px solid #ccc;
-            background-color: #eaf7f8;
-        }
-        .header {
-            display: flex;
-            justify-content: flex-end;
-            margin-bottom: 25px;
-        }
-        .form-row {
-            display: flex;
-            align-items: center;
-            margin-bottom: 10px;
-        }
-        .form-row label {
-            width: 130px;
-            font-size: 13px;
-        }
-        .form-row input {
-            width: 180px;
-            box-sizing: border-box;
-        }
-        .role-row {
-            margin: 18px 0;
-            font-size: 13px;
-        }
-        .actions {
-            text-align: right;
-            margin: 20px 45px 10px 0;
-        }
-        .back-link {
-            margin-top: 25px;
-            font-size: 13px;
-        }
-    </style>
+    <title>社員登録画面</title>
+    <link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 <body>
-    <main class="register-container">
-        <!-- ログアウト -->
-        <div class="header">
-            <form th:action="@{/logout}" method="post">
-                <button type="submit">ログアウト</button>
-            </form>
-        </div>
+    <!-- 共通ヘッダー -->
+    <div th:replace="~{fragments/header :: header}"></div>
+    <!-- 社員登録入力画面 -->
+    <main>
         <h2>社員登録</h2>
-        <!-- 社員情報入力 -->
-        <form th:action="@{/employees/register/confirm}" method="post">
-            <div class="form-row">
+        <!-- 入力エラー表示 -->
+        <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"
-                       name="nmEmployee" required>
+                <input type="text"
+                       id="nmEmployee"
+                       th:field="*{nmEmployee}">
             </div>
-            <div class="form-row">
+            <div>
                 <label for="knEmployee">社員名よみ</label>
-                <input type="text" id="knEmployee"
-                       name="knEmployee" required>
+                <input type="text"
+                       id="knEmployee"
+                       th:field="*{knEmployee}">
             </div>
-            <div class="form-row">
+            <div>
                 <label for="mailAddress">メールアドレス</label>
-                <input type="email" id="mailAddress"
-                       name="mailAddress" required>
+                <input type="email"
+                       id="mailAddress"
+                       th:field="*{mailAddress}">
             </div>
-            <div class="form-row">
+            <div>
                 <label for="password">パスワード</label>
-                <input type="password" id="password"
-                       name="password" required>
+                <input type="password"
+                       id="password"
+                       th:field="*{password}">
             </div>
-            <!-- 権限選択 -->
-            <div class="role-row">
+            <fieldset>
+                <legend>権限</legend>
                 <label>
-                    <input type="radio" name="role"
-                           value="管理者" required>
+                    <input type="radio"
+                           th:field="*{flgAdmin}"
+                           value="0">
+                    一般
+                </label>
+                <label>
+                    <input type="radio"
+                           th:field="*{flgAdmin}"
+                           value="1">
                     管理者
                 </label>
-                <label>
-                    <input type="radio" name="role"
-                           value="一般ユーザー">
-                    一般ユーザー
-                </label>
-            </div>
-            <!-- 登録確認へ -->
-            <div class="actions">
-                <button type="submit">登録確認</button>
-            </div>
+            </fieldset>
+            <button type="submit">登録確認</button>
         </form>
-        <!-- メニューへ戻る -->
-        <div class="back-link">
-            <a th:href="@{/menu}">メニューへ戻る</a>
-        </div>
+        <a th:href="@{/menu}">メニューへ戻る</a>
     </main>
 </body>
 </html>
\ No newline at end of file