[edit]新規図書登録ポップアップを追加
This commit is contained in:
@@ -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.BookInsertRepository;
|
||||
import com.example.demo.repository.StorageLocationRepository;
|
||||
import com.example.demo.repository.SubCategoryRepository;
|
||||
import com.example.demo.service.BookInsertService;
|
||||
@@ -29,8 +30,13 @@ private SubCategoryRepository subCategoryRepository;
|
||||
@Autowired
|
||||
private StorageLocationRepository storageLocationRepository;
|
||||
|
||||
@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());
|
||||
@@ -44,6 +50,7 @@ private StorageLocationRepository storageLocationRepository;
|
||||
@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()));
|
||||
@@ -56,7 +63,6 @@ private StorageLocationRepository storageLocationRepository;
|
||||
return "bookInsert";
|
||||
|
||||
}
|
||||
System.out.println(bookInsert);
|
||||
bookInsertService.save(bookInsert);
|
||||
model.addAttribute("bookInsert",bookInsert);
|
||||
return "bookInsertConfirm";
|
||||
@@ -65,8 +71,9 @@ private StorageLocationRepository storageLocationRepository;
|
||||
//確認画面から「もどる」ボタンを押したら入力画面に戻る
|
||||
@PostMapping("/bookInsert")
|
||||
public String bookInsertBack(BookInsert bookInsert,Model model) {
|
||||
model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
|
||||
model.addAttribute("categoryList",categoryRepository.findAll());
|
||||
if(bookInsert.getBookCategoryId() != null) {
|
||||
if(bookInsert.getBookCategoryId() !=null) {
|
||||
model.addAttribute("subCategoryList",subCategoryRepository.findByBookCategory_BookCategoryId(bookInsert.getBookCategoryId()));
|
||||
} else{
|
||||
model.addAttribute("subCategoryList",subCategoryRepository.findAll());
|
||||
@@ -79,6 +86,7 @@ private StorageLocationRepository storageLocationRepository;
|
||||
@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());
|
||||
@@ -87,9 +95,8 @@ private StorageLocationRepository storageLocationRepository;
|
||||
return "bookInsert";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
|
||||
@@ -97,6 +104,6 @@ private StorageLocationRepository storageLocationRepository;
|
||||
//「カテゴリIDが1のサブカテゴリを取ってくる」
|
||||
//model.addAttribute("subCategoryList",取得結果)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -28,8 +28,7 @@ public class BookInsert {
|
||||
@Column(name = "title")
|
||||
private String title;
|
||||
|
||||
@Pattern(regexp = "^(?=(?:.*-){4})[0-9-]{17}$",
|
||||
message = "ISBNは半角数字(13文字)とハイフン(4つ)を含めて入力してください")
|
||||
@Pattern(regexp = "^(?=(?:.*-){4})[0-9-]{17}$",message = "ISBNは半角数字(13文字)とハイフン(4つ)を含めて入力してください")
|
||||
@Column(name = "isbn")
|
||||
private String isbn;
|
||||
|
||||
@@ -69,7 +68,7 @@ public class BookInsert {
|
||||
@Column(name = "book_approval")
|
||||
private Integer bookApproval;
|
||||
|
||||
@Transient //DB保存無効
|
||||
@Transient
|
||||
private Integer bookCategoryId;
|
||||
|
||||
|
||||
|
||||
@@ -3,9 +3,13 @@ package com.example.demo.repository;
|
||||
|
||||
|
||||
import org.springframework.data.jpa.repository.JpaRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import com.example.demo.entity.BookInsert;
|
||||
|
||||
@Repository
|
||||
public interface BookInsertRepository extends JpaRepository<BookInsert,Integer> {
|
||||
|
||||
}
|
||||
BookInsert findFirstByOrderByBookIdDesc();//bookIDが一番大きいデータを取得
|
||||
|
||||
}
|
||||
@@ -8,4 +8,5 @@ public interface BookInsertService {
|
||||
String regist(BookInsert book);
|
||||
List<BookInsert> findAll();
|
||||
void save(BookInsert bookInsert);
|
||||
}
|
||||
String createBookManageId();
|
||||
}
|
||||
@@ -12,9 +12,17 @@ import com.example.demo.repository.BookInsertRepository;
|
||||
@Service
|
||||
public class BookInsertServiceImpl implements BookInsertService {
|
||||
|
||||
@Autowired
|
||||
private BookInsertRepository bookInsertRepository;
|
||||
@Autowired
|
||||
private BookInsertRepository bookInsertRepository;
|
||||
|
||||
@Override
|
||||
public String createBookManageId() { //次に表示する図書管理IDを作る
|
||||
BookInsert book =bookInsertRepository.findFirstByOrderByBookIdDesc();
|
||||
if(book ==null){
|
||||
return "BK-1";}
|
||||
return "BK-"+(book.getBookId()+1); //いまのIDの次のIDを返す
|
||||
}
|
||||
|
||||
@Override
|
||||
public String regist(BookInsert book) {
|
||||
// DTO → エンティティへ詰め替えて保存
|
||||
@@ -33,15 +41,14 @@ import com.example.demo.repository.BookInsertRepository;
|
||||
bookInsert.setIsDeleted(0);//削除フラグ設定
|
||||
bookInsert.setBookApproval(0);//承認フラグ(承認されていないため0)
|
||||
bookInsertRepository.save(bookInsert);
|
||||
//BK〇〇〇〇形式で管理IDを作る
|
||||
String manageId="BK-" + bookInsert.getBookId();//BookId取得→BK形式に変換
|
||||
//BK-〇形式で管理IDを作る
|
||||
String manageId="BK-"+bookInsert.getBookId();//BookId取得→BK形式に変換
|
||||
bookInsert.setBookManageId(manageId);
|
||||
|
||||
bookInsertRepository.save(bookInsert);//データベースに保存
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
// ※BookService インタフェースにも List<Review> findAll(); を追加すること
|
||||
|
||||
|
||||
@@ -17,12 +17,10 @@
|
||||
|
||||
|
||||
<label for="bookmanageId">図書管理ID</label><br>
|
||||
<input type="text"
|
||||
id="bookManageId"
|
||||
placeholder="登録時に自動採番されます" readonly>
|
||||
<div style="font-size:12px; color:rgb(128, 128, 128);">
|
||||
※例:BK-1、BK-2...
|
||||
</div>
|
||||
<input type="text" id="bookManageId" th:value="${nextBookManageId}" readonly>
|
||||
<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>
|
||||
@@ -109,11 +107,9 @@
|
||||
<br><br>
|
||||
</label>-->
|
||||
|
||||
<input type="submit" value="登録" onclick="return confirm('この内容で登録しますか?');">
|
||||
|
||||
<input type="submit" value="登録" class="btn">
|
||||
</form>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
@@ -9,30 +9,6 @@
|
||||
<body>
|
||||
<h1>登録内容確認</h1>
|
||||
|
||||
|
||||
<!-- もどる: 入力中の値を持って入力画面へ -->
|
||||
<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="title" th:value="${bookInsert.title}">
|
||||
<input type="hidden" name="isbn" th:value="${bookInsert.isbn}">
|
||||
<input type="hidden" name="author" th:value="${bookInsert.author}">
|
||||
<input type="hidden" name="bookCategoryId" th:value="${bookInsert.bookCategoryId}">
|
||||
<input type="hidden" name="subcategory" th:value="${bookInsert.subcategory}">
|
||||
<input type="hidden" name="publisher" th:value="${bookInsert.publisher}">
|
||||
<input type="hidden" name="publicationDate" th:value="${bookInsert.publicationDate}">
|
||||
<input type="hidden" name="location" th:value="${bookInsert.location}">
|
||||
<input type="hidden" name="condition" th:value="${bookInsert.condition}">
|
||||
<input type="hidden" name="donor" th:value="${bookInsert.donor}">
|
||||
<input type="hidden" name="description" th:value="${bookInsert.description}">
|
||||
<button type="submit">もどる</button>
|
||||
</form>
|
||||
</form>
|
||||
<!-- 完了 -->
|
||||
<form action="/book" method="GET">
|
||||
<input type="submit" value="完了" class="btn">
|
||||
</form>
|
||||
<div id="registerModal" class="modal-overlay">
|
||||
|
||||
<div class="modal">
|
||||
|
||||
|
||||
Reference in New Issue
Block a user