From 7b70861fd8024bf6f5164495e10345b894200bec Mon Sep 17 00:00:00 2001
From: w-yuki <yukiw@iij.ad.jp>
Date: Fri, 25 Sep 2026 16:36:18 +0900
Subject: [PATCH] =?UTF-8?q?[add]=E3=83=97=E3=83=AB=E3=83=80=E3=82=A6?=
 =?UTF-8?q?=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/controller/BookInsertController.java | 15 +++-
 .../com/example/demo/entity/BookInsert.java   |  4 +-
 .../repository/StorageLocationRepository.java |  9 ++
 src/main/resources/templates/bookInsert.html  | 84 +++++++++----------
 4 files changed, 64 insertions(+), 48 deletions(-)
 create mode 100644 src/main/java/com/example/demo/repository/StorageLocationRepository.java

diff --git a/src/main/java/com/example/demo/controller/BookInsertController.java b/src/main/java/com/example/demo/controller/BookInsertController.java
index 6ed1d7b..c725330 100644
--- a/src/main/java/com/example/demo/controller/BookInsertController.java
+++ b/src/main/java/com/example/demo/controller/BookInsertController.java
@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.entity.BookInsert;
 import com.example.demo.repository.BookCategoryRepository;
+import com.example.demo.repository.StorageLocationRepository;
 import com.example.demo.repository.SubCategoryRepository;
 import com.example.demo.service.BookInsertService;
 
@@ -21,13 +22,18 @@ private BookInsertService bookInsertService;
 
 @Autowired
 private BookCategoryRepository categoryRepository;
+
 @Autowired
 private SubCategoryRepository subCategoryRepository;
 
+@Autowired 
+private StorageLocationRepository storageLocationRepository;
+
 	    @GetMapping("/bookInsert")
 	    public String bookInsert(Model model) {
 	    	model.addAttribute("categoryList",categoryRepository.findAll());
 	    model.addAttribute("subCategoryList",subCategoryRepository.findAll());
+		model.addAttribute("locationList",storageLocationRepository.findAll());
 	    	model.addAttribute("bookInsert",new BookInsert());
 	        return "bookInsert";
 	    }
@@ -37,6 +43,7 @@ private SubCategoryRepository subCategoryRepository;
 	    // 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
 	    @PostMapping("/bookInsertConfirm")
 	    public String bookInsertConfirm(BookInsert bookInsert,Model model) {
+	    	System.out.println(bookInsert);
 	    	bookInsertService.save(bookInsert);
 	    	model.addAttribute("bookInsert",bookInsert);
 	        return "bookInsertConfirm";
@@ -46,6 +53,7 @@ private SubCategoryRepository subCategoryRepository;
 	    public String bookInsertBack(BookInsert bookInsert,Model model) {
 	    	model.addAttribute("categoryList",categoryRepository.findAll());
 	    	model.addAttribute("subCategoryList",new ArrayList<>());
+	    	model.addAttribute("locationList",storageLocationRepository.findAll());
 	    	model.addAttribute("bookInsert",bookInsert);
 	        return "bookInsert";
 	    }
@@ -56,16 +64,21 @@ private SubCategoryRepository subCategoryRepository;
 	    		model.addAttribute("categoryList",categoryRepository.findAll());
 
 	        model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
+	        model.addAttribute("locationList",storageLocationRepository.findAll());
 	        model.addAttribute("bookInsert", bookInsert);
 
 	        return "bookInsert";
 	    }
 	    
+	    
 	
 	    }
 
-	//画面で選択したカテゴリbookInsert.getBookCategoryId())
 
+	//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
+	//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
+	//「カテゴリIDが1のサブカテゴリを取ってくる」
+	//model.addAttribute("subCategoryList",取得結果)
 	    
 	  
 	   
diff --git a/src/main/java/com/example/demo/entity/BookInsert.java b/src/main/java/com/example/demo/entity/BookInsert.java
index ffe074a..9305b62 100644
--- a/src/main/java/com/example/demo/entity/BookInsert.java
+++ b/src/main/java/com/example/demo/entity/BookInsert.java
@@ -40,7 +40,7 @@ public class BookInsert {
     private String publisher;
     
     @Column(name = "publication_date")
-    private String publicationDate;
+    private LocalDate publicationDate;
     
     @Column(name = "location_id")
     private Integer location;
@@ -66,7 +66,7 @@ public class BookInsert {
     @Column(name = "book_approval")
     private Integer bookApproval;
   
-    @Transient
+    @Transient //DB保存無効
     private Integer bookCategoryId;
     
     
diff --git a/src/main/java/com/example/demo/repository/StorageLocationRepository.java b/src/main/java/com/example/demo/repository/StorageLocationRepository.java
new file mode 100644
index 0000000..861a62a
--- /dev/null
+++ b/src/main/java/com/example/demo/repository/StorageLocationRepository.java
@@ -0,0 +1,9 @@
+package com.example.demo.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.example.demo.entity.StorageLocation;
+
+public interface StorageLocationRepository extends JpaRepository<StorageLocation, Integer> {
+
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/bookInsert.html b/src/main/resources/templates/bookInsert.html
index 467e577..059917e 100644
--- a/src/main/resources/templates/bookInsert.html
+++ b/src/main/resources/templates/bookInsert.html
@@ -8,17 +8,12 @@
 
 <body>
 	<h1>新規図書登録入力</h1>
-	
-	<br>
 	       <br><br>
-		   
+	<h4>新しく図書を登録します。必要事項jを入力し、「登録」ボタンを押してください</h4>
+	<span style="color:red;">※は必須項目です</span>
+	<br><br>
 	<form action="/bookInsertConfirm" method="POST" th:object="${bookInsert}">
  
-		<label for="bookId">図書ID</label><br>
-		<input type="text"
-		       id="bookId"
-		       placeholder="登録時に自動採番されます" readonly>
-		<br><br>
 		
 		<label for="bookmanageId">図書管理ID</label><br>
 				<input type="text"
@@ -26,71 +21,70 @@
 				       placeholder="登録時に自動採番されます" readonly>
 				<br><br>
 
-	<label for="title">タイトル</label><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</label><br>
-	<input type="text" id="isbn" name="isbn" placeholder="ISBNを入力" th:value="${bookInsert.isbn}" required>
+	<label for="isbn">ISBN<span style="color:red;">※</span></label><br>
+	<input type="text" id="isbn" name="isbn" placeholder="例:978-1-23-456789-0" th:value="${bookInsert.isbn}" required>
 		<br><br>
 	
-		<label for="title">著者名</label><br>
+		<label for="title">著者名<span style="color:red;">※</span></label><br>
 		<input type="text" id="author" name="author" placeholder="著者名を入力" th:value="${bookInsert.author}" required>
 		<br><br>
 		
+		<!--自動でサブかてを絞り込む。カテゴリをせんたくして、
+		このselectが入っているformの送信先を/bookInsert/categoryに変更、そのformを送信-->
 		<label for="category">カテゴリ</label><br>
-		<select th:field="*{bookCategoryId}"
-		        onchange="
-		            this.form.action='/bookInsert/category';
-		            this.form.submit();">
-
-		    <option value="">
-		        選択してください
-		    </option>
-
-		    <option th:each="category : ${categoryList}"
-		            th:value="${category.bookCategoryId}"
-		            th:text="${category.bookCategoryName}">
+		<select th:field="*{bookCategoryId}" onchange="this.form.action='/bookInsert/category';this.form.submit();">
+		<option value=""> 選択してください
+		 </option>
+		<option th:each="category:${categoryList}"
+		       th:value="${category.bookCategoryId}"
+		       th:text="${category.bookCategoryName}">
 		    </option>
 
 		</select>
 		<br><br>
 		
-		<label for="subcategory">サブカテゴリ</label><br>
+		<label for="subcategory">サブカテゴリ<span style="color:red;">※</span></label><br>
 		<select th:field="*{subcategory}">
 		    <option value="">選択してください</option>
 			<option th:each="sub:${subCategoryList}"
 				    th:value="${sub.bookSubcategoryId}"
-				    th:text="${sub.bookSubcategoryName}">
+				    th:text="${sub.bookSubcategoryName}" required>
 				    </option>
 				</select>
 		<br><br>
-	
-		<label for="publisher">主パン者</label><br>
-		<input type="text" id="publisher" name="publisher" th:value="${bookInsert.publisher}">
+		
+		<label for="location">保管場所<span style="color:red;">※</span></label><br>
+		<select th:field="*{location}">
+		<option value="">選択してください</option>
+			<option th:each="location:${locationList}"
+		            th:value="${location.locationId}"
+		            th:text="${location.locationName}" required>
+		    </option>
+
+		</select>
 		<br><br>
 		
-		<label for="publicationDate">出版日</label><br>
-		<input type="date" id="publicationDate" name="publicationDate" th:value="${bookInsert.publicationDate}">
-		<br><br>
-		
-		<label for="location">保管場所</label><br>
-		<select name="location">
-			<option value="1">未確定</option>
-			<option value="2">開発エリア書棚</option>
-			<option value="3">会議室前ラック</option>
-			</select>
-		<br><br>
-		
-		<label for="condition">図書状態</label><br>
-		<select name="condition">
-		    <option value="0">不明</option>
+		<label for="condition">図書状態<span style="color:red;">※</span></label><br>
+		<select name="condition" required>
+			<option value="">選択してください</option>
 		    <option value="1">新品同様</option>
 		    <option value="2">良好</option>
 		    <option value="3">使用感あり</option>
 		    <option value="4">傷みあり</option>
 		</select>
 		<br><br>		
+		
+		<label for="publisher">主パン者</label><br>
+				<input type="text" id="publisher" name="publisher" th:value="${bookInsert.publisher}">
+				<br><br>
+				
+				<label for="publicationDate">出版日</label><br>
+				<input type="date" id="publicationDate" name="publicationDate" th:value="${bookInsert.publicationDate}">
+				<br><br>
 	   
 		<label for="donor">寄贈者社員ID</label><br>
 		<input type="text" id="donor" name="donor" th:value="${bookInsert.donor}">
@@ -103,7 +97,7 @@
 </label>-->
 
 
-	<input type="submit" value="確認画面へ" class="btn">
+	<input type="submit" value="登録" class="btn">
 </form>