Compare commits
6 Commits
a9c5fb2283
...
o-matsuda
| Author | SHA1 | Date | |
|---|---|---|---|
| 044a6b5609 | |||
| bc8c93d2ea | |||
| adf3ece0d2 | |||
| 309b2a2b79 | |||
| fa606e3cbf | |||
| 72bd137e8d |
@@ -1,254 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-parent</artifactId>
|
||||
<version>4.1.1</version>
|
||||
<relativePath/> <!-- lookup parent from repository -->
|
||||
</parent>
|
||||
<groupId>com.example</groupId>
|
||||
<artifactId>book-rent</artifactId>
|
||||
<version>0.0.1-SNAPSHOT</version>
|
||||
<packaging>war</packaging>
|
||||
<name>book-rent</name>
|
||||
<description/>
|
||||
<url/>
|
||||
<licenses>
|
||||
<license/>
|
||||
</licenses>
|
||||
<developers>
|
||||
<developer/>
|
||||
</developers>
|
||||
<scm>
|
||||
<connection/>
|
||||
<developerConnection/>
|
||||
<tag/>
|
||||
<url/>
|
||||
</scm>
|
||||
<properties>
|
||||
<java.version>21</java.version>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-data-jpa</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-thymeleaf</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-validation</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-web</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-security</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-devtools</artifactId>
|
||||
<scope>runtime</scope>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
<artifactId>mysql-connector-j</artifactId>
|
||||
<scope>runtime</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-tomcat</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-test</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-compile</id>
|
||||
<phase>compile</phase>
|
||||
<goals>
|
||||
<goal>compile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.18.30</version>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>default-testCompile</id>
|
||||
<phase>test-compile</phase>
|
||||
<goals>
|
||||
<goal>testCompile</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<annotationProcessorPaths>
|
||||
<path>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>1.18.30</version>
|
||||
</path>
|
||||
</annotationProcessorPaths>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
<!--<?xml version="1.0" encoding="UTF-8"?>-->
|
||||
<!--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"-->
|
||||
<!-- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">-->
|
||||
<!-- <modelVersion>4.0.0</modelVersion>-->
|
||||
<!-- <parent>-->
|
||||
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||
<!-- <artifactId>spring-boot-starter-parent</artifactId>-->
|
||||
<!-- <version>4.1.1</version>-->
|
||||
<!-- <relativePath/> lookup parent from repository -->
|
||||
<!-- </parent>-->
|
||||
<!-- <groupId>com.example</groupId>-->
|
||||
<!-- <artifactId>book-rent</artifactId>-->
|
||||
<!-- <version>0.0.1-SNAPSHOT</version>-->
|
||||
<!-- <packaging>war</packaging>-->
|
||||
<!-- <name>book-rent</name>-->
|
||||
<!-- <description/>-->
|
||||
<!-- <url/>-->
|
||||
<!-- <licenses>-->
|
||||
<!-- <license/>-->
|
||||
<!-- </licenses>-->
|
||||
<!-- <developers>-->
|
||||
<!-- <developer/>-->
|
||||
<!-- </developers>-->
|
||||
<!-- <scm>-->
|
||||
<!-- <connection/>-->
|
||||
<!-- <developerConnection/>-->
|
||||
<!-- <tag/>-->
|
||||
<!-- <url/>-->
|
||||
<!-- </scm>-->
|
||||
<!-- <properties>-->
|
||||
<!-- <java.version>21</java.version>-->
|
||||
<!-- </properties>-->
|
||||
<!-- <dependencies>-->
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>org.springframework.boot</groupId>-->
|
||||
<!--<artifactId>spring-boot-starter-data-jpa</artifactId>-->
|
||||
<!--</dependency>-->
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>org.springframework.boot</groupId>-->
|
||||
<!--<artifactId>spring-boot-starter-thymeleaf</artifactId>-->
|
||||
<!--</dependency>-->
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>org.springframework.boot</groupId>-->
|
||||
<!--<artifactId>spring-boot-starter-validation</artifactId>-->
|
||||
<!--</dependency>-->
|
||||
<!-- webmvcから通常のwebスターターに変更 -->
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>org.springframework.boot</groupId>-->
|
||||
<!--<artifactId>spring-boot-starter-web</artifactId>-->
|
||||
<!--</dependency>-->
|
||||
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>org.springframework.boot</groupId>-->
|
||||
<!--<artifactId>spring-boot-devtools</artifactId> ここを修正 -->
|
||||
<!--<scope>runtime</scope>-->
|
||||
<!--<optional>true</optional>-->
|
||||
<!--</dependency>-->
|
||||
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>com.mysql</groupId>-->
|
||||
<!--<artifactId>mysql-connector-j</artifactId>-->
|
||||
<!--<scope>runtime</scope>-->
|
||||
<!--</dependency>-->
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>org.projectlombok</groupId>-->
|
||||
<!--<artifactId>lombok</artifactId>-->
|
||||
<!--<optional>true</optional>-->
|
||||
<!--</dependency>-->
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>org.springframework.boot</groupId>-->
|
||||
<!--<artifactId>spring-boot-starter-tomcat</artifactId>-->
|
||||
<!--<scope>provided</scope>-->
|
||||
<!--</dependency>-->
|
||||
|
||||
<!--<dependency>-->
|
||||
<!--<groupId>org.springframework.boot</groupId>-->
|
||||
<!--<artifactId>spring-boot-starter-test</artifactId>-->
|
||||
<!--<scope>test</scope>-->
|
||||
<!--</dependency>-->
|
||||
<!--</dependencies>-->
|
||||
<!-- <build>-->
|
||||
<!-- <plugins>-->
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.springframework.boot</groupId>-->
|
||||
<!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
|
||||
<!-- </plugin>-->
|
||||
<!-- <plugin>-->
|
||||
<!-- <groupId>org.apache.maven.plugins</groupId>-->
|
||||
<!-- <artifactId>maven-compiler-plugin</artifactId>-->
|
||||
<!-- <executions>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <id>default-compile</id>-->
|
||||
<!-- <phase>compile</phase>-->
|
||||
<!-- <goals>-->
|
||||
<!-- <goal>compile</goal>-->
|
||||
<!-- </goals>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <annotationProcessorPaths>-->
|
||||
<!-- <path>-->
|
||||
<!-- <groupId>org.projectlombok</groupId>-->
|
||||
<!-- <artifactId>lombok</artifactId>-->
|
||||
<!-- </path>-->
|
||||
<!-- </annotationProcessorPaths>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </execution>-->
|
||||
<!-- <execution>-->
|
||||
<!-- <id>default-testCompile</id>-->
|
||||
<!-- <phase>test-compile</phase>-->
|
||||
<!-- <goals>-->
|
||||
<!-- <goal>testCompile</goal>-->
|
||||
<!-- </goals>-->
|
||||
<!-- <configuration>-->
|
||||
<!-- <annotationProcessorPaths>-->
|
||||
<!-- <path>-->
|
||||
<!-- <groupId>org.projectlombok</groupId>-->
|
||||
<!-- <artifactId>lombok</artifactId>-->
|
||||
<!-- </path>-->
|
||||
<!-- </annotationProcessorPaths>-->
|
||||
<!-- </configuration>-->
|
||||
<!-- </execution>-->
|
||||
<!-- </executions>-->
|
||||
<!-- </plugin>-->
|
||||
<!-- </plugins>-->
|
||||
<!-- </build>-->
|
||||
|
||||
<!--</project>-->
|
||||
|
||||
@@ -1,31 +1,48 @@
|
||||
package com.example.demo.common;
|
||||
|
||||
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/** セッションに保持するログイン情報（社員ID・社員名・社員名よみ・メールアドレス・管理者フラグ） */
|
||||
public class LoginUser implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private final Integer idEmployee;
|
||||
private final String nmEmployee;
|
||||
private final String knEmployee;
|
||||
private final String mailAddress;
|
||||
private final String flgAdmin;
|
||||
private final Integer idEmployee;
|
||||
private final String nmEmployee;
|
||||
private final String knEmployee;
|
||||
private final String mailAddress;
|
||||
private final String flgAdmin;
|
||||
|
||||
public LoginUser(Integer idEmployee, String nmEmployee, String knEmployee, String mailAddress, String flgAdmin) {
|
||||
this.idEmployee = idEmployee;
|
||||
this.nmEmployee = nmEmployee;
|
||||
this.knEmployee = knEmployee;
|
||||
this.mailAddress = mailAddress;
|
||||
this.flgAdmin = flgAdmin;
|
||||
}
|
||||
public LoginUser(Integer idEmployee, String nmEmployee, String knEmployee, String mailAddress, String flgAdmin) {
|
||||
this.idEmployee = idEmployee;
|
||||
this.nmEmployee = nmEmployee;
|
||||
this.knEmployee = knEmployee;
|
||||
this.mailAddress = mailAddress;
|
||||
this.flgAdmin = flgAdmin;
|
||||
|
||||
}
|
||||
|
||||
public Integer getIdEmployee() {
|
||||
return idEmployee;
|
||||
}
|
||||
|
||||
public String getNmEmployee() {
|
||||
return nmEmployee;
|
||||
}
|
||||
|
||||
public String getKnEmployee() {
|
||||
return knEmployee;
|
||||
}
|
||||
|
||||
public String getMailAddress() {
|
||||
return mailAddress;
|
||||
}
|
||||
|
||||
public String getFlgAdmin() {
|
||||
return flgAdmin;
|
||||
}
|
||||
|
||||
public boolean isAdmin() {
|
||||
return Const.ADMIN_YES.equals(flgAdmin);
|
||||
}
|
||||
|
||||
public Integer getIdEmployee() { return idEmployee; }
|
||||
public String getNmEmployee() { return nmEmployee; }
|
||||
public String getKnEmployee() { return knEmployee; }
|
||||
public String getMailAddress() { return mailAddress; }
|
||||
public String getFlgAdmin() { return flgAdmin; }
|
||||
public boolean isAdmin() { return Const.ADMIN_YES.equals(flgAdmin); }
|
||||
}
|
||||
|
||||
@@ -57,3 +57,4 @@ public class CustomAuthenticationFailureHandler extends SimpleUrlAuthenticationF
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,4 +34,5 @@ public class LoginCheckInterceptor implements HandlerInterceptor {
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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 EDIT = "/admin/books/edit";
|
||||
private static final String NEW = "/admin/books/new";
|
||||
private static final String EDIT = "/admin/books/edit";
|
||||
|
||||
private final BookAdminService bookAdminService;
|
||||
private final BookAdminService bookAdminService;
|
||||
|
||||
public AdminBookController(BookAdminService bookAdminService) {
|
||||
this.bookAdminService = bookAdminService;
|
||||
}
|
||||
public AdminBookController(BookAdminService bookAdminService) {
|
||||
this.bookAdminService = bookAdminService;
|
||||
}
|
||||
|
||||
// ===== BOOK-02 登録 =====
|
||||
@GetMapping(NEW)
|
||||
public String newInput(Model model) {
|
||||
return input(new BookForm(), List.of(), "書籍登録", NEW, model);
|
||||
}
|
||||
// ===== BOOK-02 登録 =====
|
||||
@GetMapping(NEW)
|
||||
public String newInput(Model model) {
|
||||
return input(new BookForm(), List.of(), "書籍登録", NEW, model);
|
||||
}
|
||||
|
||||
@PostMapping(NEW + "/input")
|
||||
public String newBack(@ModelAttribute("form") BookForm form, Model model) {
|
||||
return input(form, List.of(), "書籍登録", NEW, model);
|
||||
}
|
||||
@PostMapping(NEW + "/input")
|
||||
public String newBack(@ModelAttribute("form") BookForm form, Model model) {
|
||||
return input(form, List.of(), "書籍登録", NEW, model);
|
||||
}
|
||||
|
||||
@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);
|
||||
return confirm("書籍登録", NEW, model);
|
||||
}
|
||||
@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);
|
||||
return confirm("書籍登録", NEW, model);
|
||||
}
|
||||
|
||||
@PostMapping(NEW + "/execute")
|
||||
public String newExecute(@ModelAttribute("form") BookForm form,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
|
||||
Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
bookAdminService.register(form, admin);
|
||||
} catch (BusinessException e) {
|
||||
return input(form, List.of(e.getMessage()), "書籍登録", NEW, model);
|
||||
}
|
||||
ra.addFlashAttribute("message", "書籍登録が完了しました。");
|
||||
return "redirect:" + NEW + "/complete";
|
||||
}
|
||||
@PostMapping(NEW + "/execute")
|
||||
public String newExecute(@ModelAttribute("form") BookForm form,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
|
||||
Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
bookAdminService.register(form, admin);
|
||||
} catch (BusinessException e) {
|
||||
return input(form, List.of(e.getMessage()), "書籍登録", NEW, model);
|
||||
}
|
||||
ra.addFlashAttribute("message", "書籍登録が完了しました。");
|
||||
return "redirect:" + NEW + "/complete";
|
||||
}
|
||||
|
||||
@GetMapping(NEW + "/complete")
|
||||
public String newComplete(Model model) {
|
||||
model.addAttribute("backUrl", "/books");
|
||||
model.addAttribute("backLabel", "書籍一覧に戻る");
|
||||
return "complete";
|
||||
}
|
||||
@GetMapping(NEW + "/complete")
|
||||
public String newComplete(Model model) {
|
||||
model.addAttribute("backUrl", "/books");
|
||||
model.addAttribute("backLabel", "書籍一覧に戻る");
|
||||
return "complete";
|
||||
}
|
||||
|
||||
// ===== BOOK-03 編集 =====
|
||||
@GetMapping(EDIT)
|
||||
public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
BookForm form = bookAdminService.toForm(bookAdminService.find(idBook));
|
||||
return input(form, List.of(), "書籍編集", EDIT, model);
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/books";
|
||||
}
|
||||
}
|
||||
// ===== BOOK-03 編集 =====
|
||||
@GetMapping(EDIT)
|
||||
public String editInput(@RequestParam Integer idBook, Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
BookForm form = bookAdminService.toForm(bookAdminService.find(idBook));
|
||||
return input(form, List.of(), "書籍編集", EDIT, model);
|
||||
} catch (BusinessException e) {
|
||||
ra.addFlashAttribute("errorMessage", e.getMessage());
|
||||
return "redirect:/books";
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping(EDIT + "/input")
|
||||
public String editBack(@ModelAttribute("form") BookForm form, Model model) {
|
||||
return input(form, List.of(), "書籍編集", EDIT, model);
|
||||
}
|
||||
@PostMapping(EDIT + "/input")
|
||||
public String editBack(@ModelAttribute("form") BookForm form, Model model) {
|
||||
return input(form, List.of(), "書籍編集", EDIT, model);
|
||||
}
|
||||
|
||||
@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);
|
||||
return confirm("書籍編集", EDIT, model);
|
||||
}
|
||||
@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);
|
||||
return confirm("書籍編集", EDIT, model);
|
||||
}
|
||||
|
||||
@PostMapping(EDIT + "/execute")
|
||||
public String editExecute(@ModelAttribute("form") BookForm form,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
|
||||
Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
bookAdminService.update(form, admin);
|
||||
} catch (BusinessException e) {
|
||||
return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model);
|
||||
}
|
||||
ra.addFlashAttribute("message", "書籍編集が完了しました。");
|
||||
return "redirect:" + EDIT + "/complete";
|
||||
}
|
||||
@PostMapping(EDIT + "/execute")
|
||||
public String editExecute(@ModelAttribute("form") BookForm form,
|
||||
@SessionAttribute(Const.SESSION_LOGIN_USER) LoginUser admin,
|
||||
Model model, RedirectAttributes ra) {
|
||||
try {
|
||||
bookAdminService.update(form, admin);
|
||||
} catch (BusinessException e) {
|
||||
return input(form, List.of(e.getMessage()), "書籍編集", EDIT, model);
|
||||
}
|
||||
ra.addFlashAttribute("message", "書籍編集が完了しました。");
|
||||
return "redirect:" + EDIT + "/complete";
|
||||
}
|
||||
|
||||
@GetMapping(EDIT + "/complete")
|
||||
public String editComplete(Model model) {
|
||||
return newComplete(model);
|
||||
}
|
||||
@GetMapping(EDIT + "/complete")
|
||||
public String editComplete(Model model) {
|
||||
return newComplete(model);
|
||||
}
|
||||
|
||||
private String input(BookForm form, List<String> errors, String title, String base, Model model) {
|
||||
model.addAttribute("form", form);
|
||||
model.addAttribute("errors", errors);
|
||||
model.addAttribute("title", title);
|
||||
model.addAttribute("base", base);
|
||||
return "bookInput";
|
||||
}
|
||||
private String input(BookForm form, List<String> errors, String title, String base, Model model) {
|
||||
model.addAttribute("form", form);
|
||||
model.addAttribute("errors", errors);
|
||||
model.addAttribute("title", title);
|
||||
model.addAttribute("base", base);
|
||||
return "bookInput";
|
||||
}
|
||||
|
||||
private String confirm(String title, String base, Model model) {
|
||||
model.addAttribute("title", title);
|
||||
model.addAttribute("base", base);
|
||||
return "bookConfirm";
|
||||
}
|
||||
private String confirm(String title, String base, Model model) {
|
||||
model.addAttribute("title", title);
|
||||
model.addAttribute("base", base);
|
||||
return "bookConfirm";
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
this.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,
|
||||
@RequestParam(defaultValue = "0") int page,
|
||||
@RequestParam(defaultValue = "10") int size,
|
||||
Model model) {
|
||||
|
||||
/** メニューの「書籍一覧」＝条件なし（全件）、検索ボタン＝条件付きで同じ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) {
|
||||
Page<BookCollection> bookPage = bookService.searchLendable(nmBook, publisher, note, page, size);
|
||||
List<Integer> pageNumbers = IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
|
||||
|
||||
Page<BookCollection> bookPage =
|
||||
bookService.searchLendable(nmBook, publisher, note, page, size);
|
||||
List<Integer> pageNumbers =
|
||||
IntStream.range(0, bookPage.getTotalPages()).boxed().toList();
|
||||
|
||||
model.addAttribute("books", bookPage);
|
||||
model.addAttribute("bookPage", bookPage);
|
||||
model.addAttribute("pageNumbers", pageNumbers);
|
||||
// 検索条件を保持
|
||||
model.addAttribute("nmBook", nmBook);
|
||||
model.addAttribute("publisher", publisher);
|
||||
model.addAttribute("note", note);
|
||||
return "bookList";
|
||||
}
|
||||
model.addAttribute("books", bookPage);
|
||||
model.addAttribute("bookPage", bookPage);
|
||||
model.addAttribute("pageNumbers", pageNumbers);
|
||||
// 検索条件を保持
|
||||
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";
|
||||
// }
|
||||
//
|
||||
//}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -105,4 +105,5 @@ public class Employee {
|
||||
public void setDateUpdate(LocalDateTime v) {
|
||||
this.dateUpdate = v;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.example.demo.form;
|
||||
|
||||
|
||||
|
||||
/** 社員登録・編集フォーム */
|
||||
public class EmployeeForm {
|
||||
private Integer idEmployee;
|
||||
|
||||
@@ -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("nm") String nm,
|
||||
@Param("publisher") String publisher,
|
||||
@Param("note") String note,
|
||||
Pageable pageable);
|
||||
@Param("lending") String lending,
|
||||
@Param("nm") String nm,
|
||||
@Param("publisher") String publisher,
|
||||
@Param("note") String note,
|
||||
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);
|
||||
//}
|
||||
|
||||
@@ -10,4 +10,5 @@ public interface EmployeeRepository extends JpaRepository<Employee, Integer> {
|
||||
Optional<Employee> findByMailAddressAndFlgRetirement(String mailAddress, String flgRetirement);
|
||||
|
||||
Optional<Employee> findByMailAddress(String mailAddress);
|
||||
|
||||
}
|
||||
|
||||
@@ -18,78 +18,84 @@ import com.example.demo.repository.BookCollectionRepository;
|
||||
|
||||
@Service
|
||||
public class BookAdminService {
|
||||
private final BookCollectionRepository bookRepository;
|
||||
private final BookCollectionRepository bookRepository;
|
||||
|
||||
public BookAdminService(BookCollectionRepository bookRepository) {
|
||||
this.bookRepository = bookRepository;
|
||||
}
|
||||
public BookAdminService(BookCollectionRepository bookRepository) {
|
||||
this.bookRepository = bookRepository;
|
||||
}
|
||||
|
||||
/** 入力チェック（ISBN必須13文字以内、書籍名必須50、よみ100、出版社50）。※ISBNを数字13桁に限定するかは要確認 */
|
||||
public List<String> validate(BookForm f) {
|
||||
f.trim();
|
||||
List<String> e = new ArrayList<>();
|
||||
if (f.getIsbn().isEmpty()) e.add("ISBNを入力してください。");
|
||||
else if (f.getIsbn().length() > 13) e.add("ISBNは13文字以内で入力してください。");
|
||||
if (f.getNmBook().isEmpty()) e.add("書籍名を入力してください。");
|
||||
else if (f.getNmBook().length() > 50) e.add("書籍名は50文字以内で入力してください。");
|
||||
if(!f.getKnBook().matches("^[\\u3040-\\u309F]+$")) e.add("書籍名よみはひらがなで入力してください");
|
||||
else if (f.getKnBook().length() > 100) e.add("書籍名よみは100文字以内で入力してください。");
|
||||
if (f.getPublisher().length() > 50) e.add("出版社は50文字以内で入力してください。");
|
||||
/** 入力チェック（ISBN必須13文字以内、書籍名必須50、よみ100、出版社50）。※ISBNを数字13桁に限定するかは要確認 */
|
||||
public List<String> validate(BookForm f) {
|
||||
f.trim();
|
||||
List<String> e = new ArrayList<>();
|
||||
if (f.getIsbn().isEmpty())
|
||||
e.add("ISBNを入力してください。");
|
||||
else if (f.getIsbn().length() > 13)
|
||||
e.add("ISBNは13文字以内で入力してください。");
|
||||
if (f.getNmBook().isEmpty())
|
||||
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;
|
||||
}
|
||||
|
||||
return e;
|
||||
}
|
||||
@Transactional(readOnly = true)
|
||||
public BookCollection find(Integer idBook) {
|
||||
return bookRepository.findById(idBook)
|
||||
.orElseThrow(() -> new BusinessException("対象の書籍が見つかりません。"));
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
public BookCollection find(Integer idBook) {
|
||||
return bookRepository.findById(idBook)
|
||||
.orElseThrow(() -> new BusinessException("対象の書籍が見つかりません。"));
|
||||
}
|
||||
public BookForm toForm(BookCollection b) {
|
||||
BookForm f = new BookForm();
|
||||
f.setIdBook(b.getIdBook());
|
||||
f.setIsbn(b.getIsbn());
|
||||
f.setNmBook(b.getNmBook());
|
||||
f.setKnBook(b.getKnBook() == null ? "" : b.getKnBook());
|
||||
f.setPublisher(b.getPublisher() == null ? "" : b.getPublisher());
|
||||
f.setNote(b.getNote() == null ? "" : b.getNote());
|
||||
return f;
|
||||
}
|
||||
|
||||
public BookForm toForm(BookCollection b) {
|
||||
BookForm f = new BookForm();
|
||||
f.setIdBook(b.getIdBook());
|
||||
f.setIsbn(b.getIsbn());
|
||||
f.setNmBook(b.getNmBook());
|
||||
f.setKnBook(b.getKnBook() == null ? "" : b.getKnBook());
|
||||
f.setPublisher(b.getPublisher() == null ? "" : b.getPublisher());
|
||||
f.setNote(b.getNote() == null ? "" : b.getNote());
|
||||
return f;
|
||||
}
|
||||
/** 新規登録：貸出可として登録する。 */
|
||||
@Transactional
|
||||
public Integer register(BookForm f, LoginUser admin) {
|
||||
check(f);
|
||||
BookCollection b = new BookCollection();
|
||||
apply(b, f);
|
||||
b.setFlgLending(Const.LENDING_OK);
|
||||
b.setIdUpdate(admin.getIdEmployee());
|
||||
b.setDateUpdate(LocalDateTime.now());
|
||||
return bookRepository.save(b).getIdBook();
|
||||
}
|
||||
|
||||
/** 新規登録：貸出可として登録する。 */
|
||||
@Transactional
|
||||
public Integer register(BookForm f, LoginUser admin) {
|
||||
check(f);
|
||||
BookCollection b = new BookCollection();
|
||||
apply(b, f);
|
||||
b.setFlgLending(Const.LENDING_OK);
|
||||
b.setIdUpdate(admin.getIdEmployee());
|
||||
b.setDateUpdate(LocalDateTime.now());
|
||||
return bookRepository.save(b).getIdBook();
|
||||
}
|
||||
/** 編集：書籍情報のみ更新する（貸出フラグは変更しない）。 */
|
||||
@Transactional
|
||||
public void update(BookForm f, LoginUser admin) {
|
||||
check(f);
|
||||
BookCollection b = find(f.getIdBook());
|
||||
apply(b, f);
|
||||
b.setIdUpdate(admin.getIdEmployee());
|
||||
b.setDateUpdate(LocalDateTime.now());
|
||||
}
|
||||
|
||||
/** 編集：書籍情報のみ更新する（貸出フラグは変更しない）。 */
|
||||
@Transactional
|
||||
public void update(BookForm f, LoginUser admin) {
|
||||
check(f);
|
||||
BookCollection b = find(f.getIdBook());
|
||||
apply(b, f);
|
||||
b.setIdUpdate(admin.getIdEmployee());
|
||||
b.setDateUpdate(LocalDateTime.now());
|
||||
}
|
||||
private void check(BookForm f) {
|
||||
List<String> errors = validate(f);
|
||||
if (!errors.isEmpty())
|
||||
throw new BusinessException(String.join(" ", errors));
|
||||
}
|
||||
|
||||
private void check(BookForm f) {
|
||||
List<String> errors = validate(f);
|
||||
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());
|
||||
b.setKnBook(f.getKnBook().isEmpty() ? null : f.getKnBook());
|
||||
b.setPublisher(f.getPublisher().isEmpty() ? null : f.getPublisher());
|
||||
b.setNote(f.getNote().isEmpty() ? null : f.getNote());
|
||||
}
|
||||
private static void apply(BookCollection b, BookForm f) {
|
||||
b.setIsbn(f.getIsbn());
|
||||
b.setNmBook(f.getNmBook());
|
||||
b.setKnBook(f.getKnBook().isEmpty() ? null : f.getKnBook());
|
||||
b.setPublisher(f.getPublisher().isEmpty() ? null : f.getPublisher());
|
||||
b.setNote(f.getNote().isEmpty() ? null : f.getNote());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
this.bookRepository = bookRepository;
|
||||
}
|
||||
public BookService(BookCollectionRepository bookRepository) {
|
||||
this.bookRepository = bookRepository;
|
||||
}
|
||||
|
||||
/** 貸出可の蔵書を検索する。全て未入力なら全件。 */
|
||||
@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));
|
||||
}
|
||||
|
||||
/** 前後の空白除去＋LIKE特殊文字(! % _)のエスケープ（エスケープ文字は '!'） */
|
||||
static String normalize(String s) {
|
||||
if (s == null) return "";
|
||||
return s.trim().replace("!", "!!").replace("%", "!%").replace("_", "!_");
|
||||
}
|
||||
/** 貸出可の蔵書を検索する。全て未入力なら全件。 */
|
||||
@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));
|
||||
}
|
||||
|
||||
/** 前後の空白除去＋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("_", "!_");
|
||||
// }
|
||||
//}
|
||||
//
|
||||
|
||||
@@ -1,129 +1,153 @@
|
||||
/* ----------------------------------------------------
|
||||
Login Layout & Animation Styles (Updated)
|
||||
---------------------------------------------------- */
|
||||
body {
|
||||
font-family: "Meiryo", "Hiragino Sans", sans-serif;
|
||||
margin: 0;
|
||||
color: #222;
|
||||
background: #f6f7f9;
|
||||
font-family:
|
||||
"Meiryo", "Hiragino Sans", sans-serif;
|
||||
margin: 0;
|
||||
color: #222;
|
||||
background: #f6f7f9
|
||||
}
|
||||
|
||||
header.top {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
background: #176a78;
|
||||
color: #fff;
|
||||
padding: 10px 20px;
|
||||
}
|
||||
header.top form { display: inline; margin: 0; }
|
||||
header.top .user { margin-right: 12px; }
|
||||
main { max-width: 960px; margin: 24px auto; padding: 0 16px; }
|
||||
h1 { font-size: 20px; }
|
||||
.card { background: #fff; border: 1px solid #dde; border-radius: 6px; padding: 20px; margin-bottom: 16px; }
|
||||
label { display: block; margin: 10px 0 4px; font-weight: bold; }
|
||||
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; background: #176a78; color: #fff; border: 0; border-radius: 4px; padding: 7px 16px; cursor: pointer; text-decoration: none; font-size: 14px; }
|
||||
button.sub, .btn.sub { background: #6b7b80; }
|
||||
.error { background: #fdecea; color: #b3261e; border: 1px solid #f5c2be; padding: 8px 12px; border-radius: 4px; margin-bottom: 12px; }
|
||||
.info { background: #e8f4ea; color: #1b5e20; border: 1px solid #bfdcc3; padding: 8px 12px; border-radius: 4px; margin-bottom: 12px; }
|
||||
table { border-collapse: collapse; width: 100%; background: #fff; }
|
||||
th, td { border: 1px solid #dde; padding: 6px 8px; text-align: left; font-size: 14px; }
|
||||
th { background: #eaf4f6; }
|
||||
.menu a { display: block; margin: 8px 0; }
|
||||
|
||||
/* Flexbox Layout: ဘယ်ဘက် Icon နှင့် ညာဘက် Login အချက်အလက်များ ဘေးချင်းယှဉ်ရန် */
|
||||
.login-container-flex {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 35px; /* Icon နှင့် Form ကြား အကွာအဝေး */
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
background: #176a78;
|
||||
color: #fff;
|
||||
padding: 10px 20px
|
||||
}
|
||||
|
||||
/* ဘယ်ဘက်ခြမ်း Icon Box Styling */
|
||||
.avatar-box {
|
||||
flex-shrink: 0;
|
||||
width: 90px;
|
||||
height: 90px;
|
||||
background: #eaf4f6;
|
||||
border-radius: 50%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
transition: all 0.4s ease;
|
||||
cursor: pointer;
|
||||
margin-top: 5px;
|
||||
header.top form {
|
||||
display: inline;
|
||||
margin: 0
|
||||
}
|
||||
|
||||
.avatar-box:hover {
|
||||
transform: scale(1.08);
|
||||
background: #d5edf1;
|
||||
header.top .user {
|
||||
margin-right: 12px
|
||||
}
|
||||
|
||||
/* ညာဘက်ခြမ်း Form Area ကို အပြည့်အသုံးပြုရန် */
|
||||
.form-content-area {
|
||||
flex-grow: 1;
|
||||
main {
|
||||
max-width: 960px;
|
||||
margin: 24px auto;
|
||||
padding: 0 16px
|
||||
}
|
||||
|
||||
/* 1. FALSE / ERROR State (တုန်ခါမည်) */
|
||||
.card.shake {
|
||||
animation: shake 0.4s ease-in-out;
|
||||
h1 {
|
||||
font-size: 20px
|
||||
}
|
||||
|
||||
.avatar-box.error-state {
|
||||
background: #fdecea !important;
|
||||
animation: pulseError 0.4s ease-in-out;
|
||||
.card {
|
||||
background: #fff;
|
||||
border: 1px solid #dde;
|
||||
border-radius: 6px;
|
||||
padding: 20px;
|
||||
margin-bottom: 16px
|
||||
}
|
||||
|
||||
@keyframes shake {
|
||||
0%, 100% { transform: translateX(0); }
|
||||
20%, 60% { transform: translateX(-8px); }
|
||||
40%, 80% { transform: translateX(8px); }
|
||||
label {
|
||||
display: block;
|
||||
margin: 10px 0 4px;
|
||||
font-weight: bold
|
||||
}
|
||||
|
||||
@keyframes pulseError {
|
||||
0% { transform: scale(1); }
|
||||
50% { transform: scale(1.15); }
|
||||
100% { transform: scale(1); }
|
||||
input[type=text],
|
||||
input[type=password],
|
||||
input[type=email] {
|
||||
width: 100%;
|
||||
max-width: 360px;
|
||||
padding: 6px;
|
||||
box-sizing: border-box
|
||||
}
|
||||
|
||||
/* 2. TRUE / SUCCESS State (အောင်မြင်မှု Animation) */
|
||||
.avatar-box.success-state {
|
||||
background: #e8f4ea !important;
|
||||
animation: successFly 0.6s ease-in-out forwards;
|
||||
button,
|
||||
.btn {
|
||||
display: inline-block;
|
||||
background: #176a78;
|
||||
color: #fff;
|
||||
border: 0;
|
||||
border-radius: 4px;
|
||||
padding: 7px 16px;
|
||||
cursor: pointer;
|
||||
text-decoration: none;
|
||||
font-size: 14px
|
||||
}
|
||||
|
||||
@keyframes successFly {
|
||||
0% { transform: scale(1); }
|
||||
40% { transform: scale(1.2) translateY(-8px); }
|
||||
100% { transform: scale(0.9) translateY(-20px); opacity: 0.8; }
|
||||
button.sub,
|
||||
.btn.sub {
|
||||
background: #6b7b80
|
||||
}
|
||||
|
||||
.error {
|
||||
background: #fdecea;
|
||||
color: #b3261e;
|
||||
border: 1px solid #f5c2be;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
margin-bottom: 12px
|
||||
}
|
||||
|
||||
.info {
|
||||
background: #e8f4ea;
|
||||
color: #1b5e20;
|
||||
border: 1px solid #bfdcc3;
|
||||
padding: 8px 12px;
|
||||
border-radius: 4px;
|
||||
margin-bottom: 12px
|
||||
}
|
||||
|
||||
table {
|
||||
border-collapse: collapse;
|
||||
width: 100%;
|
||||
background: #fff
|
||||
}
|
||||
|
||||
th,
|
||||
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 {
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
}
|
||||
.form-content-area {
|
||||
width: 100%;
|
||||
}
|
||||
input[type=text], input[type=password], input[type=email] {
|
||||
max-width: 100% !important;
|
||||
}
|
||||
.login-container-flex {
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.form-content-area {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
input[type=text],
|
||||
input[type=password],
|
||||
input[type=email] {
|
||||
max-width: 100% !important;
|
||||
}
|
||||
}
|
||||
|
||||
/* ページネーション */
|
||||
.page-number {
|
||||
display: inline-block;
|
||||
background: #eaf4f6;
|
||||
color: #176a78;
|
||||
border: 1px solid #d4e3e6;
|
||||
border-radius: 4px;
|
||||
padding: 7px 12px;
|
||||
margin: 2px;
|
||||
text-decoration: none;
|
||||
font-size: 14px;
|
||||
display: inline-block;
|
||||
background: #eaf4f6;
|
||||
color: #176a78;
|
||||
border: 1px solid #d4e3e6;
|
||||
border-radius: 4px;
|
||||
padding: 7px 12px;
|
||||
margin: 2px;
|
||||
text-decoration: none;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
.page-number:hover {
|
||||
background: #d5edf1;
|
||||
background: #d5edf1;
|
||||
}
|
||||
@@ -1,34 +1,39 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>書籍情報入力</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
<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="error" th:each="e : ${errors}" th:text="${e}"></div>
|
||||
<div class="card">
|
||||
<h2 th:text="${title}">書籍登録</h2>
|
||||
<form th:action="@{${base + '/confirm'}}" method="post">
|
||||
<input type="hidden" name="idBook" th:value="${form.idBook}">
|
||||
<label for="isbn">ISBN（必須・13文字以内）</label>
|
||||
<input type="text" id="isbn" name="isbn" th:value="${form.isbn}" maxlength="13">
|
||||
<label for="nmBook">書籍名（必須・50文字以内）</label>
|
||||
<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">
|
||||
<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>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
<div th:replace="~{fragments/header :: header}"></div>
|
||||
<main>
|
||||
<h1>書籍情報入力</h1>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<div class="error" th:each="e : ${errors}" th:text="${e}"></div>
|
||||
<div class="card">
|
||||
<h2 th:text="${title}">書籍登録</h2>
|
||||
<form th:action="@{${base + '/confirm'}}" method="post">
|
||||
<input type="hidden" name="idBook" th:value="${form.idBook}">
|
||||
<label for="isbn">ISBN（必須・13文字以内）</label>
|
||||
<input type="text" id="isbn" name="isbn" th:value="${form.isbn}" maxlength="13">
|
||||
<label for="nmBook">書籍名（必須・50文字以内）</label>
|
||||
<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>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</body>
|
||||
|
||||
</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>-->
|
||||
@@ -37,6 +37,7 @@
|
||||
<div>
|
||||
<label for="knEmployee">社員名よみ</label>
|
||||
<input type="text" id="knEmployee" th:field="*{knEmployee}">
|
||||
<span th:errors="*{knEmployee}"></span>
|
||||
</div>
|
||||
|
||||
<!-- メールアドレス -->
|
||||
|
||||
@@ -1,117 +1,123 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns:th="http://www.thymeleaf.org">
|
||||
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>ログイン</title>
|
||||
|
||||
<!-- Lordicon Script -->
|
||||
<script src="https://cdn.lordicon.com/lordicon.js"></script>
|
||||
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
<meta charset="UTF-8">
|
||||
<title>ログイン</title>
|
||||
<link rel="stylesheet" th:href="@{/css/style.css}">
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<main>
|
||||
<h1>書籍貸出管理システム</h1>
|
||||
<div class="card" id="loginCard">
|
||||
|
||||
<!-- Main Flex Container: ဘယ်ဘက် Icon နှင့် ညာဘက် Form Area ကို ဘေးချင်းယှဉ်ရန် -->
|
||||
<div class="login-container-flex">
|
||||
|
||||
<!-- ဘယ်ဘက်ခြမ်းရှိ Lordicon Avatar Box -->
|
||||
<div class="avatar-box" id="avatarBox">
|
||||
<lord-icon
|
||||
id="lordIcon"
|
||||
src="https://cdn.lordicon.com/dxjqoygy.json"
|
||||
trigger="hover"
|
||||
colors="primary:#176a78,secondary:#08a88a"
|
||||
style="width:90px;height:90px">
|
||||
</lord-icon>
|
||||
</div>
|
||||
|
||||
<!-- ညာဘက်ခြမ်းရှိ Login Content (ခေါင်းစဉ်နှင့် Form အားလုံး ပါဝင်သည်) -->
|
||||
<div class="form-content-area">
|
||||
<h2>ログイン</h2>
|
||||
|
||||
<!-- Error Message -->
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
|
||||
<form th:action="@{/login}" method="post" id="loginForm">
|
||||
<label for="mailAddress">メールアドレス</label>
|
||||
<input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}" autocomplete="username">
|
||||
|
||||
<label for="password">パスワード</label>
|
||||
<input type="password" id="password" name="password" autocomplete="current-password">
|
||||
|
||||
<p><button type="submit">ログイン</button></p>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</main>
|
||||
|
||||
<script>
|
||||
const loginCard = document.getElementById('loginCard');
|
||||
const lordIcon = document.getElementById('lordIcon');
|
||||
const avatarBox = document.getElementById('avatarBox');
|
||||
const errorDiv = document.querySelector('.error');
|
||||
const loginForm = document.getElementById('loginForm');
|
||||
|
||||
// 1. Icon နှိပ်လျှင် Animation လှုပ်ရှားရန်
|
||||
if (lordIcon) {
|
||||
lordIcon.addEventListener('click', () => {
|
||||
lordIcon.setAttribute('trigger', 'morph');
|
||||
setTimeout(() => {
|
||||
lordIcon.setAttribute('trigger', 'hover');
|
||||
}, 1000);
|
||||
});
|
||||
}
|
||||
|
||||
// 2. Login မှားယွင်းသောအခါ (False / Error) -> Card Shake Animation & Icon Color Change
|
||||
if (errorDiv) {
|
||||
loginCard.classList.add('shake');
|
||||
if (avatarBox) {
|
||||
avatarBox.classList.add('error-state');
|
||||
}
|
||||
if (lordIcon) {
|
||||
lordIcon.setAttribute('colors', 'primary:#b3261e,secondary:#f5c2be');
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Login နှိပ်လိုက်ချိန် (True / Success Animation State)
|
||||
if (loginForm) {
|
||||
loginForm.addEventListener('submit', function(e) {
|
||||
if (avatarBox && lordIcon) {
|
||||
avatarBox.classList.add('success-state');
|
||||
lordIcon.setAttribute('colors', 'primary:#1b5e20,secondary:#81c784');
|
||||
}
|
||||
});
|
||||
}
|
||||
</script>
|
||||
<main>
|
||||
<h1>書籍貸出管理システム</h1>
|
||||
<div class="card">
|
||||
<h2>ログイン</h2>
|
||||
<div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>
|
||||
<form th:action="@{/login}" method="post">
|
||||
<label for="mailAddress">メールアドレス</label>
|
||||
<input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}"
|
||||
autocomplete="username">
|
||||
<label for="password">パスワード</label>
|
||||
<input type="password" id="password" name="password" autocomplete="current-password">
|
||||
<p><button type="submit">ログイン</button></p>
|
||||
</form>
|
||||
</div>
|
||||
</main>
|
||||
</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>-->
|
||||
<!-- <meta charset="UTF-8">-->
|
||||
<!-- <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
|
||||
|
||||
<!-- 外部スクリプトの読み込み -->
|
||||
<!-- <script th:src="@{/js/common.js}"></script>-->
|
||||
|
||||
<!-- CSSの読み込み -->
|
||||
<!-- <link rel="stylesheet" th:href="@{/css/all.css}" type="text/css">-->
|
||||
<!-- <link rel="stylesheet" th:href="@{/css/style.css}" type="text/css">-->
|
||||
|
||||
<!-- <title>ログイン</title>-->
|
||||
<!--</head>-->
|
||||
|
||||
<!--<body>-->
|
||||
<!--<main>-->
|
||||
<!-- <h1>書籍貸出管理システム</h1>-->
|
||||
<!-- <div class="card">-->
|
||||
<!-- <h2>ログイン</h2>-->
|
||||
<!-- <div class="error" th:if="${errorMessage}" th:text="${errorMessage}"></div>-->
|
||||
<!-- <form th:action="@{/login}" method="post">-->
|
||||
<!-- <label for="mailAddress">メールアドレス</label>-->
|
||||
<!-- <input type="text" id="mailAddress" name="mailAddress" th:value="${mailAddress}" autocomplete="username">-->
|
||||
<!-- <label for="password">パスワード</label>-->
|
||||
<!-- <input type="password" id="password" name="password" autocomplete="current-password">-->
|
||||
<!-- <p><button type="submit">ログイン</button></p>-->
|
||||
<!-- </form>-->
|
||||
<!-- </div>-->
|
||||
<!--</main>-->
|
||||
|
||||
<!-- <div class="loginContainer">-->
|
||||
|
||||
<!-- <h1>ログイン</h1>-->
|
||||
|
||||
<!-- <form th:action="@{/doLogin}"-->
|
||||
<!-- method="post"-->
|
||||
<!-- th:object="${loginInfoForm}">-->
|
||||
|
||||
<!-- エラーメッセージ -->
|
||||
<!-- <div class="msgBox error"-->
|
||||
<!-- th:if="${messageError != null}">-->
|
||||
<!-- <span class="error"-->
|
||||
<!-- th:text="${messageError.message}"></span>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<!-- <table>-->
|
||||
<!-- メールアドレス -->
|
||||
<!-- <tr>-->
|
||||
<!-- <th class="header">メールアドレス</th>-->
|
||||
<!-- <td>-->
|
||||
<!-- <input-->
|
||||
<!-- id="mailAddress"-->
|
||||
<!-- type="text"-->
|
||||
<!-- th:field="*{mailAddress}"-->
|
||||
<!-- placeholder="メールアドレス"-->
|
||||
<!-- required-->
|
||||
<!-- />-->
|
||||
<!-- </td>-->
|
||||
<!-- </tr>-->
|
||||
|
||||
<!-- パスワード -->
|
||||
<!-- <tr>-->
|
||||
<!-- <th class="header">パスワード</th>-->
|
||||
<!-- <td>-->
|
||||
<!-- <input-->
|
||||
<!-- id="password"-->
|
||||
<!-- type="password"-->
|
||||
<!-- th:field="*{password}"-->
|
||||
<!-- placeholder="パスワード"-->
|
||||
<!-- required-->
|
||||
<!-- />-->
|
||||
<!-- </td>-->
|
||||
<!-- </tr>-->
|
||||
|
||||
<!-- ボタン -->
|
||||
<!-- <tr>-->
|
||||
<!-- <td class="btnArea" colspan="2">-->
|
||||
<!-- <input-->
|
||||
<!-- type="submit"-->
|
||||
<!-- value="ログイン"-->
|
||||
<!-- />-->
|
||||
|
||||
<!-- <button-->
|
||||
<!-- type="button"-->
|
||||
<!-- onclick="clearInput()">-->
|
||||
<!-- リセット-->
|
||||
<!-- </button>-->
|
||||
<!-- </td>-->
|
||||
<!-- </tr>-->
|
||||
<!-- </table>-->
|
||||
|
||||
<!-- </form>-->
|
||||
|
||||
<!-- </div>-->
|
||||
|
||||
<!-- 入力内容のリセット -->
|
||||
<!-- <script>-->
|
||||
<!-- function clearInput() {-->
|
||||
<!-- document.getElementById('mailAddress').value = '';-->
|
||||
<!-- document.getElementById('password').value = '';-->
|
||||
<!-- }-->
|
||||
<!-- </script>-->
|
||||
|
||||
<!--</body>-->
|
||||
<!--</html>-->
|
||||
Reference in New Issue
Block a user