Merge branch 's-tajihi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/ShareBooks_new into h-seya

src/main/resources/templates/book.html

@@ -17,7 +17,7 @@
 			<table class="table table-striped">
 				<thead>
 					<tr>
-						<th>図書ID</th>
+						<th>図書管理ID</th>
 						<th>ISBN</th>
 						<th>タイトル</th>
 						<th>著者名</th>
@@ -30,13 +30,13 @@
 						<th>登録日時</th>
 						<th>更新日時</th>
 						<th>寄贈者</th>
-						<th>貸出状態??</th>
-						<th>操作??</th>
+						<th>貸出状態</th>
+						<th>操作</th>
 					</tr>
 				</thead>
 
 				<tbody>
-					<tr th:each="book : ${book}">
+					<tr th:each="book : ${book}" th:if="${book.bookManageId != null}">
 
 						<td th:text="*{book.bookManageId}"></td>
 						<td th:text="*{book.isbn}"></td>
@@ -47,24 +47,33 @@
 						<td th:text="*{book.bookSubcategory.bookCategory.bookCategoryName}"></td>
 						<td th:text="*{book.bookSubcategory.bookSubcategoryName}"></td>
 						<td th:text="*{book.storageLocation.locationName}"></td>
-						<td th:text="*{book.condition}"></td>
+						<td th:text="*{book.condition == 0 ? '分からない':
+									   book.condition == 1 ? '新品':
+									   book.condition == 2 ? '良好':
+									   book.condition == 3 ? '使用感あり':
+									   book.condition == 4 ? '痛みあり':
+								       '不明'}">
+						</td>
 						<td th:text="*{book.createdAt}"></td>
 						<td th:text="*{book.updatedAt}"></td>
-						<td th:text="*{book.employee != null ? book.employee.employeeId : '-'}"></td>
+						<td th:text="*{book.employee != null ? book.employee.employeeName : '-'}"></td>
 						<td
-							th:text="*{book.bookLends != null ? (book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '-'}">
+							th:text="*{book.bookLends != null ? (book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}">
 						</td>
 						<td>
 							<form method="post" action="/bookLend">
-								<input type="hidden" name="bookManageId" th:value="${book.bookManageId}">
-								<button type="submit">貸出</button>
+								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
+								<button type="submit"
+									th:disabled="*{book.bookLends != null && book.bookLends.bookStatus == 1}">
+									貸出
+								</button>
 							</form>
 							<form method="get" action="/updateconfirm">
-								<input type="hidden" name="bookManageId" th:value="${book.bookManageId}">
+								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
 								<button type="submit">更新</button>
 							</form>
 							<form method="get" action="/delete">
-								<input type="hidden" name="bookManageId" th:value="${book.bookManageId}">
+								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
 								<button type="submit">削除</button>
 							</form>
 						</td>