2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into h-hein2

Browse Source
This commit is contained in:
KYAW　ZIN　HEIN
2026-10-21 10:51:51 +09:00
parent 3e0be17cef b9036465f2
commit 9db673abb8
5 changed files with 42 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

25
book-rent/src/main/resources/templates/approvalComplete.html
View File

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

8
book-rent/src/main/resources/templates/approvalConfilm.html
View File

@@ -4,16 +4,14 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>書籍貸出承認確認</title> <title>書籍貸出承認確認</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head> </head>
<body> <body>
<div th:replace="~{fragments/header :: header}"></div>
<h1> <h1>
書籍貸出承認確認　　　 書籍貸出承認確認　　　
<div class="rightSection">
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
</h1> </h1>

24
book-rent/src/main/resources/templates/approvalRejected.html
View File

@@ -4,27 +4,19 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>書籍貸出申請</title> <title>書籍貸出申請</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
</head> </head>
<body> <body>
<h1> <div th:replace="~{fragments/header :: header}"></div>
　　　 <h1>却下</h1>
<div class="rightSection"> <div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
<span class="loginInfo">ログイン者名：<span th:text="${session.loginUser.nmEmployee}"></span></span>
<button class="logoutButton" onclick="logoutSubmit()">ログアウト</button>
</div>
</h1>
<h2>書籍貸出申請を却下しました。</h2>
<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> </body>

21
book-rent/src/main/resources/templates/returnComplete.html Normal file
View File

@@ -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>