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

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

@@ -1,15 +1,17 @@
 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;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 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;
 
@@ -21,13 +23,23 @@ private BookInsertService bookInsertService;
 
 @Autowired
 private BookCategoryRepository categoryRepository;
+
 @Autowired
 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());
 	    	model.addAttribute("bookInsert",new BookInsert());
 	        return "bookInsert";
 	    }
@@ -36,16 +48,37 @@ private SubCategoryRepository subCategoryRepository;
 	    
 	    // 確認画面から戻る: POSTされた入力中の値がformに入ったまま入力画面へ
 	    @PostMapping("/bookInsertConfirm")
-	    public String bookInsertConfirm(BookInsert bookInsert,Model model) {
+	    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());
+	    			}
+	    		model.addAttribute("locationList",storageLocationRepository.findAll());
+	    		model.addAttribute("bookInsert", bookInsert);
+	    		return "bookInsert";
+	    		
+	    	}
 	    	bookInsertService.save(bookInsert);
 	    	model.addAttribute("bookInsert",bookInsert);
 	        return "bookInsertConfirm";
 	    }
 	    
+	    //確認画面から「もどる」ボタンを押したら入力画面に戻る
 	    @PostMapping("/bookInsert")
 	    public String bookInsertBack(BookInsert bookInsert,Model model) {
+	    	model.addAttribute("nextBookManageId",bookInsertService.createBookManageId());
 	    	model.addAttribute("categoryList",categoryRepository.findAll());
-	    	model.addAttribute("subCategoryList",new ArrayList<>());
+	    	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("bookInsert",bookInsert);
 	        return "bookInsert";
 	    }
@@ -53,19 +86,23 @@ private SubCategoryRepository subCategoryRepository;
 	    @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";
 	    }
 	    
-	
 }
 	    
-	//画面で選択したカテゴリbookInsert.getBookCategoryId())
+
-
+
+	//画面で選択したカテゴリbookInsert.getBookCategoryId()に選択した結果をいれる
+	//subCategoryRepository.findBookCategory_BookCategoryId(bookInsert.getBookCategoryId(1)));
+	//「カテゴリIDが1のサブカテゴリを取ってくる」
+	//model.addAttribute("subCategoryList",取得結果)
 	    
 
 	   

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

@@ -3,14 +3,21 @@ package com.example.demo.controller;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 
-import com.example.demo.entity.Employee;
 import com.example.demo.repository.EmployeeRepository;
+import com.example.demo.service.BookServiceImpl;
+
+import lombok.RequiredArgsConstructor;
 
 @Controller
+@RequiredArgsConstructor
 public class BookLendController {
 	
+	@Autowired
+	private final BookServiceImpl bookServiceImpl;
+
 	@Autowired
 	private EmployeeRepository employeeRepository;
 
@@ -19,12 +26,13 @@ public class BookLendController {
 		return "bookLend";
 	}
 	
-	// 社員IDを取得してプルダウンに表示させる
+	@PostMapping("/bookLend/{id}")
-	@PostMapping("/bookLend/employeeId")
+	public String bookLend(@PathVariable int id, Model model) {
-	public String selectEmployeeId(Employee employee, Model model) {
+		System.out.println(id);
-		model.addAttribute("employeeList", employeeRepository.findByEmployeeId(employee.getEmployeeId()));
+		model.addAttribute("book", bookServiceImpl.findById(id));
-		model.addAttribute("bookLend", employee);
 		return "bookLend";
 	}
 	
+	
+
 }

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

@@ -1,8 +1,11 @@
 package com.example.demo.controller;
 
+import java.util.List;
+
 import jakarta.servlet.http.HttpSession;
 import jakarta.validation.Valid;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -11,7 +14,9 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.entity.AccountEntity;
+import com.example.demo.entity.Employee;
 import com.example.demo.form.LoginForm;
+import com.example.demo.repository.EmployeeRepository;
 import com.example.demo.service.LoginService;
 
 import lombok.RequiredArgsConstructor;
@@ -21,12 +26,20 @@ import lombok.RequiredArgsConstructor;
 public class LoginController {
 
 	private final LoginService loginService;
+	@Autowired
+	private EmployeeRepository employeeRepository;
+
 
 	// Boot起動直後にログイン画面に移動する用のメソッド
 	@GetMapping("/")
-	public String index(HttpSession session) {
+	public String index(Model model,HttpSession session) {
 		if (session.getAttribute("loginEmployee") != null) {
-			return "redirect:/topmenu";
+			if(session.getAttribute("EmployeeId") != null) {
+				
+				List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
+				model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+			}
+				return "topmenu";
 		}
 		return "redirect:/login";
 	}
@@ -34,7 +47,12 @@ public class LoginController {
 	@GetMapping("/login")
 	public String loginForm(Model model, HttpSession session) {
 		if (session.getAttribute("loginEmployee") != null) {
-			return "redirect:/topmenu";
+			if(session.getAttribute("EmployeeId") != null) {
+				
+				List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
+				model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+			}
+			return "topmenu";
 		}
 
 		model.addAttribute("loginForm", new LoginForm());
@@ -61,7 +79,13 @@ public class LoginController {
 		}
 
 		session.setAttribute("loginEmployee", accountEntity);
-		return "redirect:/topmenu";
+		
+		List<Employee> emrp = employeeRepository.findByEmployeeId(accountEntity.getEmployee().getEmployeeId());
+		model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+		session.setAttribute("EmployeeId", accountEntity.getEmployee().getEmployeeId());
+		
+
+		return "topmenu";
 	}
 	
 	// ログアウト処理
@@ -73,7 +97,13 @@ public class LoginController {
 
 	// 各画面からトップメニューへの遷移用
 	@GetMapping("/topmenu")
-	public String showTopMenu() {
+	public String showTopMenu(Model model,HttpSession session) {
+		
+		if(session.getAttribute("EmployeeId") != null) {
+			
+			List<Employee> emrp = employeeRepository.findByEmployeeId((Integer)session.getAttribute("EmployeeId") );
+			model.addAttribute("LoginName",emrp.getFirst().getEmployeeName());
+		}
 		return "topmenu";
 	}
 }

src/main/java/com/example/demo/entity/AccountEntity.java

@@ -5,6 +5,8 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 
 import lombok.Getter;
@@ -28,8 +30,9 @@ public class AccountEntity {
 	@Column(name="login_info_id")
 	private Integer loginInfoId;
 	
-	@Column(name="employee_id")
+	@ManyToOne
-	private Integer employeeId;
+	@JoinColumn(name = "employee_id")
+	private Employee employee;
 	
 	@Column(name="password_hash")
 	private String passwordHash;

src/main/java/com/example/demo/entity/BookInsert.java

@@ -8,6 +8,7 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
+import jakarta.validation.constraints.Pattern;
 
 import lombok.Data;
 
@@ -27,6 +28,7 @@ public class BookInsert {
     @Column(name = "title")
     private String title;
     
+    @Pattern(regexp = "^(?=(?:.*-){4})[0-9-]{17}$",message = "ISBNは半角数字(13文字)とハイフン(4つ)を含めて入力してください")
     @Column(name = "isbn")
     private String isbn;
     
@@ -40,7 +42,7 @@ public class BookInsert {
     private String publisher;
     
     @Column(name = "publication_date")
-    private String publicationDate;
+    private LocalDate publicationDate;
     
     @Column(name = "location_id")
     private Integer location;

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

@@ -6,6 +6,6 @@ import com.example.demo.entity.AccountEntity;
 
 public interface AccountRepository extends JpaRepository<AccountEntity,Integer>{
 	
-	AccountEntity findByEmployeeId (Integer employeeId);
+	AccountEntity findByEmployee_EmployeeId (Integer employeeId);
 
 }

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

@@ -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が一番大きいデータを取得
+
 	}

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

@@ -1,5 +1,7 @@
 package com.example.demo.repository;
 
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
@@ -8,4 +10,6 @@ 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/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> {
+
+}

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

@@ -8,4 +8,5 @@ public interface BookInsertService {
 	String regist(BookInsert book);
 	List<BookInsert> findAll();
 	void save(BookInsert bookInsert);
+	String createBookManageId(); 
 	}

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

@@ -15,6 +15,14 @@ import com.example.demo.repository.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,7 +41,7 @@ import com.example.demo.repository.BookInsertRepository;
 	    	bookInsert.setIsDeleted(0);//削除フラグ設定
 	    	bookInsert.setBookApproval(0);//承認フラグ(承認されていないため0)
 	    	bookInsertRepository.save(bookInsert);
-	    	//BK〇〇〇〇形式で管理IDを作る
+	    	//BK-〇形式で管理IDを作る
 	    	String manageId="BK-"+bookInsert.getBookId();//BookId取得→BK形式に変換
 	    	bookInsert.setBookManageId(manageId);
 	    
@@ -41,7 +49,6 @@ import com.example.demo.repository.BookInsertRepository;
 	    }
 	    }
 	
-	
-	
 	// ※BookService インタフェースにも List<Review> findAll(); を追加すること
 	
+	

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

@@ -1,14 +1,20 @@
 package com.example.demo.service;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
+import org.springframework.web.server.ResponseStatusException;
 
 import com.example.demo.entity.Book;
 import com.example.demo.repository.BookRepository;
 
+import lombok.RequiredArgsConstructor;
+
 @Service
+@RequiredArgsConstructor
 public class BookServiceImpl {
 
 	@Autowired
@@ -22,4 +28,14 @@ public class BookServiceImpl {
 		return bookRepository.searchBooks(keyword);
 	}
 
+	public Book findById(int bookId) {
+		Optional<Book> book = bookRepository.findById(bookId);
+		if (book.isEmpty()) {
+			throw new ResponseStatusException(
+					HttpStatus.NOT_FOUND, "図書情報が見つかりません");
+		}
+
+		return book.get();
+	}
+
 }

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

@@ -0,0 +1,24 @@
+package com.example.demo.service;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.example.demo.entity.Employee;
+import com.example.demo.repository.EmployeeRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class EmployeeService {
+
+	@Autowired
+	private EmployeeRepository employeeRepository;
+	
+	public List<Employee> findAll() {
+		return employeeRepository.findAll();
+	}
+	
+}

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

@@ -16,7 +16,7 @@ public class LoginService {
 	
 	public AccountEntity login(LoginForm form) {
 		AccountEntity accountEntity = 
-				accountRepository.findByEmployeeId(form.getEmployeeId());
+				accountRepository.findByEmployee_EmployeeId(form.getEmployeeId());
 		
 		if(accountEntity == null) {
 			return null;

src/main/resources/templates/book.html

@@ -8,9 +8,33 @@
 </head>
 
 <body>
+	
+	<div class="header-bar">
+
+			<div class="header-left">
+				ShareBooks
+			</div>
+
+			<div class="header-right">
+
+				<span class="user">
+					<span th:text="${session.loginEmployee.employee.employeeName}"></span>
+					(<span th:text="${session.loginEmployee.adminFlag == 1 ? '管理者' : '一般'}"></span>)
+				</span>
+
+				<a class="button-link" th:href="@{/logout}">
+					ログアウト
+				</a>
+
+			</div>
+
+		</div>
+		
 	<div class="container">
 		<h1>社内図書一覧</h1>
+
 		<div class="float-end">
+			<a th:href="@{/topmenu}">トップメニューへ</a>
 		</div>
 
 		<form class="input-group" th:action="@{/searchBooks}" th:object="${bookSearchForm}" method="get">
@@ -32,9 +56,6 @@
 		<p>※「タイトル」「出版社」「著者名」で検索</p>
 
 
-
-		<form method="get" action="bookLend">
-
 			<table class="table table-striped">
 				<thead>
 					<tr>
@@ -47,18 +68,19 @@
 						<th>カテゴリー名</th>
 						<th>サブカテゴリー名</th>
 						<th>保管場所</th>
-						<th>本の状態</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">本の状態</th>
-						<th>登録日時</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">登録日時</th>
-						<th>更新日時</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">更新日時</th>
-						<th>寄贈者</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">寄贈者</th>
 						<th>貸出状態</th>
-						<th>操作</th>
+						<th th:if="${session.loginEmployee.adminFlag == 1}">操作</th>
 					</tr>
 				</thead>
 
 				<tbody>
 					<tr th:each="book : ${book}" th:if="${book.bookManageId != null}">
 
+						<td th:hidden="*{book.bookId}"></td>
 						<td th:text="*{book.bookManageId}"></td>
 						<td th:text="*{book.isbn}"></td>
 						<td th:text="*{book.title}"></td>
@@ -68,35 +90,45 @@
 						<td th:text="*{book.bookSubcategory.bookCategory.bookCategoryName}"></td>
 						<td th:text="*{book.bookSubcategory.bookSubcategoryName}"></td>
 						<td th:text="*{book.storageLocation.locationName}"></td>
-						<td th:text="*{book.condition == 0 ? '分からない':
+						<td th:if="${session.loginEmployee.adminFlag == 1}"
+							 th:text="*{book.condition == 0 ? '分からない':
 									   book.condition == 1 ? '新品':
 									   book.condition == 2 ? '良好':
 									   book.condition == 3 ? '使用感あり':
 									   book.condition == 4 ? '痛みあり':
 								       '不明'}">
 						</td>
-						<td th:text="*{book.createdAt}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.createdAt}"></td>
-						<td th:text="*{book.updatedAt}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" th:text="*{book.updatedAt}"></td>
-						<td th:text="*{book.employee != null ? book.employee.employeeName : '-'}"></td>
+						<td th:if="${session.loginEmployee.adminFlag == 1}" 
-						<td
+							th:text="*{book.employee != null ? book.employee.employeeName : '-'}"></td>
-							th:text="*{book.bookLends != null ? (book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}">
+						<td th:text="*{book.bookLends != null ? 
-						</td>
+							(book.bookLends.bookStatus == 0 ? '貸出可': '貸出不可') : '貸出可'}"></td>
-						<td>
+						
-							<form method="post" action="/bookLend">
+						<td th:if="${session.loginEmployee.adminFlag == 1}">
-								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
+							
+							<form method="post" th:action="@{/bookLend/{id}(id=${book.bookId})}">
+								<input type="hidden" name="id" th:value="*{book.bookId}">
 								<button type="submit"
 									th:disabled="*{book.bookLends != null && book.bookLends.bookStatus == 1}">
 									貸出
 								</button>
 							</form>
+							
 							<form method="post" action="/updateconfirm">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
-								<button type="submit">更新</button>
+								<button type="submit">
+									更新
+								</button>
 							</form>
+							
 							<form method="get" action="/delete">
 								<input type="hidden" name="bookManageId" th:value="*{book.bookManageId}">
-								<button type="submit">削除</button>
+								<button type="submit">
+									削除
+								</button>
 							</form>
+							
 						</td>
 					</tr>
 
@@ -105,12 +137,11 @@
 							該当する図書がありません
 						</td>
 					</tr>
+					
 				</tbody>
 			</table>
 
-
+	</div>
-
-
 </body>
 
 </html>

src/main/resources/templates/bookInsert.html

@@ -8,46 +8,44 @@
 
 <body>
 	<h1>新規図書登録入力</h1>
-	
 	       <br>
-	       <br><br>
+	<h4>新しく図書を登録します。必要事項を入力し、「登録」ボタンを押してください。</h4>
-		   
+	<span style="color:red;">※は必須項目です</span>
+	<br>
+	<h4>図書情報</h4>
 	<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"
+				<input type="text" id="bookManageId" th:value="${nextBookManageId}" readonly>
-				       id="bookManageId"
+				<div style="font-size:12px; color:rgb(128, 128, 128);">
-				       placeholder="登録時に自動採番されます" readonly>
+				※例：BK-1、BK-2...
-				<br><br>
+				</div>
+				<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>
+	<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>
-		<br><br>
+	<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>
 	
-		<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}"
+		<select th:field="*{bookCategoryId}" onchange="this.form.action='/bookInsert/category';this.form.submit();">
-		        onchange="
+		<option value=""> 選択してください
-		            this.form.action='/bookInsert/category';
-		            this.form.submit();">
-
-		    <option value="">
-		        選択してください
 		 </option>
-
 		<option th:each="category:${categoryList}"
 		       th:value="${category.bookCategoryId}"
 		       th:text="${category.bookCategoryName}">
@@ -56,17 +54,42 @@
 		</select>
 		<br><br>
 		
-		<label for="subcategory">サブカテゴリ</label><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}">
 				    </option>
 				</select>
+				<div th:if="${#fields.hasErrors('subcategory')}" th:errors="*{subcategory}" style="color:red">
+						</div>
 		<br><br>
 		
-		<label for="publisher">主パン者</label><br>
+		<label for="location">保管場所<span style="color:red;">※</span></label><br>
+		<select th:field="*{location}" required>
+		<option value="">選択してください</option>
+			<option th:each="location:${locationList}"
+		            th:value="${location.locationId}"
+		            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="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>
 				
@@ -74,24 +97,6 @@
 				<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>
-		    <option value="1">新品同様</option>
-		    <option value="2">良好</option>
-		    <option value="3">使用感あり</option>
-		    <option value="4">傷みあり</option>
-		</select>
-		<br><br>		
-	   
 		<label for="donor">寄贈者社員ID</label><br>
 		<input type="text" id="donor" name="donor" th:value="${bookInsert.donor}">
 		<br><br>
@@ -102,11 +107,9 @@
 		<br><br>
 </label>-->
 
+<input type="submit" value="登録" onclick="return confirm('この内容で登録しますか？');">
 
-	<input type="submit" value="確認画面へ" class="btn">
 </form>
-
-
 </body>
 
 </html>

src/main/resources/templates/bookInsertConfirm.html

@@ -10,30 +10,6 @@
 	<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="category" 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">
 
 			<div class="modal-message">

src/main/resources/templates/bookLend.html

@@ -13,54 +13,37 @@
 	</h1>
 
 	<p>
-		以下の図書を貸出します。貸出先と貸出日・返却予定日を入力してください。
+		以下の図書を貸出します。貸出先の社員IDと返却予定日を入力してください。
 	</p>
 
 	<h2>
 		図書情報
 	</h2>
 
+	<form id="lendForm" action="bookLendConfirm" method="post">
+
 		<div class="card-body">
 			<table class="info-table">
+				<thead>
 					<tr>
-				<th>
+						<th>図書管理ID</th>
-					図書管理ID
+						<th>図書タイトル</th>
-				</th>
+						<th>著者名</th>
+						<th>ISBN</th>
+					</tr>
+				</thead>
 
-				<td>
+				<tbody>
-					（図書管理IDをここに表示させる）
+					<tr th:each="book : ${book}">
-				</td>
+						<td th:hidden="*{book.bookId}"></td>
+						<td th:text="*{book.bookManageId}"></td>
+						<td th:text="*{book.title}"></td>
+						<td th:text="*{book.author}"></td>
+						<td th:text="*{book.isbn}"></td>
 					</tr>
 
-			<tr>
+				</tbody>
-				<th>
-					図書タイトル
-				</th>
 
-				<td>
-					（タイトルをここに表示させる）
-				</td>
-			</tr>
-
-			<tr>
-				<th>
-					著者名
-				</th>
-
-				<td>
-					（著者名をここに表示させる）
-				</td>
-			</tr>
-
-			<tr>
-				<th>
-					ISBN
-				</th>
-
-				<td>
-					（ISBNをここに表示させる）
-				</td>
-			</tr>
 			</table>
 		</div>
 
@@ -76,34 +59,11 @@
 					社員ID
 				</label>
 
-<!--			<select th:field="*{employeeId}" onchange="this.form.action='/bookLend/employeeId';this.form.submit();">-->
+				<input type="text" id="employeeId" placeholder="社員IDを入力してください">
-
-			<select name="employeeId" id="employeeSelect">
-				
-				<option value="">
-					社員IDを選択してください
-				</option>
-
-<!--				<option th:each="employee : ${employeeList}" th:value="${employee.employeeId}">-->
-<!--				</option>-->
-
-				<option value="1">1</option>
-				<option value="2">2</option>
-				<option value="3">3</option>
-				<option value="4">4</option>
 
 				</select>
 			</div>
 
-		<div class="form-row">
-			<label for="employeeName">
-				社員名
-			</label>
-
-			<input type="text" id="employeeName" value="" placeholder="社員名が表示されます" readonly>
-
-		</div>
-
 		</div>
 
 		<h2>
@@ -115,35 +75,19 @@
 			<div class="date-box">
 
 				<label>
-				貸出日(自動取得)
+					貸出日（現在の日付が自動で設定されます。)
 				</label>
 
-			<input type="date" id="loanDate" name="loanDate" value="">
+				<p th:text="${#calendars.format(#calendars.createNowForTimeZone('Asia/Tokyo'), 
-
+				'yyyy年MM月dd日')}">
-			<div class="note">
+				</p>
-				※ 現在の日付が自動で設定されます。
-			</div>
 
 			</div>
 
 			<div class="date-box">
 
 				<label>
-				貸出期間日数
+					返却予定日（必ず指定してください。）
-			</label>
-
-			<input type="text" id="loanDays" placeholder="日数を入力してください">
-
-			<div class="note">
-				※ 数値（1以上）で入力してください。
-			</div>
-
-		</div>
-
-		<div class="date-box">
-
-			<label>
-				返却予定日（必須）
 				</label>
 
 				<input type="date" id="returnDate" name="returnDate">
@@ -160,34 +104,18 @@
 
 		</div>
 
-	<div class="warning-area">
+		<h3>
-
-		<strong>
 			注意事項
-		</strong>
+		</h3>
 
-		<ul>
+		<p>
-			<li>
 			貸出処理を行うと、対象の図書のステータスが「貸出中」に変更されます。
-			</li>
+		</p>
 
-			<li>
+		<input type="submit" name="submit" onclick="submitLend()" value="貸出する">
-				返却予定日を必ず指定してください。
+<!--		<button type="button" class="btn btn-primary" onclick="submitLend()">-->
-			</li>
-		</ul>
 
-	</div>
+		<input type="reset" name="reset" value="入力内容をクリア">
-
-	<form id="lendForm" action="bookLendConfirmation" method="post">
-		<div class="button-area">
-
-			<div class="right-buttons">
-				<button type="button" class="btn btn-primary" onclick="submitLend()">
-					貸出する
-				</button>
-			</div>
-
-		</div>
 
 	</form>
 
@@ -201,6 +129,19 @@
 			}
 		}
 
+		// カレンダーを当日以前の日付を入力できないようにする
+		const today = new Date();
+		function dateFormat(today, format) {
+			format = format.replace("YYYY", today.getFullYear());
+			format = format.replace("MM", ("0" + (today.getMonth() + 1)).slice(-2));
+			format = format.replace("DD", ("0" + today.getDate()).slice(-2));
+			return format;
+		}
+
+		const data = dateFormat(today, 'YYYY-MM-DD');
+		const field = document.getElementById('returnDate');
+		field.setAttribute("min", data);
+
 	</script>
 
 </body>

src/main/resources/templates/topmenu.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
 	
 <head>
 	<meta charset="UTF-8">
@@ -17,7 +17,7 @@
 		<div class="header-right">
 
 			<span class="user">
-				テストユーザー（一般）
+				<h1 th:text="${LoginName}"></h1>
 			</span>
 
 			<a class="button-link" th:href="@{/logout}">
@@ -61,6 +61,7 @@
 	<hr>
 
 	<!-- ===== 管理者のみ ===== -->
+	<th th:if="${session.loginEmployee.adminFlag == 1}">		
 
 		<a class="card" href="/bookInsert">
 
@@ -71,6 +72,7 @@
 		</p>
 	</a>
 	
+
 	<hr>
 
 
@@ -103,7 +105,12 @@
 			初期パスワードを<br> 変更します。
 		</p>
 	</a>
+	</th>
 
 </body>
 
+<script>
+  var admin =getElementByID
+</script>
+
 </html>