diff --git a/book-rent/pom.xml b/book-rent/pom.xml
index 7f1eeac..606ba8b 100644
--- a/book-rent/pom.xml
+++ b/book-rent/pom.xml
@@ -30,67 +30,54 @@
21
-
-
- org.springframework.boot
- spring-boot-starter-data-jpa
-
-
- org.springframework.boot
- spring-boot-starter-thymeleaf
-
-
- org.springframework.boot
- spring-boot-starter-validation
-
-
- org.springframework.boot
- spring-boot-starter-webmvc
-
-
-
- org.springframework.boot
- spring-boot-devtools
- runtime
- true
-
-
- com.mysql
- mysql-connector-j
- runtime
-
-
- org.projectlombok
- lombok
- true
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
- provided
-
-
- org.springframework.boot
- spring-boot-starter-data-jpa-test
- test
-
-
- org.springframework.boot
- spring-boot-starter-thymeleaf-test
- test
-
-
- org.springframework.boot
- spring-boot-starter-validation-test
- test
-
-
- org.springframework.boot
- spring-boot-starter-webmvc-test
- test
-
-
+
+
+org.springframework.boot
+spring-boot-starter-data-jpa
+
+
+org.springframework.boot
+spring-boot-starter-thymeleaf
+
+
+org.springframework.boot
+spring-boot-starter-validation
+
+
+
+org.springframework.boot
+spring-boot-starter-web
+
+
+
+org.springframework.boot
+spring-boot-devtools
+runtime
+true
+
+
+com.mysql
+mysql-connector-j
+runtime
+
+
+org.projectlombok
+lombok
+true
+
+
+org.springframework.boot
+spring-boot-starter-tomcat
+provided
+
+
+
+org.springframework.boot
+spring-boot-starter-test
+test
+
+
@@ -135,5 +122,6 @@
-
+
+
diff --git a/book-rent/src/main/java/com/example/demo/controller/LoginController.java b/book-rent/src/main/java/com/example/demo/controller/LoginController.java
index 81c8dfc..0423fa5 100644
--- a/book-rent/src/main/java/com/example/demo/controller/LoginController.java
+++ b/book-rent/src/main/java/com/example/demo/controller/LoginController.java
@@ -1,6 +1,6 @@
package com.example.demo.controller;
-
-
+
+
import java.util.Optional;
import jakarta.servlet.http.HttpServletRequest;
@@ -15,21 +15,21 @@ import org.springframework.web.bind.annotation.RequestParam;
import com.example.demo.common.Const;
import com.example.demo.common.LoginUser;
import com.example.demo.service.AuthService;
-
+
/** AUTH-01:ログイン/ログアウト(login.html) */
@Controller
public class LoginController {
private final AuthService authService;
-
+
public LoginController(AuthService authService) {
this.authService = authService;
}
-
+
@GetMapping("/")
public String root() {
return "redirect:/menu";
}
-
+
@GetMapping("/login")
public String loginForm(HttpSession session) {
if (session.getAttribute(Const.SESSION_LOGIN_USER) != null) {
@@ -37,14 +37,14 @@ public class LoginController {
}
return "login";
}
-
+
@PostMapping("/login")
public String login(@RequestParam(defaultValue = "") String mailAddress,
@RequestParam(defaultValue = "") String password,
HttpServletRequest request, Model model) {
String mail = mailAddress.trim();
model.addAttribute("mailAddress", mail); // 入力値を保持(パスワードは保持しない)
-
+
if (mail.isEmpty() || password.isEmpty()) {
model.addAttribute("errorMessage", "メールアドレスとパスワードを入力してください。");
return "login";
@@ -63,11 +63,10 @@ public class LoginController {
request.getSession(true).setAttribute(Const.SESSION_LOGIN_USER, user.get());
return "redirect:/menu";
}
-
+
@PostMapping("/logout")
public String logout(HttpSession session) {
session.invalidate();
return "redirect:/login";
}
-}
-
+}
\ No newline at end of file
diff --git a/book-rent/src/main/java/com/example/demo/controller/MenuController.java b/book-rent/src/main/java/com/example/demo/controller/MenuController.java
index d914065..1428bdb 100644
--- a/book-rent/src/main/java/com/example/demo/controller/MenuController.java
+++ b/book-rent/src/main/java/com/example/demo/controller/MenuController.java
@@ -2,7 +2,7 @@ package com.example.demo.controller;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
-
+
/** メニュー画面(menu.html)。表示内容は管理者フラグで切り替える。 */
@Controller
public class MenuController {
@@ -10,4 +10,4 @@ public class MenuController {
public String menu() {
return "menu";
}
-}
+}
\ No newline at end of file
diff --git a/book-rent/src/main/java/com/example/demo/form/EmployeeForm.java b/book-rent/src/main/java/com/example/demo/form/EmployeeForm.java
index edc1561..fde4b39 100644
--- a/book-rent/src/main/java/com/example/demo/form/EmployeeForm.java
+++ b/book-rent/src/main/java/com/example/demo/form/EmployeeForm.java
@@ -1,33 +1,82 @@
package com.example.demo.form;
+
/** 社員登録・編集フォーム */
public class EmployeeForm {
- private Integer idEmployee;
- private String nmEmployee = "";
- private String knEmployee = "";
- private String mailAddress = "";
- private String password = "";
- private String flgAdmin = "0";
- private String flgRetirement = "0";
+ private Integer idEmployee;
+ private String nmEmployee = "";
+ private String knEmployee = "";
+ private String mailAddress = "";
+ private String password = "";
+ private String flgAdmin = "0";
+ private String flgRetirement = "0";
- public void trim() {
- nmEmployee = t(nmEmployee); knEmployee = t(knEmployee); mailAddress = t(mailAddress);
- flgAdmin = t(flgAdmin); flgRetirement = t(flgRetirement);
- if (password == null) password = "";
- }
- private static String t(String s) { return s == null ? "" : s.trim(); }
+ public void trim() {
+ nmEmployee = t(nmEmployee);
+ knEmployee = t(knEmployee);
+ mailAddress = t(mailAddress);
+ flgAdmin = t(flgAdmin);
+ flgRetirement = t(flgRetirement);
+ if (password == null)
+ password = "";
+ }
- public Integer getIdEmployee() { return idEmployee; }
- public void setIdEmployee(Integer v) { this.idEmployee = v; }
- public String getNmEmployee() { return nmEmployee; }
- public void setNmEmployee(String v) { this.nmEmployee = v; }
- public String getKnEmployee() { return knEmployee; }
- public void setKnEmployee(String v) { this.knEmployee = v; }
- public String getMailAddress() { return mailAddress; }
- public void setMailAddress(String v) { this.mailAddress = v; }
- public String getPassword() { return password; }
- public void setPassword(String v) { this.password = v; }
- public String getFlgAdmin() { return flgAdmin; }
- public void setFlgAdmin(String v) { this.flgAdmin = v; }
- public String getFlgRetirement() { return flgRetirement; }
- public void setFlgRetirement(String v) { this.flgRetirement = v; }
+ private static String t(String s) {
+ return s == null ? "" : s.trim();
+ }
+
+ public Integer getIdEmployee() {
+ return idEmployee;
+ }
+
+ public void setIdEmployee(Integer v) {
+ this.idEmployee = v;
+ }
+
+ public String getNmEmployee() {
+ return nmEmployee;
+ }
+
+ public void setNmEmployee(String v) {
+ this.nmEmployee = v;
+ }
+
+ public String getKnEmployee() {
+ return knEmployee;
+ }
+
+ public void setKnEmployee(String v) {
+ this.knEmployee = v;
+ }
+
+ public String getMailAddress() {
+ return mailAddress;
+ }
+
+ public void setMailAddress(String v) {
+ this.mailAddress = v;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String v) {
+ this.password = v;
+ }
+
+ public String getFlgAdmin() {
+ return flgAdmin;
+ }
+
+ public void setFlgAdmin(String v) {
+ this.flgAdmin = v;
+ }
+
+ public String getFlgRetirement() {
+ return flgRetirement;
+ }
+
+ public void setFlgRetirement(String v) {
+ this.flgRetirement = v;
+ }
}
diff --git a/book-rent/src/main/resources/application.properties b/book-rent/src/main/resources/application.properties
index de196c7..93d885f 100644
--- a/book-rent/src/main/resources/application.properties
+++ b/book-rent/src/main/resources/application.properties
@@ -10,4 +10,4 @@ spring.jpa.open-in-view=false
spring.jpa.properties.hibernate.jdbc.time_zone=Asia/Tokyo
spring.thymeleaf.cache=false
-server.servlet.session.timeout=30m
\ No newline at end of file
+server.servlet.session.timeout=30m
diff --git a/book-rent/src/main/resources/templates/employeeRegistComplete.html b/book-rent/src/main/resources/templates/employeeRegistComplete.html
new file mode 100644
index 0000000..ac13d6c
--- /dev/null
+++ b/book-rent/src/main/resources/templates/employeeRegistComplete.html
@@ -0,0 +1,20 @@
+
+
+
+
+
+ 社員登録完了画面
+
+
+
+
+
+
+ 社員登録完了
+
+ 社員登録が完了しました。
+
+ メニューへ戻る
+
+
+
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/employeeRegistConfirm.html b/book-rent/src/main/resources/templates/employeeRegistConfirm.html
new file mode 100644
index 0000000..865f6c6
--- /dev/null
+++ b/book-rent/src/main/resources/templates/employeeRegistConfirm.html
@@ -0,0 +1,79 @@
+
+
+
+
+
+ 社員登録確認画面
+
+
+
+
+
+
+ 社員登録確認
+
+
+
+
以下の内容で登録します。内容を確認してください。
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/employeeRegistInput.html b/book-rent/src/main/resources/templates/employeeRegistInput.html
new file mode 100644
index 0000000..d59be27
--- /dev/null
+++ b/book-rent/src/main/resources/templates/employeeRegistInput.html
@@ -0,0 +1,69 @@
+
+
+
+
+
+ 社員登録画面
+
+
+
+
+
+
+
+ 社員登録
+
+
+
+ メニューへ戻る
+
+
+
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/login.html b/book-rent/src/main/resources/templates/login.html
index dcd376a..26aaa40 100644
--- a/book-rent/src/main/resources/templates/login.html
+++ b/book-rent/src/main/resources/templates/login.html
@@ -1,12 +1,12 @@
-
+
ログイン
-
+
書籍貸出管理システム
@@ -24,43 +24,43 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -75,7 +75,7 @@
-
+
@@ -89,7 +89,7 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -106,11 +106,11 @@
-
+
-
+
-
+
@@ -118,6 +118,6 @@
-
+
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/menu.html b/book-rent/src/main/resources/templates/menu.html
index 0f9a7c2..5ae23e7 100644
--- a/book-rent/src/main/resources/templates/menu.html
+++ b/book-rent/src/main/resources/templates/menu.html
@@ -23,3 +23,6 @@