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

Compare commits

base: 2026_0910_AI_5G_Java_MUN:b36bce38e1ed18506eeeac779b1ee2c0b7df533a
Branches Tags
2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:h-hein2 2026_0910_AI_5G_Java_MUN:m_shimizu 2026_0910_AI_5G_Java_MUN:o-matsuda 2026_0910_AI_5G_Java_MUN:new-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi2 2026_0910_AI_5G_Java_MUN:m-ozawa 2026_0910_AI_5G_Java_MUN:h-hein
...
compare: 2026_0910_AI_5G_Java_MUN:m-ozawa
Branches Tags
2026_0910_AI_5G_Java_MUN:h-hein2 2026_0910_AI_5G_Java_MUN:main 2026_0910_AI_5G_Java_MUN:m_shimizu 2026_0910_AI_5G_Java_MUN:o-matsuda 2026_0910_AI_5G_Java_MUN:new-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi 2026_0910_AI_5G_Java_MUN:t-eguchi2 2026_0910_AI_5G_Java_MUN:m-ozawa 2026_0910_AI_5G_Java_MUN:h-hein

5 Commits
b36bce38e1 ... m-ozawa

Author SHA1 Message Date
m-shimizu
9c591c9ff2 登録確認ボタン_配置修正 2026-10-22 09:56:34 +09:00
t-eguchi
61e89fc36f 承認画面のレイアウト変更しました 2026-10-22 09:54:49 +09:00
h.hein
10182adc6d layout Edit 2026-10-22 09:29:36 +09:00
m-shimizu
e73b98e76d Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu 2026-10-21 16:27:14 +09:00
t-eguchi
da41c781df レイアウト変更を行いました 2026-10-21 16:22:56 +09:00
7 changed files with 181 additions and 196 deletions
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>

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

@@ -9,66 +9,67 @@
<body> <body>
<div th:replace="~{fragments/header :: header}"></div> <div th:replace="~{fragments/header :: header}"></div>
<h1> <main>
書籍貸出承認確認　　　 <h1>書籍貸出承認確認</h1>
<div class="card">
</h1>
<table> <table>
<tr> <tr>
<th class="header">申請ID</th> <th>申請ID</th>
<td><input type="text" readonly="readonly" th:value="${r.idRequest}" /></td> <td th:text="${r.idRequest}"></td>
</tr> </tr>
<tr> <tr>
<th class="header">申請者名</th> <th>申請者名</th>
<td><input type="text" readonly="readonly" th:value="${r.nmApplicant}" /></td> <td th:text="${r.nmApplicant}"></td>
</tr> </tr>
<tr> <tr>
<th class="header">申請日</th> <th>申請日</th>
<td><input type="text" readonly="readonly" th:value="${r.dateRequest}" /></td> <td th:text="${r.dateRequest}"></td>
</tr> </tr>
<tr> <tr>
<th class="header">ISBN</th> <th>ISBN</th>
<td><input type="text" readonly="readonly" th:value="${r.isbn}" /></td> <td th:text="${r.isbn}"></td>
</tr> </tr>
<tr> <tr>
<th class="header">書籍名</th> <th>書籍名</th>
<td><input type="text" readonly="readonly" th:value="${r.nmBook}" style="width: 300px;" /></td> <td th:text="${r.nmBook}" style="width: 700px;"></td>
</tr> </tr>
<tr> <tr>
<th class="header">出版社</th> <th>出版社</th>
<td><input type="text" readonly="readonly" th:value="${r.publisher}" /></td> <td th:text="${r.publisher}"></td>
</tr> </tr>
<tr> <tr>
<th class="header">特記事項</th> <th>特記事項</th>
<td><input type="text" readonly="readonly" th:value="${r.note}" /></td> <td th:text="${r.note}"></td>
</tr> </tr>
<tr> <tr>
<th class="header">貸出日</th> <th>貸出日</th>
<td><input type="text" readonly="readonly" th:value="${r.dateBorrow}" /></td> <td th:text="${r.dateBorrow}"></td>
</tr> </tr>
<tr> <tr>
<th class="header">返却予定日</th> <th>返却予定日</th>
<td><input type="text" readonly="readonly" th:value="${r.dateScheduledReturn}" /></td> <td th:text="${r.dateScheduledReturn}"></td>
</tr> </tr>
</table> </table>
<div class="buttonSection" style="margin-top: 20px;"> <div class="buttonSection" style="margin-top: 20px;">
<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post" style="display: inline;"> <form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post"
style="display: inline;">
<button type="submit">承認</button> <button type="submit">承認</button>
</form> </form>
<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post" <form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
style="display: inline; margin-left: 10px;"> style="display: inline; margin-left: 10px;">
<button type="submit">却下</button> <button type="submit" class="sub">却下</button>
</form> </form>
<a th:href="@{/admin/applications}" style="text-decoration: none; margin-left: 10px;">
<button type="button" class="sub">承認待ち一覧に戻る</button>
</a>
</div> </div>
<br>
<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
<script> <script>
function logoutSubmit() { function logoutSubmit() {
@@ -77,6 +78,8 @@
} }
} }
</script> </script>
</div>
</main>
</body> </body>
</html> </html>

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

@@ -1,14 +1,15 @@
<!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>
<main class="complete-container">
<h1>却下</h1> <h1>却下</h1>
<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div> <div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
@@ -17,7 +18,8 @@
<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>

13
book-rent/src/main/resources/templates/employeeRegistConfirm.html
View File

@@ -72,13 +72,14 @@
<input type="hidden" th:field="*{flgAdmin}"> <input type="hidden" th:field="*{flgAdmin}">
<!-- ボタン：左に戻る、右に登録 --> <!-- ボタン：左に戻る、右に登録 -->
<div style="display: flex; <!-- <div style="display: flex;-->
justify-content: space-between; <!-- justify-content: space-between;-->
align-items: center; <!-- align-items: center;-->
width: 100%; <!-- width: 100%;-->
margin-top: 20px;"> <!-- margin-top: 20px;">-->
<!-- 社員情報入力に戻る --> <!-- 社員情報入力に戻る -->
<p>
<a class="btn sub" <a class="btn sub"
th:href="@{/admin/employees/new}"> th:href="@{/admin/employees/new}">
社員情報入力に戻る 社員情報入力に戻る
@@ -88,8 +89,8 @@
<button type="submit" class="btn"> <button type="submit" class="btn">
登録 登録
</button> </button>
</p>
</div>
</form> </form>

112
book-rent/src/main/resources/templates/employeeRegistInput.html
View File

@@ -1,4 +1,3 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
@@ -18,99 +17,95 @@
<h2>社員登録</h2> <h2>社員登録</h2>
<!-- 入力エラー表示 --> <!-- 入力エラー表示 -->
<div class="error" <div class="error" th:if="${errors != null and !errors.isEmpty()}">
th:if="${errors != null and !errors.isEmpty()}"> <p th:each="error : ${errors}" th:text="${error}">
<p th:each="error : ${errors}"
th:text="${error}">
</p> </p>
</div> </div>
<!-- 社員登録フォーム --> <!-- 社員登録フォーム -->
<div class="card"> <div class="card">
<form th:action="@{/admin/employees/new/confirm}" <form th:action="@{/admin/employees/new/confirm}" th:object="${form}" method="post">
th:object="${form}"
method="post">
<!-- 社員名 --> <!-- 社員名 -->
<div> <div>
<label for="nmEmployee">社員名</label> <label for="nmEmployee">社員名</label>
<input type="text" <input type="text" id="nmEmployee" th:field="*{nmEmployee}">
id="nmEmployee"
th:field="*{nmEmployee}">
</div> </div>
<!-- 社員名よみ --> <!-- 社員名よみ -->
<div> <div>
<label for="knEmployee">社員名よみ</label> <label for="knEmployee">社員名よみ</label>
<input type="text" <input type="text" id="knEmployee" th:field="*{knEmployee}">
id="knEmployee"
th:field="*{knEmployee}">
</div> </div>
<!-- メールアドレス --> <!-- メールアドレス -->
<div> <div>
<label for="mailAddress">メールアドレス</label> <label for="mailAddress">メールアドレス</label>
<input type="email" <input type="email" id="mailAddress" th:field="*{mailAddress}">
id="mailAddress"
th:field="*{mailAddress}">
</div> </div>
<!-- パスワード --> <!-- パスワード -->
<div> <div>
<label for="password">パスワード</label> <label for="password">パスワード</label>
<input type="password" <input type="password" id="password" th:field="*{password}">
id="password"
th:field="*{password}">
</div> </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; <!-- <div style="border: none;-->
display: flex; <!-- display: flex;-->
flex-direction: row; <!-- flex-direction: row;-->
align-items: center; <!-- align-items: center;-->
gap: 25px; <!-- gap: 25px;-->
margin: 15px 0 25px;"> <!-- margin: 15px 0 25px;">-->
<label style="display: inline-flex; <!-- <label style="display: inline-flex;-->
align-items: center; <!-- align-items: center;-->
gap: 5px; <!-- gap: 5px;-->
white-space: nowrap;"> <!-- white-space: nowrap;">-->
<input type="radio" <!-- <input type="radio"-->
th:field="*{flgAdmin}" <!-- th:field="*{flgAdmin}"-->
value="1"> <!-- value="1">-->
管理者 <!-- 管理者-->
</label> <!-- </label>-->
<label style="display: inline-flex; <!-- <label style="display: inline-flex;-->
align-items: center; <!-- align-items: center;-->
gap: 5px; <!-- gap: 5px;-->
white-space: nowrap;"> <!-- white-space: nowrap;">-->
<input type="radio" <!-- <input type="radio"-->
th:field="*{flgAdmin}" <!-- th:field="*{flgAdmin}"-->
value="0"> <!-- value="0">-->
一般ユーザー <!-- 一般ユーザー-->
</label> <!-- </label>-->
</div> <!-- </div>-->
<!-- ボタン：左に戻る・右に確認 --> <!-- ボタン：左に戻る・右に確認 -->
<div style="display: flex; <!-- <div style="display: flex;-->
justify-content: space-between; <!-- justify-content: space-between;-->
align-items: center; <!-- align-items: center;-->
width: 100%; <!-- width: 100%;-->
margin-top: 20px;"> <!-- margin-top: 20px;">-->
<a class="btn sub" <!-- <a class="btn sub"-->
th:href="@{/menu}"> <!-- th:href="@{/menu}">-->
メニューに戻る <!-- メニューに戻る-->
</a> <!-- </a>-->
<button type="submit" class="btn"> <!-- <button type="submit" class="btn">-->
確認 <!-- 確認-->
</button> <!-- </button>-->
</div> <!-- </div>-->
</form> </form>
@@ -118,4 +113,5 @@
</main> </main>
</body> </body>
</html> </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>