diff --git a/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java b/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java index 3afec50..fc66343 100644 --- a/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java +++ b/src/main/java/com/example/demo/app/infra/entity/CourseEntity.java @@ -8,7 +8,6 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; -import jakarta.persistence.OneToOne; import jakarta.persistence.Table; import com.example.demo.app.domain.model.CourseModel; @@ -39,10 +38,6 @@ public class CourseEntity { @OneToMany(mappedBy = "courseEntity") private List userEntity; - @OneToOne(mappedBy = "courseEntity") - private AllocationEntity allocationEntity; - - public static List createCourseModelList(List courseEntityList) { return courseEntityList diff --git a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java index c9199af..ff520ae 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java @@ -35,7 +35,7 @@ public class CourseController { model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); - return "select-course"; + return "select_course"; //} catch (Exception e) { // // ログイン情報の破棄 diff --git a/src/main/java/com/example/demo/app/presentation/controller/UserController.java b/src/main/java/com/example/demo/app/presentation/controller/UserController.java index 7b2aef4..cfcaa0d 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/UserController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/UserController.java @@ -17,8 +17,14 @@ import lombok.RequiredArgsConstructor; public class UserController { @GetMapping("/user/register") - public String showRegister(Model model) { - model.addAttribute("userForm", new UserForm()); + public String showRegister(Model model, HttpSession session) { + UserForm userForm = (UserForm) session.getAttribute("userForm"); + + if(userForm == null) { + userForm = new UserForm(); + } + + model.addAttribute("userForm", userForm); return "user_register"; } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd1356a..8881edd 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ spring.application.name=Monegement -spring.datasource.url=jdbc:mysql://localhost:3306/rezo_spring +spring.datasource.url=jdbc:mysql://localhost:3306/springdb spring.datasource.username=rezouser spring.datasource.password=Rezo_0000 diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 7050ca1..3a8e8ac 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -13,11 +13,11 @@
- +
@@ -26,7 +26,7 @@ @@ -36,11 +36,11 @@
- 新規会員登録 + 新規会員登録
- パスワードを忘れた方 + パスワードを忘れた方
diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html index 6718ef4..bd50a1e 100644 --- a/src/main/resources/templates/select_course.html +++ b/src/main/resources/templates/select_course.html @@ -20,7 +20,7 @@ カテゴリ名配分(%) - + diff --git a/src/main/resources/templates/user_register.html b/src/main/resources/templates/user_register.html index 18d31ac..a9a38aa 100644 --- a/src/main/resources/templates/user_register.html +++ b/src/main/resources/templates/user_register.html @@ -98,28 +98,18 @@
-
- - + + + 未選択 +