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 m_shimizu

Browse Source
This commit is contained in:
m-shimizu
2026-10-21 16:27:14 +09:00
parent b36bce38e1 da41c781df
commit e73b98e76d
5 changed files with 83 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@
<body> <body>
<div th:replace="~{fragments/header :: header}"></div> <div th:replace="~{fragments/header :: header}"></div>
<main class="complete-container">
<h1>完了</h1> <h1>完了</h1>
<div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div> <div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div>
@@ -16,7 +17,7 @@
<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a> <a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a> <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
</p> </p>
</main>
</body> </body>
</html> </html>

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

@@ -9,74 +9,74 @@
<body> <body>
<div th:replace="~{fragments/header :: header}"></div> <div th:replace="~{fragments/header :: header}"></div>
<h1> <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;">
</h1> <form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post"
style="display: inline;">
<button type="submit">承認</button>
</form>
<table> <form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
<tr> style="display: inline; margin-left: 10px;">
<th class="header">申請ID</th> <button type="submit" class="sub">却下</button>
<td><input type="text" readonly="readonly" th:value="${r.idRequest}" /></td> </form>
</tr> </div>
<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;"> <br>
<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post" style="display: inline;"> <script>
<button type="submit">承認</button> function logoutSubmit() {
</form> if (confirm("ログアウトしますか？")) {
window.location.href = "/logout";
}
<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>
</script> </div>
</main>
</body> </body>
</html> </html>

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

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

20
book-rent/src/main/resources/templates/employeeRegistComplete.html
View File

@@ -1,20 +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/style.css}">
</head>
<body>
<!-- 共通ヘッダー -->
<div th:replace="~{fragments/header :: header}"></div>
<main class="complete-container">
<h2>社員登録完了</h2>
<p th:text="${message != null ? message : '社員登録が完了しました。'}">
社員登録が完了しました。
</p>
<a th:href="@{/menu}">メニューへ戻る</a>
</main>
</body>
</html>

2
book-rent/src/main/resources/templates/returnComplete.html
View File

@@ -9,6 +9,7 @@
<body> <body>
<div th:replace="~{fragments/header :: header}"></div> <div th:replace="~{fragments/header :: header}"></div>
<main class="complete-container">
<h1>返却完了</h1> <h1>返却完了</h1>
<div class="info" th:text="${message} ?: '書籍の返却が完了しました。'"></div> <div class="info" th:text="${message} ?: '書籍の返却が完了しました。'"></div>
@@ -16,6 +17,7 @@
<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a> <a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
<a class="btn sub" th:href="@{/menu}">メニューに戻る</a> <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
</p> </p>
</main>
</body> </body>
</html> </html>