登録確認ボタン_配置修正

# Conflicts:
#	book-rent/src/main/resources/templates/employeeUpdateConfirm.html

book-rent/pom.xml

@@ -30,67 +30,54 @@
 	<properties>
 		<java.version>21</java.version>
 	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webmvc</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-devtools</artifactId>
-			<scope>runtime</scope>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.mysql</groupId>
-			<artifactId>mysql-connector-j</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-tomcat</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-validation-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webmvc-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
+ <dependencies>
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-data-jpa</artifactId>
+</dependency>
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-thymeleaf</artifactId>
+</dependency>
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-validation</artifactId>
+</dependency>
+<!-- webmvcから通常のwebスターターに変更 -->
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-web</artifactId>
+</dependency>
+ 
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-devtools</artifactId> <!-- ここを修正 -->
+<scope>runtime</scope>
+<optional>true</optional>
+</dependency>
 
+<dependency>
+<groupId>com.mysql</groupId>
+<artifactId>mysql-connector-j</artifactId>
+<scope>runtime</scope>
+</dependency>
+<dependency>
+<groupId>org.projectlombok</groupId>
+<artifactId>lombok</artifactId>
+<optional>true</optional>
+</dependency>
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-tomcat</artifactId>
+<scope>provided</scope>
+</dependency>
+		
+<dependency>
+<groupId>org.springframework.boot</groupId>
+<artifactId>spring-boot-starter-test</artifactId>
+<scope>test</scope>
+</dependency>
+</dependencies>
 	<build>
 		<plugins>
 			<plugin>
@@ -135,5 +122,6 @@
 			</plugin>
 		</plugins>
 	</build>
-
+ 
 </project>
+

book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java

@@ -101,7 +101,7 @@ public class AdminLoanController {
         try {
             loanService.returnBook(id, admin);
             ra.addFlashAttribute("message", "書籍の返却が完了しました。");
-            return "redirect:/admin/return/complete";
+            return "returnComplete";
         } catch (BusinessException e) {
             ra.addFlashAttribute("errorMessage", e.getMessage());
             return "redirect:/admin/lendings";

book-rent/src/main/java/com/example/demo/controller/LoginController.java

@@ -1,6 +1,6 @@
 package com.example.demo.controller;
-
-
+ 
+ 
 import java.util.Optional;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -15,21 +15,21 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.example.demo.common.Const;
 import com.example.demo.common.LoginUser;
 import com.example.demo.service.AuthService;
-
+ 
 /** AUTH-01：ログイン／ログアウト（login.html） */
 @Controller
 public class LoginController {
     private final AuthService authService;
-
+ 
     public LoginController(AuthService authService) {
         this.authService = authService;
     }
-
+ 
     @GetMapping("/")
     public String root() {
         return "redirect:/menu";
     }
-
+ 
     @GetMapping("/login")
     public String loginForm(HttpSession session) {
         if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) {
@@ -37,14 +37,14 @@ public class LoginController {
         }
         return "login";
     }
-
+ 
     @PostMapping("/login")
     public String login(@RequestParam(defaultValue = "") String mailAddress,
                         @RequestParam(defaultValue = "") String password,
                         HttpServletRequest request, Model model) {
         String mail = mailAddress.trim();
         model.addAttribute("mailAddress", mail);   // 入力値を保持（パスワードは保持しない）
-
+ 
         if (mail.isEmpty() || password.isEmpty()) {
             model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。");
             return "login";
@@ -63,11 +63,10 @@ public class LoginController {
         request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get());
         return "redirect:/menu";
     }
-
+ 
     @PostMapping("/logout")
     public String logout(HttpSession session) {
         session.invalidate();
         return "redirect:/login";
     }
-}
-
+}

book-rent/src/main/java/com/example/demo/controller/MenuController.java

@@ -2,7 +2,7 @@ package com.example.demo.controller;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
-
+ 
 /** メニュー画面（menu.html）。表示内容は管理者フラグで切り替える。 */
 @Controller
 public class MenuController {
@@ -10,4 +10,4 @@ public class MenuController {
     public String menu() {
         return "menu";
     }
-}
+}

book-rent/src/main/java/com/example/demo/form/EmployeeForm.java

@@ -1,33 +1,82 @@
 package com.example.demo.form;
+
 /** 社員登録・編集フォーム */
 public class EmployeeForm {
-    private Integer idEmployee;
-    private String nmEmployee = "";
-    private String knEmployee = "";
-    private String mailAddress = "";
-    private String password = "";
-    private String flgAdmin = "0";
-    private String flgRetirement = "0";
+	private Integer idEmployee;
+	private String nmEmployee = "";
+	private String knEmployee = "";
+	private String mailAddress = "";
+	private String password = "";
+	private String flgAdmin = "0";
+	private String flgRetirement = "0";
 
-    public void trim() {
-        nmEmployee = t(nmEmployee); knEmployee = t(knEmployee); mailAddress = t(mailAddress);
-        flgAdmin = t(flgAdmin); flgRetirement = t(flgRetirement);
-        if (password == null) password = "";
-    }
-    private static String t(String s) { return s == null ? "" : s.trim(); }
+	public void trim() {
+		nmEmployee = t(nmEmployee);
+		knEmployee = t(knEmployee);
+		mailAddress = t(mailAddress);
+		flgAdmin = t(flgAdmin);
+		flgRetirement = t(flgRetirement);
+		if (password == null)
+			password = "";
+	}
 
-    public Integer getIdEmployee() { return idEmployee; }
-    public void setIdEmployee(Integer v) { this.idEmployee = v; }
-    public String getNmEmployee() { return nmEmployee; }
-    public void setNmEmployee(String v) { this.nmEmployee = v; }
-    public String getKnEmployee() { return knEmployee; }
-    public void setKnEmployee(String v) { this.knEmployee = v; }
-    public String getMailAddress() { return mailAddress; }
-    public void setMailAddress(String v) { this.mailAddress = v; }
-    public String getPassword() { return password; }
-    public void setPassword(String v) { this.password = v; }
-    public String getFlgAdmin() { return flgAdmin; }
-    public void setFlgAdmin(String v) { this.flgAdmin = v; }
-    public String getFlgRetirement() { return flgRetirement; }
-    public void setFlgRetirement(String v) { this.flgRetirement = v; }
+	private static String t(String s) {
+		return s == null ? "" : s.trim();
+	}
+
+	public Integer getIdEmployee() {
+		return idEmployee;
+	}
+
+	public void setIdEmployee(Integer v) {
+		this.idEmployee = v;
+	}
+
+	public String getNmEmployee() {
+		return nmEmployee;
+	}
+
+	public void setNmEmployee(String v) {
+		this.nmEmployee = v;
+	}
+
+	public String getKnEmployee() {
+		return knEmployee;
+	}
+
+	public void setKnEmployee(String v) {
+		this.knEmployee = v;
+	}
+
+	public String getMailAddress() {
+		return mailAddress;
+	}
+
+	public void setMailAddress(String v) {
+		this.mailAddress = v;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String v) {
+		this.password = v;
+	}
+
+	public String getFlgAdmin() {
+		return flgAdmin;
+	}
+
+	public void setFlgAdmin(String v) {
+		this.flgAdmin = v;
+	}
+
+	public String getFlgRetirement() {
+		return flgRetirement;
+	}
+
+	public void setFlgRetirement(String v) {
+		this.flgRetirement = v;
+	}
 }

book-rent/src/main/resources/application.properties

@@ -10,4 +10,4 @@ spring.jpa.open-in-view=false
 spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo
  
 spring.thymeleaf.cache=false
-server.servlet.session.timeout=30m
+server.servlet.session.timeout=30m

book-rent/src/main/resources/templates/approvalComplete.html

@@ -4,28 +4,20 @@
 <head>
 	<meta charset="UTF-8">
 	<title>書籍貸出申請</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
-	<h1>
-		　　　
-		<div class="rightSection">
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
-	</h1>
-	<h2>書籍貸出申請を承認しました。</h2>
-
-
-	<form action="returnComplete" method="post" >
-
-		<div class="msgBox error" th:if="${messageError} != null">
-			<span class="error" th:text="${messageError.message}"></span>
-		</div>
-	</form>
-	<a th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
-	<a href="showMenu">メニューに戻る</a>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main class="complete-container">
+	<h1>完了</h1>
+	<div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div>
 
+	<p>
+		<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
+		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+	</p>
+	</main>
 </body>
 
 </html>

book-rent/src/main/resources/templates/approvalConfilm.html

@@ -4,81 +4,82 @@
 <head>
 	<meta charset="UTF-8">
 	<title>書籍貸出承認確認</title>
-
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
-	<h1>
-		書籍貸出承認確認　　　
-		<div class="rightSection">
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main>
+		<h1>書籍貸出承認確認</h1>
+		<div class="card">
+			<table>
+				<tr>
+					<th>申請ID</th>
+					<td th:text="${r.idRequest}"></td>
+				</tr>
+				<tr>
+					<th>申請者名</th>
+					<td th:text="${r.nmApplicant}"></td>
+				</tr>
+				<tr>
+					<th>申請日</th>
+					<td th:text="${r.dateRequest}"></td>
+				</tr>
+				<tr>
+					<th>ISBN</th>
+					<td th:text="${r.isbn}"></td>
+				</tr>
+				<tr>
+					<th>書籍名</th>
+					<td th:text="${r.nmBook}" style="width: 700px;"></td>
+				</tr>
+				<tr>
+					<th>出版社</th>
+					<td th:text="${r.publisher}"></td>
+				</tr>
+				<tr>
+					<th>特記事項</th>
+					<td th:text="${r.note}"></td>
+				</tr>
+				<tr>
+					<th>貸出日</th>
+					<td th:text="${r.dateBorrow}"></td>
+				</tr>
+				<tr>
+					<th>返却予定日</th>
+					<td th:text="${r.dateScheduledReturn}"></td>
+				</tr>
+			</table>
+
+			<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}/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>
+
+
+
+
+			<script>
+				function logoutSubmit() {
+					if (confirm("ログアウトしますか？")) {
+						window.location.href = "/logout";
+					}
+				}
+			</script>
 		</div>
-	</h1>
-
-
-	<table>
-		<tr>
-			<th class="header">申請ID</th>
-			<td><input type="text" readonly="readonly" th:value="${r.idRequest}" /></td>
-		</tr>
-		<tr>
-			<th class="header">申請者名</th>
-			<td><input type="text" readonly="readonly" th:value="${r.nmApplicant}" /></td>
-		</tr>
-		<tr>
-			<th class="header">申請日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateRequest}" /></td>
-		</tr>
-		<tr>
-			<th class="header">ISBN</th>
-			<td><input type="text" readonly="readonly" th:value="${r.isbn}" /></td>
-		</tr>
-		<tr>
-			<th class="header">書籍名</th>
-			<td><input type="text" readonly="readonly" th:value="${r.nmBook}" style="width: 300px;" /></td>
-		</tr>
-		<tr>
-			<th class="header">出版社</th>
-			<td><input type="text" readonly="readonly" th:value="${r.publisher}" /></td>
-		</tr>
-		<tr>
-			<th class="header">特記事項</th>
-			<td><input type="text" readonly="readonly" th:value="${r.note}" /></td>
-		</tr>
-		<tr>
-			<th class="header">貸出日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateBorrow}" /></td>
-		</tr>
-		<tr>
-			<th class="header">返却予定日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateScheduledReturn}" /></td>
-		</tr>
-	</table>
-
-	<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}/reject(id=${r.idRequest})}" method="post"
-			style="display: inline; margin-left: 10px;">
-			<button type="submit">却下</button>
-		</form>
-	</div>
-
-	<br>
-	<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
-
-	<script>
-		function logoutSubmit() {
-			if (confirm("ログアウトしますか？")) {
-				window.location.href = "/logout";
-			}
-		}
-	</script>
+	</main>
 </body>
 
 </html>

book-rent/src/main/resources/templates/approvalRejected.html

@@ -1,31 +1,25 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 
-<head>
-	<meta charset="UTF-8">
-	<title>書籍貸出申請</title>
-</head>
+	<head>
+		<meta charset="UTF-8">
+		<title>書籍貸出申請</title>
+		<link rel="stylesheet" th:href="@{/css/style.css}">
+	</head>
 
-<body>
-	<h1>
-		　　　
-		<div class="rightSection">
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
-	</h1>
-	<h2>書籍貸出申請を却下しました。</h2>
+	<body>
+		<div th:replace="~{fragments/header :: header}"></div>
+		<main class="complete-container">
+		<h1>却下</h1>
+			<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
 
+			<p>
+				<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
+				<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+			</p>
 
-	<form action="returnRejected" method="post">
+		</main>
+	</body>
 
-		<div class="msgBox error" th:if="${messageError} != null">
-			<span class="error" th:text="${messageError.message}"></span>
-		</div>
-	</form>
-	<a th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
-	<a href="showMenu">メニューに戻る</a>
-
-</body>
 
 </html>

book-rent/src/main/resources/templates/bookRegistConfirm.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta charset="UTF-8">
-	<title>書籍登録画面</title>
-	<link rel="stylesheet" th:href="@{/css/style.css}">
-</head>
-
-<body>
-
-	<!-- エラーメッセージ -->
-	<div class="msgBox error" th:if="${messageError != null}">
-		<span class="error" th:text="${messageError.message}"></span>
-
-		<table>
-			<th class="header">ISBN</th>
-				<td><input class="readOnly" name="isbn" readonly="readonly" th:value="*{isbn}" type="text"/></td>
-				<th class="header">書籍名</th>
-				<td>
-					<input class="ReadOnly" name="nm_Book" readonly="readonly" th:value="{nm_Book}" type="text"/>
-				</td>
-				<th class="header">書籍名よみ</th>
-				<td>
-					<input class="ReadOnly" name="kn_Book" readonly="readonly" th:value="{kn_Bool}" type="text"/>
-				</td>
-				<th class="header">出版社</th>
-				<td>
-					<input class="ReadOnly" name="publisher" readonly="readonly" th:value="{publisher}" type="text"/>
-				</td>
-				<th class="header">特記事項</th>
-				<td>
-					<input class="ReadOnly" name="note" readonly="readonly" th:value="{note}" type="text"/>
-				</td>
-
-				<a href="bookRegistComplete.html" class="btn"> 登録</a>
-		</table>
-		<a href="@{/bookRegistInput.html}">書籍情報入力に戻る</a>

book-rent/src/main/resources/templates/bookRegistInput.html

@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-
-<head>
-	<meta charset="UTF-8">
-	<title>書籍登録画面</title>
-	<link rel="stylesheet" th:href="@{/css/style.css}">
-</head>
-
-<body>
-	<form action="bookRegistConfirm" method="post" th:object="${AdminBookController}">
-	<!-- エラーメッセージ -->
-	<div class="msgBox error" th:if="${messageError != null}">
-		<span class="error" th:text="${messageError.message}"></span>
-
-
-			<table>
-				<th class="header">ISBN</th>
-				<td>
-					<input placeholder="ISBN" th:field="*{isbn}" type="text" />
-				</td>
-				<th class="header">書籍名</th>
-				<td>
-					<input placeholder="書籍名" th:field="*{nm_book}" type="text" />
-				</td>
-				<th class="header">書籍名よみ</th>
-				<td>
-					<input placeholder="書籍名よみ" th:field="*{kn_book}" type="text" />
-				</td>
-				<th class="header">出版社</th>
-				<td>
-					<input placeholder="出版社" th:field="*{publisher}" type="text" />
-				</td>
-				<th class="header">特記事項</th>
-				<td>
-					<input placeholder="特記事項" th:field="*{note}" type="text" />
-				</td>
-
-				<a href="bookRegistConfirm" class="btn"> 申請確認</a>
-			</table>
-			<a href="@{/bookList.html}">書籍一覧に戻る</a>
-</body>
-
-</html>

book-rent/src/main/resources/templates/complete.html

@@ -12,7 +12,7 @@
   <div class="info" th:text="${message} ?: '処理が完了しました。'"></div>
   <p>
     <a class="btn" th:href="@{${backUrl}}" th:text="${backLabel}">戻る</a>
-    <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+<!--    <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
   </p>
 </main>
 </body>

book-rent/src/main/resources/templates/employeeRegistConfirm.html

@@ -0,0 +1,101 @@
+
+<!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>
+        <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">
+
+            <p>以下の内容で登録します。内容を確認してください。</p>
+
+            <form th:action="@{/admin/employees/new/execute}"
+                  th:object="${form}"
+                  method="post">
+
+                <!-- 登録内容一覧 -->
+                <table>
+                    <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 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>
+					</p>
+			
+
+            </form>
+
+        </div>
+    </main>
+
+</body>
+</html>

book-rent/src/main/resources/templates/employeeRegistInput.html

@@ -0,0 +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}">
+</head>
+
+<body>
+
+	<!-- 共通ヘッダー -->
+	<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>

book-rent/src/main/resources/templates/employeeSearch.html

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<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="${errorMessage}" th:text="${errorMessage}"></div>
+		<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+		<div class="card">
+			<form th:action="@{/employees/search}" method="post">
+				<label for="mailAddress">メールアドレス（256文字以内）</label>
+				<input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}">
+
+				<p><button type="submit">検索</button>
+					<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+				</p>
+			</form>
+		</div>
+	</main>
+</body>
+
+</html>

book-rent/src/main/resources/templates/employeeUpdateConfirm.html

@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>社員編集確認</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+
+<body>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main>
+		<h1>社員編集確認</h1>
+		<div class="card">
+			<table>
+				<th:block th:if="${admin}">
+					<tr>
+						<th>社員名</th>
+						<td th:text="${form.nmEmployee}"></td>
+					</tr>
+					<tr>
+						<th>社員名よみ</th>
+						<td th:text="${form.knEmployee}"></td>
+					</tr>
+					<tr>
+						<th>メールアドレス</th>
+						<td th:text="${form.mailAddress}"></td>
+					</tr>
+					<tr>
+						<th>管理者フラグ</th>
+						<td th:text="${form.flgAdmin == '1'} ? '1：管理者' : '0：一般'"></td>
+					</tr>
+					<tr>
+						<th>退職フラグ</th>
+						<td th:text="${form.flgRetirement == '1'} ? '1：退職' : '0：所属'"></td>
+					</tr>
+				</th:block>
+				<tr>
+					<th>パスワード</th>
+					<td th:text="${#strings.isEmpty(form.password)} ? '（変更しない）' : '********'"></td>
+				</tr>
+			</table>
+			<form th:action="@{/employees/edit/execute}" method="post" style="display:inline">
+				<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
+				<input type="hidden" name="nmEmployee" th:value="${form.nmEmployee}">
+				<input type="hidden" name="knEmployee" th:value="${form.knEmployee}">
+				<input type="hidden" name="mailAddress" th:value="${form.mailAddress}">
+				<input type="hidden" name="flgAdmin" th:value="${form.flgAdmin}">
+				<input type="hidden" name="flgRetirement" th:value="${form.flgRetirement}">
+				<input type="hidden" name="password" th:value="${form.password}">
+				<button type="submit">編集</button>
+			</form>
+			<form th:action="@{/employees/edit/input}" method="post" style="display:inline">
+				<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
+				<input type="hidden" name="nmEmployee" th:value="${form.nmEmployee}">
+				<input type="hidden" name="knEmployee" th:value="${form.knEmployee}">
+				<input type="hidden" name="mailAddress" th:value="${form.mailAddress}">
+				<input type="hidden" name="flgAdmin" th:value="${form.flgAdmin}">
+				<input type="hidden" name="flgRetirement" th:value="${form.flgRetirement}">
+				<input type="hidden" name="password" th:value="${form.password}">
+				<button type="submit" class="sub">社員情報入力に戻る</button>
+			</form>
+		</div>
+	</main>
+</body>
+
+</html>

book-rent/src/main/resources/templates/employeeUpdateInput.html

@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<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="${errorMessage}" th:text="${errorMessage}"></div>
+		<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+		<div class="card">
+			<form th:action="@{/employees/edit/confirm}" method="post">
+				<input type="hidden" name="idEmployee" th:value="${form.idEmployee}">
+				<th:block th:if="${admin}">
+					<label for="nmEmployee">社員名（必須・50文字以内）</label>
+					<input type="text" id="nmEmployee" name="nmEmployee" th:value="${form.nmEmployee}" maxlength="50">
+					<label for="knEmployee">社員名よみ（必須・100文字以内）</label>
+					<input type="text" id="knEmployee" name="knEmployee" th:value="${form.knEmployee}" maxlength="100">
+					<label for="mailAddress">メールアドレス（必須）</label>
+					<input type="text" id="mailAddress" name="mailAddress" th:value="${form.mailAddress}"
+						maxlength="256">
+					<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>
+					<label for="flgRetirement">退職フラグ</label>
+					<select id="flgRetirement" name="flgRetirement">
+						<option value="0" th:selected="${form.flgRetirement == '0'}">0：所属</option>
+						<option value="1" th:selected="${form.flgRetirement == '1'}">1：退職</option>
+					</select>
+					<label for="password">パスワード（変更する場合のみ入力）</label>
+				</th:block>
+				<th:block th:unless="${admin}">
+					<p>※パスワードのみ変更できます。</p>
+					<label for="password">新しいパスワード（必須）</label>
+				</th:block>
+				<input type="password" id="password" name="password" maxlength="256" autocomplete="new-password">
+				<p><button type="submit">編集確認</button>
+					<a class="btn sub" th:href="@{/menu}">メニューへ戻る</a>
+				</p>
+			</form>
+		</div>
+	</main>
+</body>
+
+</html>

book-rent/src/main/resources/templates/login.html

@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
-
+ 
 <head>
 	<meta charset="UTF-8">
 	<title>ログイン</title>
 	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
-
+ 
 <body>
 	<main>
 		<h1>書籍貸出管理システム</h1>
@@ -24,43 +24,43 @@
 		</div>
 	</main>
 </body>
-
+ 
 </html>
-
+ 
 <!--<!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">-->
-
+ 
 <!--     外部スクリプトの読み込み -->
 <!--    <script th:src="@{/js/common.js}"></script>-->
-
+ 
 <!--     CSSの読み込み -->
 <!--    <link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">-->
 <!--    <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">-->
-
+ 
 <!--    <title>ログイン</title>-->
 <!--</head>-->
-
+ 
 <!--<body>-->
-
+ 
 <!--    <div class="loginContainer">-->
-
+ 
 <!--        <h1>ログイン</h1>-->
-
+ 
 <!--        <form th:action="@{/doLogin}"-->
 <!--              method="post"-->
 <!--              th:object="${loginInfoForm}">-->
-
+ 
 <!--             エラーメッセージ -->
 <!--            <div class="msgBox error"-->
 <!--                 th:if="${messageError != null}">-->
 <!--                <span class="error"-->
 <!--                      th:text="${messageError.message}"></span>-->
 <!--            </div>-->
-
+ 
 <!--            <table>-->
 <!--                 メールアドレス -->
 <!--                <tr>-->
@@ -75,7 +75,7 @@
 <!--                        />-->
 <!--                    </td>-->
 <!--                </tr>-->
-
+ 
 <!--                 パスワード -->
 <!--                <tr>-->
 <!--                    <th class="header">パスワード</th>-->
@@ -89,7 +89,7 @@
 <!--                        />-->
 <!--                    </td>-->
 <!--                </tr>-->
-
+ 
 <!--                 ボタン -->
 <!--                <tr>-->
 <!--                    <td class="btnArea" colspan="2">-->
@@ -97,7 +97,7 @@
 <!--                            type="submit"-->
 <!--                            value="ログイン"-->
 <!--                        />-->
-
+ 
 <!--                        <button-->
 <!--                            type="button"-->
 <!--                            onclick="clearInput()">-->
@@ -106,11 +106,11 @@
 <!--                    </td>-->
 <!--                </tr>-->
 <!--            </table>-->
-
+ 
 <!--        </form>-->
-
+ 
 <!--    </div>-->
-
+ 
 <!--     入力内容のリセット -->
 <!--    <script>-->
 <!--        function clearInput() {-->
@@ -118,6 +118,6 @@
 <!--            document.getElementById('password').value = '';-->
 <!--        }-->
 <!--    </script>-->
-
+ 
 <!--</body>-->
 <!--</html>-->

book-rent/src/main/resources/templates/menu.html

@@ -23,3 +23,6 @@
 </main>
 </body>
 </html>
+ 
+
+ 

book-rent/src/main/resources/templates/returnComplete.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+
+<head>
+	<meta charset="UTF-8">
+	<title>書籍返却完了</title>
+	<link rel="stylesheet" th:href="@{/css/style.css}">
+</head>
+
+<body>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<main class="complete-container">
+	<h1>返却完了</h1>
+	<div class="info" th:text="${message} ?: '書籍の返却が完了しました。'"></div>
+
+	<p>
+		<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
+		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+	</p>
+	</main>
+</body>
+
+</html>