Merge branch 'h-hein2' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into o-matsuda

# Conflicts:
#	book-rent/src/main/resources/static/css/style.css

book-rent/src/main/java/com/example/demo/controller/AdminBookController.java

@@ -43,7 +43,8 @@ public class AdminBookController {
 	@PostMapping(NEW + "/confirm")
 	public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
 		List<String> errors = bookAdminService.validate(form);
-        if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model);
+		if (!errors.isEmpty())
+			return input(form, errors, "書籍登録", NEW, model);
 		return confirm("書籍登録", NEW, model);
 	}
 
@@ -87,7 +88,8 @@ public class AdminBookController {
 	@PostMapping(EDIT + "/confirm")
 	public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
 		List<String> errors = bookAdminService.validate(form);
-        if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model);
+		if (!errors.isEmpty())
+			return input(form, errors, "書籍編集", EDIT, model);
 		return confirm("書籍編集", EDIT, model);
 	}
 

book-rent/src/main/java/com/example/demo/controller/BookController.java

@@ -1,6 +1,5 @@
 package com.example.demo.controller;
 
- 
 import java.util.List;
 import java.util.stream.IntStream;
 
@@ -13,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import com.example.demo.entity.BookCollection;
 import com.example.demo.service.BookService;
 
- 
 /** BOOK-01：書籍検索（bookList.html） */
 @Controller
 public class BookController {
@@ -23,7 +21,6 @@ public class BookController {
 		this.bookService = bookService;
 	}
 
- 
 	/** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
 	@GetMapping("/books")
 	public String list(@RequestParam(defaultValue = "") String nmBook,
@@ -33,10 +30,8 @@ public class BookController {
 			@RequestParam(defaultValue = "10") int size,
 			Model model) {
 
-    	 Page<BookCollection> bookPage =
+		Page<BookCollection> bookPage = bookService.searchLendable(nmBook, publisher, note, page, size);
-    			 bookService.searchLendable(nmBook, publisher, note, page, size);
+		List<Integer> pageNumbers = IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
-    	 List<Integer> pageNumbers =
-    			 IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
 
 		model.addAttribute("books", bookPage);
 		model.addAttribute("bookPage", bookPage);
@@ -49,42 +44,3 @@ public class BookController {
 	}
 
 }
-//package com.example.demo.controller;
-//
-//
-//
-//
-//	
-//
-//import org.springframework.stereotype.Controller;
-//import org.springframework.ui.Model;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.RequestParam;
-//
-//import com.example.demo.service.BookService;
-//
-//
-///** BOOK-01：書籍検索（bookList.html） */
-//@Controller
-//public class BookController {
-//    private final BookService bookService;
-//
-//    public BookController(BookService bookService) {
-//        this.bookService = bookService;
-//    }
-//
-//    /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
-//    @GetMapping("/books")
-//    public String list(@RequestParam(defaultValue = "") String nmBook,
-//                       @RequestParam(defaultValue = "") String publisher,
-//                       @RequestParam(defaultValue = "") String note,
-//                       Model model) {
-//        model.addAttribute("books", bookService.searchLendable(nmBook, publisher, note));
-//        // 検索条件を保持
-//        model.addAttribute("nmBook", nmBook);
-//        model.addAttribute("publisher", publisher);
-//        model.addAttribute("note", note);
-//        return "bookList";
-//    }
-//
-//}

book-rent/src/main/java/com/example/demo/controller/EmployeeController.java

@@ -46,7 +46,8 @@ public class EmployeeController {
 	}
 
 	@PostMapping(NEW + "/confirm")
-	public String registConfirm(@ModelAttribute("form") EmployeeForm form, Model model) {
+	public String registConfirm(@ModelAttribute("form") EmployeeForm form,
+			Model model) {
 		List<String> errors = employeeService.validateRegist(form);
 		if (!errors.isEmpty())
 			return registView(form, errors, model);

book-rent/src/main/java/com/example/demo/form/EmployeeForm.java

@@ -1,5 +1,7 @@
 package com.example.demo.form;
 
+
+
 /** 社員登録・編集フォーム */
 public class EmployeeForm {
 	private Integer idEmployee;

book-rent/src/main/java/com/example/demo/repository/BookCollectionRepository.java

@@ -40,42 +40,3 @@ public interface BookCollectionRepository extends JpaRepository<BookCollection,
 	int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
 			@Param("uid") Integer uid, @Param("now") LocalDateTime now);
 }
-//package com.example.demo.repository;
-//
-//import java.time.LocalDateTime;
-//import java.util.List;
-//
-//import org.springframework.data.jpa.repository.JpaRepository;
-//import org.springframework.data.jpa.repository.Modifying;
-//import org.springframework.data.jpa.repository.Query;
-//import org.springframework.data.repository.query.Param;
-//
-//import com.example.demo.entity.BookCollection;
-//
-//public interface BookCollectionRepository extends JpaRepository<BookCollection, Integer> {
-//
-//	/**
-//	 * 貸出可の蔵書を部分一致(AND)で検索する。
-//	 * 空文字の条件は「指定なし」。LIKE の特殊文字は呼び出し側で '!' を使ってエスケープ済み。
-//	 */
-//	@Query("select b from BookCollection b "
-//			+ "where b.flgLending = :lending "
-//			+ "and (:nm = '' or b.nmBook like concat('%', :nm, '%') escape '!') "
-//			+ "and (:publisher = '' or b.publisher like concat('%', :publisher, '%') escape '!') "
-//			+ "and (:note = '' or b.note like concat('%', :note, '%') escape '!') "
-//			+ "order by b.idBook")
-//	List<BookCollection> search(@Param("lending") String lending,
-//			@Param("nm") String nm,
-//			@Param("publisher") String publisher,
-//			@Param("note") String note);
-//
-//	/**
-//	 * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。
-//	 * 戻り値が0なら、既に他の操作で状態が変わっている（状態不整合）。
-//	 */
-//	@Modifying(clearAutomatically = true, flushAutomatically = true)
-//	@Query("update BookCollection b set b.flgLending = :to, b.idUpdate = :uid, b.dateUpdate = :now "
-//			+ "where b.idBook = :id and b.flgLending = :from")
-//	int updateLending(@Param("id") Integer id, @Param("from") String from, @Param("to") String to,
-//			@Param("uid") Integer uid, @Param("now") LocalDateTime now);
-//}

book-rent/src/main/java/com/example/demo/service/BookAdminService.java

@@ -28,12 +28,20 @@ public class BookAdminService {
 	public List<String> validate(BookForm f) {
 		f.trim();
 		List<String> e = new ArrayList<>();
-        if (f.getIsbn().isEmpty()) e.add("ISBNを入力してください。");
+		if (f.getIsbn().isEmpty())
-        else if (f.getIsbn().length() > 13) e.add("ISBNは13文字以内で入力してください。");
+			e.add("ISBNを入力してください。");
-        if (f.getNmBook().isEmpty()) e.add("書籍名を入力してください。");
+		else if (f.getIsbn().length() > 13)
-        else if (f.getNmBook().length() > 50) e.add("書籍名は50文字以内で入力してください。");
+			e.add("ISBNは13文字以内で入力してください。");
-        if (f.getKnBook().length() > 100) e.add("書籍名よみは100文字以内で入力してください。");
+		if (f.getNmBook().isEmpty())
-        if (f.getPublisher().length() > 50) e.add("出版社は50文字以内で入力してください。");
+			e.add("書籍名を入力してください。");
+		else if (f.getNmBook().length() > 50)
+			e.add("書籍名は50文字以内で入力してください。");
+		if (f.getKnBook().length() > 100)
+			e.add("書籍名よみは100文字以内で入力してください。");
+		else if (!f.getKnBook().matches("^[\\u3040-\\u309F]+$"))
+			e.add("書籍名よみはひらがなで入力してください");
+		if (f.getPublisher().length() > 50)
+			e.add("出版社は50文字以内で入力してください。");
 		return e;
 	}
 
@@ -78,10 +86,10 @@ public class BookAdminService {
 
 	private void check(BookForm f) {
 		List<String> errors = validate(f);
-        if (!errors.isEmpty()) throw new BusinessException(String.join(" ", errors));
+		if (!errors.isEmpty())
+			throw new BusinessException(String.join(" ", errors));
 	}
 
-
 	private static void apply(BookCollection b, BookForm f) {
 		b.setIsbn(f.getIsbn());
 		b.setNmBook(f.getNmBook());

book-rent/src/main/java/com/example/demo/service/BookService.java

@@ -21,47 +21,15 @@ public class BookService {
 	/** 貸出可の蔵書を検索する。全て未入力なら全件。 */
 	@Transactional(readOnly = true)
 	public Page<BookCollection> searchLendable(String nmBook, String publisher, String note, int page, int size) {
-        return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note),PageRequest.of(page, size));
+		return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note),
+				PageRequest.of(page, size));
 	}
 
 	/** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
 	static String normalize(String s) {
-        if (s == null) return "";
+		if (s == null)
+			return "";
 		return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
 	}
 
- 
 }
-//package com.example.demo.service;
-//
-//import java.util.List;
-//
-//import org.springframework.stereotype.Service;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import com.example.demo.common.Const;
-//import com.example.demo.entity.BookCollection;
-//import com.example.demo.repository.BookCollectionRepository;
-//
-///** BOOK-01：書籍検索 */
-//@Service
-//public class BookService {
-//    private final BookCollectionRepository bookRepository;
-//
-//    public BookService(BookCollectionRepository bookRepository) {
-//        this.bookRepository = bookRepository;
-//    }
-//
-//    /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
-//    @Transactional(readOnly = true)
-//    public List<BookCollection> searchLendable(String nmBook, String publisher, String note) {
-//        return bookRepository.search(Const.LENDING_OK, normalize(nmBook), normalize(publisher), normalize(note));
-//    }
-//
-//    /** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
-//    static String normalize(String s) {
-//        if (s == null) return "";
-//        return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
-//    }
-//}
-//

book-rent/src/main/java/com/example/demo/service/EmployeeService.java

@@ -18,9 +18,6 @@ import com.example.demo.entity.Employee;
 import com.example.demo.form.EmployeeForm;
 import com.example.demo.repository.EmployeeRepository;
 
-
-
-
 /** EMP-01：社員登録、EMP-02：社員編集 */
 @Service
 public class EmployeeService {
@@ -110,6 +107,8 @@ public class EmployeeService {
 			e.add("社員名よみを入力してください。");
 		else if (f.getKnEmployee().length() > 100)
 			e.add("社員名よみは100文字以内で入力してください。");
+		else if (!f.getKnEmployee().matches("^[\\u3040-\\u309F]+$"))
+			e.add("社員名よみはひらがなで入力してください");
 	}
 
 	private void checkMail(EmployeeForm f, Integer selfId, List<String> e) {

book-rent/src/main/resources/static/css/style.css

@@ -1,91 +1,118 @@
-body
+body {
-{font-family:
+	font-family:
 		"Meiryo", "Hiragino Sans", sans-serif;
-	margin:0;color:#222;
+	margin: 0;
-	background:#f6f7f9}
+	color: #222;
-header.top
+	background: #f6f7f9
-{display:flex;
+}
+
+header.top {
+	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	background:#176a78;color:#fff;
+	background: #176a78;
+	color: #fff;
 	padding: 10px 20px
 }
-header.top form
+
-{display:inline;
+header.top form {
-	margin:0}
+	display: inline;
-header.top .user
+	margin: 0
-{margin-right:12px
 }
-main
+
-{max-width:960px;
+header.top .user {
+	margin-right: 12px
+}
+
+main {
+	max-width: 960px;
 	margin: 24px auto;
 	padding: 0 16px
 }
-h1
+
-{font-size:20px
+h1 {
+	font-size: 20px
 }
-.card
+
-{background:#fff;
+.card {
+	background: #fff;
 	border: 1px solid #dde;
 	border-radius: 6px;
 	padding: 20px;
 	margin-bottom: 16px
 }
-label
+
-{display:block;
+label {
+	display: block;
 	margin: 10px 0 4px;
 	font-weight: bold
 }
-input[type=text],input[type=password],input[type=email]
+
-{width:100%;
+input[type=text],
+input[type=password],
+input[type=email] {
+	width: 100%;
 	max-width: 360px;
 	padding: 6px;
 	box-sizing: border-box
 }
-button,.btn
+
-{display:inline-block;
+button,
+.btn {
+	display: inline-block;
 	background: #176a78;
-	color:#fff;border:0;
+	color: #fff;
+	border: 0;
 	border-radius: 4px;
 	padding: 7px 16px;
 	cursor: pointer;
 	text-decoration: none;
 	font-size: 14px
 }
-button.sub,.btn.sub
+
-{background:#6b7b80
+button.sub,
+.btn.sub {
+	background: #6b7b80
 }
-.error
+
-{background:#fdecea;color:#b3261e;
+.error {
+	background: #fdecea;
+	color: #b3261e;
 	border: 1px solid #f5c2be;
 	padding: 8px 12px;
 	border-radius: 4px;
 	margin-bottom: 12px
 }
-.info
+
-{background:#e8f4ea;
+.info {
+	background: #e8f4ea;
 	color: #1b5e20;
 	border: 1px solid #bfdcc3;
 	padding: 8px 12px;
 	border-radius: 4px;
 	margin-bottom: 12px
 }
-table
+
-{border-collapse:collapse;
+table {
+	border-collapse: collapse;
 	width: 100%;
 	background: #fff
 }
-th,td
+
-{border:1px solid #dde;
+th,
+td {
+	border: 1px solid #dde;
 	padding: 6px 8px;
 	text-align: left;
 	font-size: 14px
 }
-th
+
-{background:#eaf4f6
+th {
+	background: #eaf4f6
 }
-.menu a
+
-{display:block;
+.menu a {
+	display: block;
 	margin: 8px 0
 }
 
@@ -96,13 +123,18 @@ th
 		align-items: center;
 		text-align: center;
 	}
+
 	.form-content-area {
 		width: 100%;
 	}
-    input[type=text], input[type=password], input[type=email] {
+
+	input[type=text],
+	input[type=password],
+	input[type=email] {
 		max-width: 100% !important;
 	}
 }
+
 /* ページネーション */
 .page-number {
 	display: inline-block;

book-rent/src/main/resources/templates/bookInput.html

@@ -1,10 +1,12 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
+
 <head>
 	<meta charset="UTF-8">
 	<title>書籍情報入力</title>
 	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
+
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
 	<main>
@@ -21,14 +23,17 @@
 				<input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50">
 				<label for="knBook">書籍名よみ（100文字以内）</label>
 				<input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100">
+<!--				<span th:errors="${form.knBook}"></span>-->
 				<label for="publisher">出版社（50文字以内）</label>
 				<input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50">
 				<label for="note">特記事項</label>
 				<input type="text" id="note" name="note" th:value="${form.note}">
 				<p><button type="submit" th:text="${title} + '確認'">確認</button>
-         <a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a></p>
+					<a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a>
+				</p>
 			</form>
 		</div>
 	</main>
 </body>
+
 </html>

book-rent/src/main/resources/templates/bookList.html

@@ -78,70 +78,3 @@
 </body>
  
 </html>
-<!--<!DOCTYPE html>-->
-<!--<html xmlns:th="http://www.thymeleaf.org">-->
-
-<!--<head>-->
-<!--	<meta charset="UTF-8">-->
-<!--	<title>書籍一覧</title>-->
-<!--	<link rel="stylesheet" th:href="@{/css/style.css}">-->
-<!--</head>-->
-
-<!--<body>-->
-<!--	<div th:replace="~{fragments/header :: header}"></div>-->
-<!--	<main>-->
-<!--		<h1>書籍一覧</h1>-->
-<!--		<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>-->
-<!--		<div class="card">-->
-<!--			<form th:action="@{/books}" method="get">-->
-<!--				<label for="nmBook">書籍名</label>-->
-<!--				<input type="text" id="nmBook" name="nmBook" th:value="${nmBook}">-->
-<!--				<label for="publisher">出版社</label>-->
-<!--				<input type="text" id="publisher" name="publisher" th:value="${publisher}">-->
-<!--				<label for="note">特記事項</label>-->
-<!--				<input type="text" id="note" name="note" th:value="${note}">-->
-<!--				<p><button type="submit">検索</button>-->
-<!--					<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
-<!--					<a class="btn" th:if="${session.loginUser.admin}" th:href="@{/admin/books/new}">書籍新規登録</a>-->
-<!--				</p>-->
-<!--			</form>-->
-<!--		</div>-->
-
-<!--		<div class="card">-->
-<!--			<h2>検索結果</h2>-->
-<!--			<p th:if="${#lists.isEmpty(books)}">該当する書籍はありません。</p>-->
-<!--			<table th:unless="${#lists.isEmpty(books)}">-->
-<!--				<thead>-->
-<!--					<tr>-->
-<!--						<th>蔵書ID</th>-->
-<!--						<th>ISBN</th>-->
-<!--						<th>書籍名</th>-->
-<!--						<th>書籍名よみ</th>-->
-<!--						<th>出版社</th>-->
-<!--						<th>特記事項</th>-->
-<!--						<th>操作</th>-->
-<!--					</tr>-->
-<!--				</thead>-->
-<!--				<tbody>-->
-<!--					<tr th:each="b : ${books}">-->
-<!--						<td th:text="${b.idBook}"></td>-->
-<!--						<td th:text="${b.isbn}"></td>-->
-<!--						<td th:text="${b.nmBook}"></td>-->
-<!--						<td th:text="${b.knBook}"></td>-->
-<!--						<td th:text="${b.publisher}"></td>-->
-<!--						<td th:text="${b.note}"></td>-->
-<!--						<td>-->
-<!--							 一般：貸出申請(LOAN-01) ／ 管理者：編集(BOOK-03) -->
-<!--							<a class="btn" th:unless="${session.loginUser.admin}"-->
-<!--								th:href="@{/loan/apply(idBook=${b.idBook})}">貸出申請</a>-->
-<!--							<a class="btn" th:if="${session.loginUser.admin}"-->
-<!--								th:href="@{/admin/books/edit(idBook=${b.idBook})}">編集</a>-->
-<!--						</td>-->
-<!--					</tr>-->
-<!--				</tbody>-->
-<!--			</table>-->
-<!--		</div>-->
-<!--	</main>-->
-<!--</body>-->
-
-<!--</html>-->

book-rent/src/main/resources/templates/employeeRegistInput.html

@@ -37,6 +37,7 @@
 				<div>
 					<label for="knEmployee">社員名よみ</label>
 					<input type="text" id="knEmployee" th:field="*{knEmployee}">
+					<span th:errors="*{knEmployee}"></span>
 				</div>
 
 				<!-- メールアドレス -->