From b9036465f248605aae9e8e132b956fb5d3171b98 Mon Sep 17 00:00:00 2001
From: t-eguchi <26-t-eguchi-tmn@it-college.co.jp>
Date: Wed, 21 Oct 2026 10:03:06 +0900
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=8D=B4=E6=A9=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/AdminLoanController.java  |  2 +-
 .../resources/templates/approvalComplete.html | 25 ++++++------------
 .../resources/templates/approvalConfilm.html  |  8 +++---
 .../resources/templates/approvalRejected.html | 26 +++++++------------
 .../resources/templates/returnComplete.html   | 21 +++++++++++++++
 5 files changed, 42 insertions(+), 40 deletions(-)
 create mode 100644 book-rent/src/main/resources/templates/returnComplete.html

diff --git a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java b/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java
index 1ff68d7..bc2f954 100644
--- a/book-rent/src/main/java/com/example/demo/controller/AdminLoanController.java
+++ b/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";
diff --git a/book-rent/src/main/resources/templates/approvalComplete.html b/book-rent/src/main/resources/templates/approvalComplete.html
index bedbc40..0854508 100644
--- a/book-rent/src/main/resources/templates/approvalComplete.html
+++ b/book-rent/src/main/resources/templates/approvalComplete.html
@@ -4,27 +4,18 @@
 <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>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<h1>完了</h1>
+	<div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div>
 
-
-	<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>
+	<p>
+		<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
+		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+	</p>
 
 </body>
 
diff --git a/book-rent/src/main/resources/templates/approvalConfilm.html b/book-rent/src/main/resources/templates/approvalConfilm.html
index 1202633..529b0e9 100644
--- a/book-rent/src/main/resources/templates/approvalConfilm.html
+++ b/book-rent/src/main/resources/templates/approvalConfilm.html
@@ -4,16 +4,14 @@
 <head>
 	<meta charset="UTF-8">
 	<title>書籍貸出承認確認</title>
-
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
 <body>
+	<div th:replace="~{fragments/header :: header}"></div>
 	<h1>
 		書籍貸出承認確認　　　
-		<div class="rightSection">
-			<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
-			<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
-		</div>
+
 	</h1>
 
 
diff --git a/book-rent/src/main/resources/templates/approvalRejected.html b/book-rent/src/main/resources/templates/approvalRejected.html
index 0555880..26a6f6f 100644
--- a/book-rent/src/main/resources/templates/approvalRejected.html
+++ b/book-rent/src/main/resources/templates/approvalRejected.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>
+	<div th:replace="~{fragments/header :: header}"></div>
+	<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">
-
-		<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>
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/returnComplete.html b/book-rent/src/main/resources/templates/returnComplete.html
new file mode 100644
index 0000000..edc9d59
--- /dev/null
+++ b/book-rent/src/main/resources/templates/returnComplete.html
@@ -0,0 +1,21 @@
+<!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>
+	<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>
+</body>
+
+</html>
\ No newline at end of file