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

src/main/resources/templates/book.html

@@ -8,9 +8,33 @@
 </head>
 
 <body>
+	
+	<div class="header-bar">
+
+			<div class="header-left">
+				ShareBooks
+			</div>
+
+			<div class="header-right">
+
+				<span class="user">
+					<span th:text="${session.loginEmployee.employee.employeeName}"></span>
+					(<span th:text="${session.loginEmployee.adminFlag == 1 ? '管理者' : '一般'}"></span>)
+				</span>
+
+				<a class="button-link" th:href="@{/logout}">
+					ログアウト
+				</a>
+
+			</div>
+
+		</div>
+		
 	<div class="container">
 		<h1>社内図書一覧</h1>
+
 		<div class="float-end">
+			<a th:href="@{/topmenu}">トップメニューへ</a>
 		</div>
 
 		<form class="input-group" th:action="@{/searchBooks}" th:object="${bookSearchForm}" method="get">
@@ -22,19 +46,16 @@
 			</button>
 
 		</form>
-		
+
 		<form method="post" th:action="@{/clearBookList}">
 			<button class="button button-secondary" type="submit">
 				クリア
 			</button>
 		</form>
-		
+
 		<p>※「タイトル」「出版社」「著者名」で検索</p>
 
 
-
-		<form method="get" action="bookLend">
-
 			<table class="table table-striped">
 				<thead>
 					<tr>
@@ -47,12 +68,12 @@
 						<th>カテゴリー名</th>
 						<th>サブカテゴリー名</th>
 						<th>保管場所</th>
-						<th>本の状態</th>
-						<th>登録日時</th>
-						<th>更新日時</th>
-						<th>寄贈者</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">本の状態</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">登録日時</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">更新日時</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">寄贈者</th>
 						<th>貸出状態</th>
-						<th>操作</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">操作</th>
 					</tr>
 				</thead>
 
@@ -68,20 +89,23 @@
 						<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 == 0 ? '分からない':
+						<td th:if="${session.loginEmployee.adminFlag == 1}"
+							 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.employeeName : '-'}"></td>
-						<td
-							th:text="*{book.bookLends != null ? (book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}">
-						</td>
-						<td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.createdAt}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.updatedAt}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" 
+							th:text="*{book.employee != null ? book.employee.employeeName : '-'}"></td>
+						<td th:text="*{book.bookLends != null ? 
+							(book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}"></td>
+						
+						<td th:if="${session.loginEmployee.adminFlag == 1}">
+							
 							<form method="post" action="/bookLend">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
 								<button type="submit"
@@ -89,28 +113,34 @@
 									貸出
 								</button>
 							</form>
+							
 							<form method="post" action="/updateconfirm">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
-								<button type="submit">更新</button>
+								<button type="submit">
+									更新
+								</button>
 							</form>
+							
 							<form method="get" action="/delete">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
-								<button type="submit">削除</button>
+								<button type="submit">
+									削除
+								</button>
 							</form>
+							
 						</td>
 					</tr>
-					
+
 					<tr th:if="${#lists.isEmpty(book)}">
 						<td colspan="15">
 							該当する図書がありません
 						</td>
 					</tr>
+					
 				</tbody>
 			</table>
 
-
-
-
+	</div>
 </body>
 
 </html>