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

@@ -20,106 +20,108 @@ import com.example.demo.service.BookAdminService;
 /** BOOK-02 書籍登録 / BOOK-03 書籍編集（管理者のみ：/admin/** で拒否）。入力 → 確認 → 完了 */
 @Controller
 public class AdminBookController {
-    private static final String NEW = "/admin/books/new";
+	private static final String NEW = "/admin/books/new";
-    private static final String EDIT = "/admin/books/edit";
+	private static final String EDIT = "/admin/books/edit";
 
-    private final BookAdminService bookAdminService;
+	private final BookAdminService bookAdminService;
 
-    public AdminBookController(BookAdminService bookAdminService) {
+	public AdminBookController(BookAdminService bookAdminService) {
-        this.bookAdminService = bookAdminService;
+		this.bookAdminService = bookAdminService;
-    }
+	}
 
-    // ===== BOOK-02 登録 =====
+	// ===== BOOK-02 登録 =====
-    @GetMapping(NEW)
+	@GetMapping(NEW)
-    public String newInput(Model model) {
+	public String newInput(Model model) {
-        return input(new BookForm(), List.of(), "書籍登録", NEW, model);
+		return input(new BookForm(), List.of(), "書籍登録", NEW, model);
-    }
+	}
 
-    @PostMapping(NEW + "/input")
+	@PostMapping(NEW + "/input")
-    public String newBack(@ModelAttribute("form") BookForm form, Model model) {
+	public String newBack(@ModelAttribute("form") BookForm form, Model model) {
-        return input(form, List.of(), "書籍登録", NEW, model);
+		return input(form, List.of(), "書籍登録", NEW, model);
-    }
+	}
 
-    @PostMapping(NEW + "/confirm")
+	@PostMapping(NEW + "/confirm")
-    public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
+	public String newConfirm(@ModelAttribute("form") BookForm form, Model model) {
-        List<String> errors = bookAdminService.validate(form);
+		List<String> errors = bookAdminService.validate(form);
-        if (!errors.isEmpty()) return input(form, errors, "書籍登録", NEW, model);
+		if (!errors.isEmpty())
-        return confirm("書籍登録", NEW, model);
+			return input(form, errors, "書籍登録", NEW, model);
-    }
+		return confirm("書籍登録", NEW, model);
+	}
 
-    @PostMapping(NEW + "/execute")
+	@PostMapping(NEW + "/execute")
-    public String newExecute(@ModelAttribute("form") BookForm form,
+	public String newExecute(@ModelAttribute("form") BookForm form,
-                             @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+			@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
-                             Model model, RedirectAttributes ra) {
+			Model model, RedirectAttributes ra) {
-        try {
+		try {
-            bookAdminService.register(form, admin);
+			bookAdminService.register(form, admin);
-        } catch (BusinessException e) {
+		} catch (BusinessException e) {
-            return input(form, List.of(e.getMessage()), "書籍登録", NEW, model);
+			return input(form, List.of(e.getMessage()), "書籍登録", NEW, model);
-        }
+		}
-        ra.addFlashAttribute("message", "書籍登録が完了しました。");
+		ra.addFlashAttribute("message", "書籍登録が完了しました。");
-        return "redirect:" + NEW + "/complete";
+		return "redirect:" + NEW + "/complete";
-    }
+	}
 
-    @GetMapping(NEW + "/complete")
+	@GetMapping(NEW + "/complete")
-    public String newComplete(Model model) {
+	public String newComplete(Model model) {
-        model.addAttribute("backUrl", "/books");
+		model.addAttribute("backUrl", "/books");
-        model.addAttribute("backLabel", "書籍一覧に戻る");
+		model.addAttribute("backLabel", "書籍一覧に戻る");
-        return "complete";
+		return "complete";
-    }
+	}
 
-    // ===== BOOK-03 編集 =====
+	// ===== BOOK-03 編集 =====
-    @GetMapping(EDIT)
+	@GetMapping(EDIT)
-    public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) {
+	public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) {
-        try {
+		try {
-            BookForm form = bookAdminService.toForm(bookAdminService.find(idBook));
+			BookForm form = bookAdminService.toForm(bookAdminService.find(idBook));
-            return input(form, List.of(), "書籍編集", EDIT, model);
+			return input(form, List.of(), "書籍編集", EDIT, model);
-        } catch (BusinessException e) {
+		} catch (BusinessException e) {
-            ra.addFlashAttribute("errorMessage", e.getMessage());
+			ra.addFlashAttribute("errorMessage", e.getMessage());
-            return "redirect:/books";
+			return "redirect:/books";
-        }
+		}
-    }
+	}
 
-    @PostMapping(EDIT + "/input")
+	@PostMapping(EDIT + "/input")
-    public String editBack(@ModelAttribute("form") BookForm form, Model model) {
+	public String editBack(@ModelAttribute("form") BookForm form, Model model) {
-        return input(form, List.of(), "書籍編集", EDIT, model);
+		return input(form, List.of(), "書籍編集", EDIT, model);
-    }
+	}
 
-    @PostMapping(EDIT + "/confirm")
+	@PostMapping(EDIT + "/confirm")
-    public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
+	public String editConfirm(@ModelAttribute("form") BookForm form, Model model) {
-        List<String> errors = bookAdminService.validate(form);
+		List<String> errors = bookAdminService.validate(form);
-        if (!errors.isEmpty()) return input(form, errors, "書籍編集", EDIT, model);
+		if (!errors.isEmpty())
-        return confirm("書籍編集", EDIT, model);
+			return input(form, errors, "書籍編集", EDIT, model);
-    }
+		return confirm("書籍編集", EDIT, model);
+	}
 
-    @PostMapping(EDIT + "/execute")
+	@PostMapping(EDIT + "/execute")
-    public String editExecute(@ModelAttribute("form") BookForm form,
+	public String editExecute(@ModelAttribute("form") BookForm form,
-                              @SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
+			@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
-                              Model model, RedirectAttributes ra) {
+			Model model, RedirectAttributes ra) {
-        try {
+		try {
-            bookAdminService.update(form, admin);
+			bookAdminService.update(form, admin);
-        } catch (BusinessException e) {
+		} catch (BusinessException e) {
-            return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model);
+			return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model);
-        }
+		}
-        ra.addFlashAttribute("message", "書籍編集が完了しました。");
+		ra.addFlashAttribute("message", "書籍編集が完了しました。");
-        return "redirect:" + EDIT + "/complete";
+		return "redirect:" + EDIT + "/complete";
-    }
+	}
 
-    @GetMapping(EDIT + "/complete")
+	@GetMapping(EDIT + "/complete")
-    public String editComplete(Model model) {
+	public String editComplete(Model model) {
-        return newComplete(model);
+		return newComplete(model);
-    }
+	}
 
-    private String input(BookForm form, List<String> errors, String title, String base, Model model) {
+	private String input(BookForm form, List<String> errors, String title, String base, Model model) {
-        model.addAttribute("form", form);
+		model.addAttribute("form", form);
-        model.addAttribute("errors", errors);
+		model.addAttribute("errors", errors);
-        model.addAttribute("title", title);
+		model.addAttribute("title", title);
-        model.addAttribute("base", base);
+		model.addAttribute("base", base);
-        return "bookInput";
+		return "bookInput";
-    }
+	}
 
-    private String confirm(String title, String base, Model model) {
+	private String confirm(String title, String base, Model model) {
-        model.addAttribute("title", title);
+		model.addAttribute("title", title);
-        model.addAttribute("base", base);
+		model.addAttribute("base", base);
-        return "bookConfirm";
+		return "bookConfirm";
-    }
+	}
 }

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,78 +12,35 @@ 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 {
-    private final BookService bookService;
+	private final BookService bookService;
 
-    public BookController(BookService bookService) {
+	public BookController(BookService bookService) {
-        this.bookService = bookService;
+		this.bookService = bookService;
-    }
+	}
 
+	/** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
+	@GetMapping("/books")
+	public String list(@RequestParam(defaultValue = "") String nmBook,
+			@RequestParam(defaultValue = "") String publisher,
+			@RequestParam(defaultValue = "") String note,
+			@RequestParam(defaultValue = "0") int page,
+			@RequestParam(defaultValue = "10") int size,
+			Model model) {
 
-    /** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じURLを使う */
+		Page<BookCollection> bookPage = bookService.searchLendable(nmBook, publisher, note, page, size);
-    @GetMapping("/books")
+		List<Integer> pageNumbers = IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
-    public String list(@RequestParam(defaultValue = "") String nmBook,
-                       @RequestParam(defaultValue = "") String publisher,
-                       @RequestParam(defaultValue = "") String note,
-                       @RequestParam(defaultValue = "0") int page,
-                       @RequestParam(defaultValue = "10") int size,
-                       Model model) {
 
-    	 Page<BookCollection> bookPage =
+		model.addAttribute("books", bookPage);
-    			 bookService.searchLendable(nmBook, publisher, note, page, size);
+		model.addAttribute("bookPage", bookPage);
-    	 List<Integer> pageNumbers =
+		model.addAttribute("pageNumbers", pageNumbers);
-    			 IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
+		// 検索条件を保持
- 
+		model.addAttribute("nmBook", nmBook);
-        model.addAttribute("books", bookPage);
+		model.addAttribute("publisher", publisher);
-        model.addAttribute("bookPage", bookPage);
+		model.addAttribute("note", note);
-        model.addAttribute("pageNumbers", pageNumbers);
+		return "bookList";
-        // 検索条件を保持
+	}
-        model.addAttribute("nmBook", nmBook);
-        model.addAttribute("publisher", publisher);
-        model.addAttribute("note", note);
-        return "bookList";
-    }
 
 }
-//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

@@ -24,11 +24,11 @@ public interface BookCollectionRepository extends JpaRepository<BookCollection,
 			+ "and (:note = '' or b.note like concat('%', :note, '%') escape '!') "
 			+ "order by b.idBook")
 	Page<BookCollection> search(
-	        @Param("lending") String lending,
+			@Param("lending") String lending,
-	        @Param("nm") String nm,
+			@Param("nm") String nm,
-	        @Param("publisher") String publisher,
+			@Param("publisher") String publisher,
-	        @Param("note") String note,
+			@Param("note") String note,
-	        Pageable pageable);
+			Pageable pageable);
 
 	/**
 	 * 貸出フラグを from → to に更新する（現在値が from のときだけ更新）。
@@ -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

@@ -18,76 +18,84 @@ import com.example.demo.repository.BookCollectionRepository;
 
 @Service
 public class BookAdminService {
-    private final BookCollectionRepository bookRepository;
+	private final BookCollectionRepository bookRepository;
 
-    public BookAdminService(BookCollectionRepository bookRepository) {
+	public BookAdminService(BookCollectionRepository bookRepository) {
-        this.bookRepository = bookRepository;
+		this.bookRepository = bookRepository;
-    }
+	}
 
-    /** 入力チェック（ISBN必須13文字以内、書籍名必須50、よみ100、出版社50）。※ISBNを数字13桁に限定するかは要確認 */
+	/** 入力チェック（ISBN必須13文字以内、書籍名必須50、よみ100、出版社50）。※ISBNを数字13桁に限定するかは要確認 */
-    public List<String> validate(BookForm f) {
+	public List<String> validate(BookForm f) {
-        f.trim();
+		f.trim();
-        List<String> e = new ArrayList<>();
+		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("書籍名を入力してください。");
-        return e;
+		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;
+	}
 
-    @Transactional(readOnly = true)
+	@Transactional(readOnly = true)
-    public BookCollection find(Integer idBook) {
+	public BookCollection find(Integer idBook) {
-        return bookRepository.findById(idBook)
+		return bookRepository.findById(idBook)
-                .orElseThrow(() -> new BusinessException("対象の書籍が見つかりません。"));
+				.orElseThrow(() -> new BusinessException("対象の書籍が見つかりません。"));
-    }
+	}
 
-    public BookForm toForm(BookCollection b) {
+	public BookForm toForm(BookCollection b) {
-        BookForm f = new BookForm();
+		BookForm f = new BookForm();
-        f.setIdBook(b.getIdBook());
+		f.setIdBook(b.getIdBook());
-        f.setIsbn(b.getIsbn());
+		f.setIsbn(b.getIsbn());
-        f.setNmBook(b.getNmBook());
+		f.setNmBook(b.getNmBook());
-        f.setKnBook(b.getKnBook() == null ? "" : b.getKnBook());
+		f.setKnBook(b.getKnBook() == null ? "" : b.getKnBook());
-        f.setPublisher(b.getPublisher() == null ? "" : b.getPublisher());
+		f.setPublisher(b.getPublisher() == null ? "" : b.getPublisher());
-        f.setNote(b.getNote() == null ? "" : b.getNote());
+		f.setNote(b.getNote() == null ? "" : b.getNote());
-        return f;
+		return f;
-    }
+	}
 
-    /** 新規登録：貸出可として登録する。 */
+	/** 新規登録：貸出可として登録する。 */
-    @Transactional
+	@Transactional
-    public Integer register(BookForm f, LoginUser admin) {
+	public Integer register(BookForm f, LoginUser admin) {
-        check(f);
+		check(f);
-        BookCollection b = new BookCollection();
+		BookCollection b = new BookCollection();
-        apply(b, f);
+		apply(b, f);
-        b.setFlgLending(Const.LENDING_OK);
+		b.setFlgLending(Const.LENDING_OK);
-        b.setIdUpdate(admin.getIdEmployee());
+		b.setIdUpdate(admin.getIdEmployee());
-        b.setDateUpdate(LocalDateTime.now());
+		b.setDateUpdate(LocalDateTime.now());
-        return bookRepository.save(b).getIdBook();
+		return bookRepository.save(b).getIdBook();
-    }
+	}
 
-    /** 編集：書籍情報のみ更新する（貸出フラグは変更しない）。 */
+	/** 編集：書籍情報のみ更新する（貸出フラグは変更しない）。 */
-    @Transactional
+	@Transactional
-    public void update(BookForm f, LoginUser admin) {
+	public void update(BookForm f, LoginUser admin) {
-        check(f);
+		check(f);
-        BookCollection b = find(f.getIdBook());
+		BookCollection b = find(f.getIdBook());
-        apply(b, f);
+		apply(b, f);
-        b.setIdUpdate(admin.getIdEmployee());
+		b.setIdUpdate(admin.getIdEmployee());
-        b.setDateUpdate(LocalDateTime.now());
+		b.setDateUpdate(LocalDateTime.now());
-    }
+	}
 
-    private void check(BookForm f) {
+	private void check(BookForm f) {
-        List<String> errors = validate(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) {
-    private static void apply(BookCollection b, BookForm f) {
+		b.setIsbn(f.getIsbn());
-        b.setIsbn(f.getIsbn());
+		b.setNmBook(f.getNmBook());
-        b.setNmBook(f.getNmBook());
+		b.setKnBook(f.getKnBook().isEmpty() ? null : f.getKnBook());
-        b.setKnBook(f.getKnBook().isEmpty() ? null : f.getKnBook());
+		b.setPublisher(f.getPublisher().isEmpty() ? null : f.getPublisher());
-        b.setPublisher(f.getPublisher().isEmpty() ? null : f.getPublisher());
+		b.setNote(f.getNote().isEmpty() ? null : f.getNote());
-        b.setNote(f.getNote().isEmpty() ? null : f.getNote());
+	}
-    }
 
 }

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

@@ -12,56 +12,24 @@ import com.example.demo.repository.BookCollectionRepository;
 /** BOOK-01：書籍検索 */
 @Service
 public class BookService {
-    private final BookCollectionRepository bookRepository;
+	private final BookCollectionRepository bookRepository;
 
-    public BookService(BookCollectionRepository bookRepository) {
+	public BookService(BookCollectionRepository bookRepository) {
-        this.bookRepository = bookRepository;
+		this.bookRepository = bookRepository;
-    }
+	}
 
-    /** 貸出可の蔵書を検索する。全て未入力なら全件。 */
+	/** 貸出可の蔵書を検索する。全て未入力なら全件。 */
-    @Transactional(readOnly = true)
+	@Transactional(readOnly = true)
-    public Page<BookCollection> searchLendable(String nmBook, String publisher, String note,int page, int size) {
+	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 "";
-        return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
-    }
 
+	/** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
+	static String normalize(String s) {
+		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,121 +1,153 @@
-body
+body {
-{font-family:
+	font-family:
-	"Meiryo","Hiragino Sans",sans-serif;
+		"Meiryo", "Hiragino Sans", sans-serif;
-	margin:0;color:#222;
+	margin: 0;
-	background:#f6f7f9}
+	color: #222;
-header.top
+	background: #f6f7f9
-{display:flex;
-	justify-content:space-between;
-	align-items:center;
-	background:#176a78;color:#fff;
-	padding:10px 20px
 }
-header.top form
+
-{display:inline;
+header.top {
-	margin:0}
+	display: flex;
-header.top .user
+	justify-content: space-between;
-{margin-right:12px
+	align-items: center;
+	background: #176a78;
+	color: #fff;
+	padding: 10px 20px
 }
-main
+
-{max-width:960px;
+header.top form {
-	margin:24px auto;
+	display: inline;
-	padding:0 16px
+	margin: 0
 }
-h1
+
-{font-size:20px
+header.top .user {
+	margin-right: 12px
 }
-.card
+
-{background:#fff;
+main {
-	border:1px solid #dde;
+	max-width: 960px;
-	border-radius:6px;
+	margin: 24px auto;
-	padding:20px;
+	padding: 0 16px
-	margin-bottom:16px
 }
-label
+
-{display:block;
+h1 {
-	margin:10px 0 4px;
+	font-size: 20px
-	font-weight:bold
 }
-input[type=text],input[type=password],input[type=email]
+
-{width:100%;
+.card {
-	max-width:360px;
+	background: #fff;
-	padding:6px;
+	border: 1px solid #dde;
-	box-sizing:border-box
+	border-radius: 6px;
+	padding: 20px;
+	margin-bottom: 16px
 }
-button,.btn
+
-{display:inline-block;
+label {
-	background:#176a78;
+	display: block;
-	color:#fff;border:0;
+	margin: 10px 0 4px;
-	border-radius:4px;
+	font-weight: bold
-	padding:7px 16px;
-	cursor:pointer;
-	text-decoration:none;
-	font-size:14px
 }
-button.sub,.btn.sub
+
-{background:#6b7b80
+input[type=text],
+input[type=password],
+input[type=email] {
+	width: 100%;
+	max-width: 360px;
+	padding: 6px;
+	box-sizing: border-box
 }
-.error
+
-{background:#fdecea;color:#b3261e;
+button,
-	border:1px solid #f5c2be;
+.btn {
-	padding:8px 12px;
+	display: inline-block;
-	border-radius:4px;
+	background: #176a78;
-	margin-bottom:12px
+	color: #fff;
+	border: 0;
+	border-radius: 4px;
+	padding: 7px 16px;
+	cursor: pointer;
+	text-decoration: none;
+	font-size: 14px
 }
-.info
+
-{background:#e8f4ea;
+button.sub,
-	color:#1b5e20;
+.btn.sub {
-	border:1px solid #bfdcc3;
+	background: #6b7b80
-	padding:8px 12px;
-	border-radius:4px;
-	margin-bottom:12px
 }
-table
+
-{border-collapse:collapse;
+.error {
-	width:100%;
+	background: #fdecea;
-	background:#fff
+	color: #b3261e;
+	border: 1px solid #f5c2be;
+	padding: 8px 12px;
+	border-radius: 4px;
+	margin-bottom: 12px
 }
-th,td
+
-{border:1px solid #dde;
+.info {
-	padding:6px 8px;
+	background: #e8f4ea;
-	text-align:left;
+	color: #1b5e20;
-	font-size:14px
+	border: 1px solid #bfdcc3;
+	padding: 8px 12px;
+	border-radius: 4px;
+	margin-bottom: 12px
 }
-th
+
-{background:#eaf4f6
+table {
+	border-collapse: collapse;
+	width: 100%;
+	background: #fff
 }
-.menu a
+
-{display:block;
+th,
-	margin:8px 0
+td {
+	border: 1px solid #dde;
+	padding: 6px 8px;
+	text-align: left;
+	font-size: 14px
+}
+
+th {
+	background: #eaf4f6
+}
+
+.menu a {
+	display: block;
+	margin: 8px 0
 }
 
 /* Responsive (ဖုန်းစခရင်သေးများတွင် အောက်သို့ ဆင်းသွားစေရန်) */
 @media (max-width: 600px) {
-    .login-container-flex {
+	.login-container-flex {
-        flex-direction: column;
+		flex-direction: column;
-        align-items: center;
+		align-items: center;
-        text-align: center;
+		text-align: center;
-    }
+	}
-    .form-content-area {
+
-        width: 100%;
+	.form-content-area {
-    }
+		width: 100%;
-    input[type=text], input[type=password], input[type=email] {
+	}
-        max-width: 100% !important;
+
-    }
+	input[type=text],
+	input[type=password],
+	input[type=email] {
+		max-width: 100% !important;
+	}
 }
+
 /* ページネーション */
 .page-number {
-    display: inline-block;
+	display: inline-block;
-    background: #eaf4f6;
+	background: #eaf4f6;
-    color: #176a78;
+	color: #176a78;
-    border: 1px solid #d4e3e6;
+	border: 1px solid #d4e3e6;
-    border-radius: 4px;
+	border-radius: 4px;
-    padding: 7px 12px;
+	padding: 7px 12px;
-    margin: 2px;
+	margin: 2px;
-    text-decoration: none;
+	text-decoration: none;
-    font-size: 14px;
+	font-size: 14px;
 }
 
 .page-number:hover {
-    background: #d5edf1;
+	background: #d5edf1;
 }

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

@@ -1,34 +1,39 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
+
 <head>
-  <meta charset="UTF-8">
+	<meta charset="UTF-8">
-  <title>書籍情報入力</title>
+	<title>書籍情報入力</title>
-  <link rel="stylesheet" th:href="@{/css/style.css}">
+	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
+
 <body>
-<div th:replace="~{fragments/header :: header}"></div>
+	<div th:replace="~{fragments/header :: header}"></div>
-<main>
+	<main>
-  <h1>書籍情報入力</h1>
+		<h1>書籍情報入力</h1>
-  <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
+		<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
-  <div class="error" th:each="e : ${errors}" th:text="${e}"></div>
+		<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
-  <div class="card">
+		<div class="card">
-    <h2 th:text="${title}">書籍登録</h2>
+			<h2 th:text="${title}">書籍登録</h2>
-    <form th:action="@{${base + '/confirm'}}" method="post">
+			<form th:action="@{${base + '/confirm'}}" method="post">
-      <input type="hidden" name="idBook" th:value="${form.idBook}">
+				<input type="hidden" name="idBook" th:value="${form.idBook}">
-      <label for="isbn">ISBN（必須・13文字以内）</label>
+				<label for="isbn">ISBN（必須・13文字以内）</label>
-      <input type="text" id="isbn" name="isbn" th:value="${form.isbn}" maxlength="13">
+				<input type="text" id="isbn" name="isbn" th:value="${form.isbn}" maxlength="13">
-      <label for="nmBook">書籍名（必須・50文字以内）</label>
+				<label for="nmBook">書籍名（必須・50文字以内）</label>
-      <input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50">
+				<input type="text" id="nmBook" name="nmBook" th:value="${form.nmBook}" maxlength="50">
-      <label for="knBook">書籍名よみ（100文字以内）</label>
+				<label for="knBook">書籍名よみ（100文字以内）</label>
-      <input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100">
+				<input type="text" id="knBook" name="knBook" th:value="${form.knBook}" maxlength="100">
-      <label for="publisher">出版社（50文字以内）</label>
+<!--				<span th:errors="${form.knBook}"></span>-->
-      <input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50">
+				<label for="publisher">出版社（50文字以内）</label>
-      <label for="note">特記事項</label>
+				<input type="text" id="publisher" name="publisher" th:value="${form.publisher}" maxlength="50">
-      <input type="text" id="note" name="note" th:value="${form.note}">
+				<label for="note">特記事項</label>
-      <p><button type="submit" th:text="${title} + '確認'">確認</button>
+				<input type="text" id="note" name="note" th:value="${form.note}">
-         <a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a></p>
+				<p><button type="submit" th:text="${title} + '確認'">確認</button>
-    </form>
+					<a class="btn sub" th:href="@{/books}">書籍一覧に戻る</a>
-  </div>
+				</p>
-</main>
+			</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>
 
 				<!-- メールアドレス -->