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

src/main/java/com/example/demo/controller/BookInsertController.java

@@ -1,7 +1,5 @@
 package com.example.demo.controller;
 
-import java.util.ArrayList;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -51,7 +49,7 @@ private StorageLocationRepository storageLocationRepository;
 	    			model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
 	    			//そのカテゴリに属するサブカテゴリを持ってくる
 	    			} else{
-	    			model.addAttribute("subCategoryList",new ArrayList<>());
+	    			model.addAttribute("subCategoryList",subCategoryRepository.findAll());
 	    			}
 	    		model.addAttribute("locationList",storageLocationRepository.findAll());
 	    		model.addAttribute("bookInsert", bookInsert);
@@ -71,7 +69,7 @@ private StorageLocationRepository storageLocationRepository;
 	    	if(bookInsert.getBookCategoryId() != null) {
 	    		model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
 	    			} else{
-	    				model.addAttribute("subCategoryList",new ArrayList<>());
+	    				model.addAttribute("subCategoryList",subCategoryRepository.findAll());
 	    			}
 	    		model.addAttribute("locationList",storageLocationRepository.findAll());
 	    		model.addAttribute("bookInsert",bookInsert);

src/main/resources/templates/bookInsert.html

@@ -8,10 +8,11 @@
 
 <body>
 	<h1>新規図書登録入力</h1>
-	       <br><br>
+	       <br>
-	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください</h4>
+	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください。</h4>
 	<span style="color:red;">※は必須項目です</span>
-	<br><br>
+	<br>
+	<h4>図書情報</h4>
 	<form action="/bookInsertConfirm" method="POST" th:object="${bookInsert}">
  
 		
@@ -19,17 +20,23 @@
 				<input type="text"
 				       id="bookManageId"
 				       placeholder="登録時に自動採番されます" readonly>
-				<br><br>
+					   <div style="font-size:12px; color:rgb(128, 128, 128);">
+					   	※例：BK-1、BK-2...
+					   	</div>
+				<br>
 
 	<label for="title">タイトル<span style="color:red;">※</span></label><br>
 	<input type="text" id="title" name="title" placeholder="タイトルを入力" th:value="${bookInsert.title}" required>
 	<br><br>
 	
 	<label for="isbn">ISBN<span style="color:red;">※</span></label><br>
-	<input type="text" id="isbn" name="isbn" placeholder="ISBNを入力" th:value="${bookInsert.isbn}"  required>
+	<input type="text" id="isbn" name="isbn" placeholder="例：978-4-123-45678-9" th:value="${bookInsert.isbn}"  required>
+	<div style="font-size:12px; color:rgb(128, 128, 128);">
+	※ハイフン(4つ)を含む形式で入力してください
+	</div>
 	<div th:if="${#fields.hasErrors('isbn')}" th:errors="*{isbn}" style="color:red">
 		   </div>
-		<br><br>
+		<br>
 	
 		<label for="title">著者名<span style="color:red;">※</span></label><br>
 		<input type="text" id="author" name="author" placeholder="著者名を入力" th:value="${bookInsert.author}" required>
@@ -50,30 +57,34 @@
 		<br><br>
 		
 		<label for="subcategory">サブカテゴリ<span style="color:red;">※</span></label><br>
-		<select th:field="*{subcategory}">
+		<select th:field="*{subcategory}"  required>
 		    <option value="">選択してください</option>
 			<option th:each="sub:${subCategoryList}"
 				    th:value="${sub.bookSubcategoryId}"
-				    th:text="${sub.bookSubcategoryName}" required>
+				    th:text="${sub.bookSubcategoryName}">
 				    </option>
 				</select>
+				<div th:if="${#fields.hasErrors('subcategory')}" th:errors="*{subcategory}" style="color:red">
+						</div>
 		<br><br>
 		
 		<label for="location">保管場所<span style="color:red;">※</span></label><br>
-		<select th:field="*{location}">
+		<select th:field="*{location}" required>
 		<option value="">選択してください</option>
 			<option th:each="location:${locationList}"
 		            th:value="${location.locationId}"
-		            th:text="${location.locationName}" required>
+		            th:text="${location.locationName}" >
 		    </option>
 
 		</select>
+		<div th:if="${#fields.hasErrors('location')}" th:errors="*{location}" style="color:red">
+		</div>
 		<br><br>
 		
 		<label for="condition">図書状態<span style="color:red;">※</span></label><br>
 		<select th:field="*{condition}" required>
 			<option value="">選択してください</option>
-		    <option value="1">新品同様</option>
+		    <option value="1">新品</option>
 		    <option value="2">良好</option>
 		    <option value="3">使用感あり</option>
 		    <option value="4">傷みあり</option>

src/main/resources/templates/bookInsertConfirm.html

@@ -13,7 +13,7 @@
 		<!-- もどる: 入力中の値を持って入力画面へ -->
 		<form method="post" th:action="@{/bookInsert}" >
 		    <input type="hidden" name="bookId" th:value="${bookInsert.bookId}">
-			<input type="hidden" name="bookmanageId" th:value="${bookInsert.bookManageId}">
+			<input type="hidden" name="bookManageId" th:value="${bookInsert.bookManageId}">
 		    <input type="hidden" name="title" th:value="${bookInsert.title}">
 			<input type="hidden" name="isbn" th:value="${bookInsert.isbn}">
 			<input type="hidden" name="author" th:value="${bookInsert.author}">