不具合の修正

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

@@ -18,47 +18,45 @@ import com.example.demo.service.BookInsertService;
 @Controller
 public class BookInsertController {
 	
-	@Autowired
-	private BookInsertService bookInsertService;
+@Autowired
+private BookInsertService bookInsertService;
 
-	@Autowired
-	private BookCategoryRepository categoryRepository;
+@Autowired
+private BookCategoryRepository categoryRepository;
 
-	@Autowired
-	private SubCategoryRepository subCategoryRepository;
+@Autowired
+private SubCategoryRepository subCategoryRepository;
 
-	@Autowired
-	private StorageLocationRepository storageLocationRepository;
+@Autowired 
+private StorageLocationRepository storageLocationRepository;
 
-	@Autowired
-	private BookInsertRepository bookInsertRepository;
+@Autowired
+private BookInsertRepository bookInsertRepository;
 
 	    @GetMapping("/bookInsert")
 	    public String bookInsert(Model model) {
-		model.addAttribute("nextBookManageId", bookInsertService.createBookManageId());
-		model.addAttribute("bookInsert", new BookInsert());
-		model.addAttribute("categoryList", categoryRepository.findAll());
-		model.addAttribute("subCategoryList", subCategoryRepository.findAll());
-		model.addAttribute("locationList", storageLocationRepository.findAll());
-		model.addAttribute("bookInsert", new BookInsert());
+	    	model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
+	    	model.addAttribute("bookInsert",new BookInsert());
+	    	model.addAttribute("categoryList",categoryRepository.findAll());
+	    model.addAttribute("subCategoryList",subCategoryRepository.findAll());
+		model.addAttribute("locationList",storageLocationRepository.findAll());
+	    	model.addAttribute("bookInsert",new BookInsert());
 	        return "bookInsert";
 	    }
 	    
 	    // 初期表示: 空のformを渡す(th:fieldの初期値が空になる)
 	    
 	    // 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
-	//入力内容確認してOKであれば確認画面へ
 	    @PostMapping("/bookInsertConfirm")
-	public String bookInsertConfirm(@Validated BookInsert bookInsert, BindingResult result, Model model) {
-		if (result.hasErrors()) {
-			model.addAttribute("nextBookManageId", bookInsertService.createBookManageId());
-			model.addAttribute("categoryList", categoryRepository.findAll());
-			if (bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
-				model.addAttribute("subCategoryList",
-						subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
+	    public String bookInsertConfirm(@Validated BookInsert bookInsert,BindingResult result,Model model) {
+	    	if(result.hasErrors()) {
+	    		model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
+	    		model.addAttribute("categoryList",categoryRepository.findAll());
+	    		if(bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
+	    			model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
 	    			//そのカテゴリに属するサブカテゴリを持ってくる
-			} else {
-				model.addAttribute("subCategoryList", subCategoryRepository.findAll());
+	    			} else{
+	    			model.addAttribute("subCategoryList",subCategoryRepository.findAll());
 	    			}
 	    		model.addAttribute("locationList",storageLocationRepository.findAll());
 	    		model.addAttribute("bookInsert", bookInsert);
@@ -66,23 +64,32 @@ public class BookInsertController {
 	    		
 	    	}
 	    	bookInsertService.save(bookInsert);
-		model.addAttribute("bookInsert", bookInsert);
+	    	model.addAttribute("bookInsert",bookInsert);
 	        return "bookInsertConfirm";
 	    }
 	    
-	@PostMapping("/bookInsert/category")
-	public String changeCategory(BookInsert bookInsert, Model model) {
-		//カテゴリプルダウンに表示するデータを取得
-		model.addAttribute("nextBookManageId", bookInsertService.createBookManageId());
-		model.addAttribute("categoryList", categoryRepository.findAll());
-		if (bookInsert.getBookCategoryId() != null) { //nullじゃなかったら
-			model.addAttribute("subCategoryList",
-					subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
-			//そのカテゴリに属するサブカテゴリを持ってくる
-		} else {
-			model.addAttribute("subCategoryList", subCategoryRepository.findAll());
+	    //確認画面から「もどる」ボタンを押したら入力画面に戻る
+	    @PostMapping("/bookInsert")
+	    public String bookInsertBack(BookInsert bookInsert,Model model) {
+	    	model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
+	    	model.addAttribute("categoryList",categoryRepository.findAll());
+	    	if(bookInsert.getBookCategoryId() !=null) {
+	    		model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
+	    			} else{
+	    				model.addAttribute("subCategoryList",subCategoryRepository.findAll());
 	    			}
-		model.addAttribute("locationList", storageLocationRepository.findAll());
+	    		model.addAttribute("locationList",storageLocationRepository.findAll());
+	    		model.addAttribute("bookInsert",bookInsert);
+	        return "bookInsert";
+	    }
+	    
+	    @PostMapping("/bookInsert/category")
+	    public String changeCategory(BookInsert bookInsert,Model model) {
+	    	    //カテゴリプルダウンに表示するデータを取得
+	    		model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
+	    		model.addAttribute("categoryList",categoryRepository.findAll());
+	    		model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
+	        model.addAttribute("locationList",storageLocationRepository.findAll());
 	        model.addAttribute("bookInsert", bookInsert);
 
 	        return "bookInsert";
@@ -90,7 +97,13 @@ public class BookInsertController {
 	    
 }
 	    
-//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
-//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
-//「カテゴリIDが1のサブカテゴリを取ってくる」
-//model.addAttribute("subCategoryList",取得結果)
+
+
+	//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
+	//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
+	//「カテゴリIDが1のサブカテゴリを取ってくる」
+	//model.addAttribute("subCategoryList",取得結果)
+	    
+
+	   
+	 

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

@@ -74,7 +74,7 @@ public class LoginController {
 		AccountEntity accountEntity = loginService.login(loginForm);
 		if (accountEntity == null) {
 			model.addAttribute("loginError",
-					"ログインIDまたはパスワードが正しくありません");
+					"社員IDまたはパスワードが正しくありません");
 			return "login";
 		}
 

src/main/java/com/example/demo/repository/BookLendRepository.java

@@ -1,7 +1,5 @@
 package com.example.demo.repository;
 
-import java.util.List;
-
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -10,6 +8,4 @@ import com.example.demo.entity.BookLend;
 @Repository
 public interface BookLendRepository extends JpaRepository<BookLend, Integer> {
 
-	List<BookLend> findBybookStatus(Integer bookStatus);
-	
 }

src/main/java/com/example/demo/service/BookLendService.java

@@ -15,7 +15,7 @@ public class BookLendService {
 	private BookLendRepository bookLendRepository;
 
 	public List<BookLend> findAll() {
-		return bookLendRepository.findBybookStatus(1);
+		return bookLendRepository.findAll();
 	}
 
 }

src/main/resources/templates/login.html

@@ -4,6 +4,7 @@
 <head>
 	<meta charset="UTF-8">
 	<title>ログイン</title>
+
 </head>
 
 <body>
@@ -16,7 +17,7 @@
 	<form th:action="@{/login}" th:object="${loginForm}" method="post">
 		<div class="form-group">
 			<label for="employeeId">社員ID</label>
-			<input id="employeeId" type="text" th:field="*{employeeId}">
+			<input id="employeeId" type="text" th:field="*{employeeId}"pattern="^[0-9]+$"title="数値以外は入力しないでください">
 			<p class="field-error" th:errors="*{employeeId}"></p>
 		</div>
 

src/main/resources/templates/topmenu.html

@@ -97,6 +97,7 @@
 	</a>
 
 	<hr>
+	</th>
 
 	<a class="card" href="/passwordChange">
 		<h3>パスワード変更</h3>
@@ -105,7 +106,7 @@
 			初期パスワードを<br> 変更します。
 		</p>
 	</a>
-	</th>
+	
 
 </body>