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

mm

Browse Source
This commit is contained in:
小澤　未華
2026-10-20 15:27:39 +09:00
parent ef71711641
commit 0754c4507e
2 changed files with 94 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
book-rent/src/main/java/com/example/demo/controller/BookController.java
View File

@@ -1,10 +1,10 @@
package com.example.demo.controller; package com.example.demo.controller;
<<<<<<< HEAD
public class BookController {
=======
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -35,5 +35,5 @@ public class BookController {
model.addAttribute("note", note); model.addAttribute("note", note);
return "bookList"; return "bookList";
} }
>>>>>>> b128e9259883a00e9d25fdaae48e3fe54ddd290a
} }

179
book-rent/src/main/resources/templates/bookList.html
View File

@@ -4,110 +4,110 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>書籍一覧</title> <title>書籍一覧</title>
<<<<<<< HEAD
</head> </head>
<body> <body>
<div th:replace="~{fragments/header :: header}"></div> <div th:replace="~{fragments/header :: header}"></div>
<main> <main>
<form action="selectBook" method="post" th:object="${searchConditionBookForm}"> <form action="selectBook" method="post" th:object="${searchConditionBookForm}">
<div class="msgBox error" th:if="${messageError} != null"> <div class="msgBox error" th:if="${messageError} != null">
<span class="error" th:text="${messageError.message}"></span> <span class="error" th:text="${messageError.message}"></span>
</div> </div>
<!--検索入力欄--> <!--検索入力欄-->
<table> <table>
<tr> <tr>
<th class="header">書籍名</th> <th class="header">書籍名</th>
<td><input placeholder="書籍名" th:field="*{nm_book}" type="text" /></td> <td><input placeholder="書籍名" th:field="*{nm_book}" type="text" /></td>
</tr> </tr>
<tr> <tr>
<th class="header">出版社</th> <th class="header">出版社</th>
<td><input placeholder="出版社" th:field="*{publisher}" type="text"></td> <td><input placeholder="出版社" th:field="*{publisher}" type="text"></td>
</tr> </tr>
<tr> <tr>
<th class="header">特記事項</th> <th class="header">特記事項</th>
<td><input placeholder="特記事項" th:field="*{note}" type="text"></td> <td><input placeholder="特記事項" th:field="*{note}" type="text"></td>
</tr> </tr>
<tr> <tr>
<td class="btnArea" colspan="2"><input type="submit" value="検索" /></td> <td class="btnArea" colspan="2"><input type="submit" value="検索" /></td>
<td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td> <td class="btnArea" colspan="2"><button onclick="clearInput()">クリア</button></td>
</tr> </tr>
</table> </table>
</form> </form>
<div class="header-spacing"></div> <div class="header-spacing"></div>
<a href="showMenu">メニューに戻る</a> <a href="showMenu">メニューに戻る</a>
<div class="header-spacing"></div> <div class="header-spacing"></div>
<h1><span>検索結果</span></h1> <h1><span>検索結果</span></h1>
<div class="header-spacing"></div> <div class="header-spacing"></div>
<th:block th:if="${messageInfo != null}"> <th:block th:if="${messageInfo != null}">
<script th:inline="javascript"> <script th:inline="javascript">
alert([[${messageInfo.message}]]); alert([[${messageInfo.message}]]);
</script> </script>
</th:block> </th:block>
<div class="header-spacing"></div> <div class="header-spacing"></div>
<th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}"> <th:block th:if="${employeeInfoFormList != null and employeeInfoFormList.size() > 0}">
<!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList --> <!-- ★検索結果が1件以上：表(部署ID・部署名)を th:each で繰り返す。変数は departmentFormList -->
<table class="table-grid table-striped table-hover"> <table class="table-grid table-striped table-hover">
<thead> <thead>
<tr> <tr>
<th>蔵書ID</th> <th>蔵書ID</th>
<th>ISBN</th> <th>ISBN</th>
<th>書籍名</th> <th>書籍名</th>
<th>書籍名よみ</th> <th>書籍名よみ</th>
<th>出版社</th> <th>出版社</th>
<th>特記事項</th> <th>特記事項</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr th:each="BookCollection : ${BookCollectionList}"> <tr th:each="BookCollection : ${BookCollectionList}">
<td th:text="${BookCollection.idBook}"></td> <td th:text="${BookCollection.idBook}"></td>
<td th:text="${BookCollection.isbn}"></td> <td th:text="${BookCollection.isbn}"></td>
<td th:text="${BookCollection.nmBook}"></td> <td th:text="${BookCollection.nmBook}"></td>
<td th:text="${BookCollection.knBook}"></td> <td th:text="${BookCollection.knBook}"></td>
<td th:text="${BookCollection.publisher}"></td> <td th:text="${BookCollection.publisher}"></td>
<td th:text="${BookCollection.note}"></td> <td th:text="${BookCollection.note}"></td>
<td th:text="${BookCollection.nmDepartment}"></td> <td th:text="${BookCollection.nmDepartment}"></td>
<td> <td>
<!-- 更新フォーム --> <!-- 更新フォーム -->
<form action="showUpdateEmployee" method="post" style="display: inline;"> <form action="showUpdateEmployee" method="post" style="display: inline;">
<input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden"> <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
<input type="submit" value="更新"> <input type="submit" value="更新">
</form> </form>
<!-- 削除フォーム --> <!-- 削除フォーム -->
<form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');" <form action="deleteEmployee" method="post" onsubmit="return confirm('本当に削除しますか？');"
style="display: inline;"> style="display: inline;">
<input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden"> <input name="idEmployee" th:value="${employeeInfoForm.idEmployee}" type="hidden">
<input type="submit" value="削除"> <input type="submit" value="削除">
</form> </form>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</th:block> </th:block>
<!-- ★0件：「検索結果はありません。」を表示 --> <!-- ★0件：「検索結果はありません。」を表示 -->
<th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}"> <th:block th:if="${employeeInfoFormList == null or employeeInfoFormList.size() == 0}">
検索結果はありません。 検索結果はありません。
</th:block> </th:block>
</main> </main>
</body> </body>
<script type="text/javascript"> <script type="text/javascript">
function clearInput() { function clearInput() {
document.getElementById('idEmployee').value = ''; document.getElementById('idEmployee').value = '';
document.getElementById('nmEmployee').value = ''; document.getElementById('nmEmployee').value = '';
document.getElementById('knEmployee').value = ''; document.getElementById('knEmployee').value = '';
document.getElementById('mailAddress').value = ''; document.getElementById('mailAddress').value = '';
document.getElementById('idDepartment').selectedIndex = 0; document.getElementById('idDepartment').selectedIndex = 0;
} }
</script> </script>
=======
<link rel="stylesheet" th:href="@{/css/style.css}"> <link rel="stylesheet" th:href="@{/css/style.css}">
</head> </head>
<body> <body>
@@ -166,6 +166,5 @@
</div> </div>
</main> </main>
</body> </body>
>>>>>>> b128e9259883a00e9d25fdaae48e3fe54ddd290a
</html> </html>