From 74b7032ffc46aa8897db25598615c2ec01a61ecf Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Mon, 28 Sep 2026 17:06:13 +0900 Subject: [PATCH 01/12] =?UTF-8?q?[FIX]=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/category_list.html | 26 ++++++++++----- src/main/resources/templates/fixed_cost.html | 32 ++++++++++++------- src/main/resources/templates/goal_create.html | 9 ++++-- src/main/resources/templates/goal_record.html | 20 ++++++------ 4 files changed, 54 insertions(+), 33 deletions(-) diff --git a/src/main/resources/templates/category_list.html b/src/main/resources/templates/category_list.html index b67c0ee..c4184b6 100644 --- a/src/main/resources/templates/category_list.html +++ b/src/main/resources/templates/category_list.html @@ -9,13 +9,13 @@ - +
-
    +
    • @@ -49,19 +49,29 @@
      -
      -
+ +
+
+ - - - -
+ + + + +
+ +
diff --git a/src/main/resources/templates/fixed_cost.html b/src/main/resources/templates/fixed_cost.html index 8f7f9f1..9d34e26 100644 --- a/src/main/resources/templates/fixed_cost.html +++ b/src/main/resources/templates/fixed_cost.html @@ -10,7 +10,7 @@ - +
@@ -19,7 +19,7 @@

-
    +
    • @@ -52,21 +52,29 @@
      -
      -
+
- +
+ +
+ + + + + +
+ +
+ - - -
- - -
-
diff --git a/src/main/resources/templates/goal_create.html b/src/main/resources/templates/goal_create.html index 2057470..f0af281 100644 --- a/src/main/resources/templates/goal_create.html +++ b/src/main/resources/templates/goal_create.html @@ -51,9 +51,12 @@ - -
- + + + + + +
diff --git a/src/main/resources/templates/goal_record.html b/src/main/resources/templates/goal_record.html index e2b5900..c5a7e0b 100644 --- a/src/main/resources/templates/goal_record.html +++ b/src/main/resources/templates/goal_record.html @@ -8,7 +8,7 @@ - +
@@ -74,16 +74,16 @@ -
-
- - - -
-
+ +
+
+ +
+
+
From 4a9a1d08988602523744ff184e393caad1f70bd2 Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Tue, 29 Sep 2026 11:13:13 +0900 Subject: [PATCH 02/12] =?UTF-8?q?[FIX]=E3=82=B3=E3=83=BC=E3=82=B9=E9=81=B8?= =?UTF-8?q?=E6=8A=9E=E7=94=BB=E9=9D=A2=E3=81=AE=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/select_course.html | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html index 635e154..3852e88 100644 --- a/src/main/resources/templates/select_course.html +++ b/src/main/resources/templates/select_course.html @@ -5,6 +5,7 @@ + コース選択 @@ -12,13 +13,16 @@

コース選択

- -
- -
- - - +
+ +
+ +
+ +
+
From 0162f2f679a0336e25085abe6353114de0010766 Mon Sep 17 00:00:00 2001 From: kkazuya Date: Tue, 29 Sep 2026 11:19:37 +0900 Subject: [PATCH 03/12] =?UTF-8?q?[EDIT]=20=E3=82=B3=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E4=BD=9C=E6=88=90=E3=81=A7=E3=80=81=E9=85=8D=E5=88=86=E3=81=AE?= =?UTF-8?q?=E5=90=88=E8=A8=88=E3=81=8C100=EF=BC=85=E3=81=A7=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=A8=E7=99=BB=E9=8C=B2=E3=81=A7=E3=81=8D=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CourseController.java | 9 --- .../resources/templates/course_create.html | 2 +- .../templates/course_create_ratio.html | 70 ++++++++++--------- 3 files changed, 38 insertions(+), 43 deletions(-) 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 6166a96..a9b92e4 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 @@ -125,15 +125,6 @@ public class CourseController { List allocationModelList = new ArrayList<>(); - allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId1(), - (Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), - allocationFormList.getAllocationRatio1())); - allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId2(), - (Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), - allocationFormList.getAllocationRatio2())); - allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId3(), - (Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), - allocationFormList.getAllocationRatio3())); allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId4(), (Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID), allocationFormList.getAllocationRatio4())); diff --git a/src/main/resources/templates/course_create.html b/src/main/resources/templates/course_create.html index dd2f12a..6a1257d 100644 --- a/src/main/resources/templates/course_create.html +++ b/src/main/resources/templates/course_create.html @@ -23,7 +23,7 @@
- +

diff --git a/src/main/resources/templates/course_create_ratio.html b/src/main/resources/templates/course_create_ratio.html index 0ec7ccb..ad7df48 100644 --- a/src/main/resources/templates/course_create_ratio.html +++ b/src/main/resources/templates/course_create_ratio.html @@ -22,86 +22,70 @@ -
- - -
- -
- -
- - -
- -
- -
- - -
- -
-
- +

- +

- +

- +

- +

- +

- +

- + +
+ +
+ +

- +
@@ -110,7 +94,27 @@
- + + From 18c51d3a6528f46ab406c4fc0bcb097a4363a13b Mon Sep 17 00:00:00 2001 From: kkazuya Date: Tue, 29 Sep 2026 11:22:41 +0900 Subject: [PATCH 04/12] =?UTF-8?q?[FIX]=20=E3=82=AB=E3=83=86=E3=82=B4?= =?UTF-8?q?=E3=83=AA=E3=83=BC=E7=99=BB=E9=8C=B2=E3=81=AE=E9=9A=9B=E3=80=81?= =?UTF-8?q?=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA=E3=83=BC=E5=90=8D=E3=81=A8?= =?UTF-8?q?=E5=8F=8E=E6=94=AF=E5=8C=BA=E5=88=86=E3=81=AE=E5=85=A5=E5=8A=9B?= =?UTF-8?q?=E3=82=92=E5=BF=85=E9=A0=88=E3=81=AB=E3=81=97=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/category_create.html | 4 ++-- src/main/resources/templates/category_update.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/templates/category_create.html b/src/main/resources/templates/category_create.html index 3a42e92..e91ecd6 100644 --- a/src/main/resources/templates/category_create.html +++ b/src/main/resources/templates/category_create.html @@ -25,7 +25,7 @@
- +

@@ -33,7 +33,7 @@
- diff --git a/src/main/resources/templates/category_update.html b/src/main/resources/templates/category_update.html index f69ad72..71497e2 100644 --- a/src/main/resources/templates/category_update.html +++ b/src/main/resources/templates/category_update.html @@ -25,7 +25,7 @@
- +

@@ -33,7 +33,7 @@
- From f5c410b352cdd559f99f30359d36f6fbd368cc44 Mon Sep 17 00:00:00 2001 From: s-choi Date: Tue, 29 Sep 2026 11:31:25 +0900 Subject: [PATCH 05/12] =?UTF-8?q?[FIX]=20=E8=84=B1=E9=80=80=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=82=89=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/demo/app/domain/service/impl/LoginServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/example/demo/app/domain/service/impl/LoginServiceImpl.java b/src/main/java/com/example/demo/app/domain/service/impl/LoginServiceImpl.java index 26ef947..d11347e 100644 --- a/src/main/java/com/example/demo/app/domain/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/example/demo/app/domain/service/impl/LoginServiceImpl.java @@ -25,6 +25,8 @@ public class LoginServiceImpl implements LoginService { if (userEntity == null) { return null; + } else if (userEntity.getDeleteFlag() == 1) { + return null; } boolean isValidPassword = false; From 438ff59bc2f462ccdf14399d9620ce96bece2719 Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Tue, 29 Sep 2026 11:32:22 +0900 Subject: [PATCH 06/12] =?UTF-8?q?[FIX]=E7=94=BB=E9=9D=A2=E3=83=87=E3=82=B6?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=AE=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92?= =?UTF-8?q?=E8=AA=BF=E6=95=B4=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/analysis.html | 2 +- src/main/resources/templates/category_update.html | 2 +- src/main/resources/templates/goal_view.html | 4 ++++ src/main/resources/templates/profile_edit.html | 14 +++++++------- src/main/resources/templates/select_course.html | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html index c85e4e0..dd88457 100644 --- a/src/main/resources/templates/analysis.html +++ b/src/main/resources/templates/analysis.html @@ -35,7 +35,7 @@ - + diff --git a/src/main/resources/templates/category_update.html b/src/main/resources/templates/category_update.html index f69ad72..c140cbe 100644 --- a/src/main/resources/templates/category_update.html +++ b/src/main/resources/templates/category_update.html @@ -47,7 +47,7 @@
- +
diff --git a/src/main/resources/templates/goal_view.html b/src/main/resources/templates/goal_view.html index 5249f82..45b6b63 100644 --- a/src/main/resources/templates/goal_view.html +++ b/src/main/resources/templates/goal_view.html @@ -189,6 +189,8 @@ +
+
+ +
diff --git a/src/main/resources/templates/profile_edit.html b/src/main/resources/templates/profile_edit.html index c0598f7..3feec50 100644 --- a/src/main/resources/templates/profile_edit.html +++ b/src/main/resources/templates/profile_edit.html @@ -101,15 +101,15 @@ max="10000000" required> + +
+ +
- -
- -
diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html index 3852e88..3482b90 100644 --- a/src/main/resources/templates/select_course.html +++ b/src/main/resources/templates/select_course.html @@ -13,7 +13,7 @@

コース選択

-
+
-
@@ -57,6 +56,7 @@
+
From cb5d228db4a5a10bb96d9c4079c2bee0407a1f62 Mon Sep 17 00:00:00 2001 From: kkazuya Date: Tue, 29 Sep 2026 12:40:17 +0900 Subject: [PATCH 07/12] =?UTF-8?q?[EDIT]=20=E5=8F=8E=E6=94=AF=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E3=81=AE=E5=80=A4=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6?= =?UTF-8?q?=E3=80=81=E6=94=AF=E5=87=BA=E3=81=8C0=E3=80=81=E5=8F=8E?= =?UTF-8?q?=E5=85=A5=E3=81=8C1=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E7=AE=87=E6=89=80?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/fixed_cost_create.html | 10 +++++----- src/main/resources/templates/transaction_create.html | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/resources/templates/fixed_cost_create.html b/src/main/resources/templates/fixed_cost_create.html index c6397e9..0c478d1 100644 --- a/src/main/resources/templates/fixed_cost_create.html +++ b/src/main/resources/templates/fixed_cost_create.html @@ -40,8 +40,8 @@ @@ -70,7 +70,7 @@
-
@@ -94,7 +94,7 @@ transactionType.addEventListener("change", function () { - if (this.value === "1") { + if (this.value === "0") { for (let i = 0; i < expenseList.length; i++) { expenseList[i].style.display = ""; @@ -104,7 +104,7 @@ incomeList[i].style.display = "none"; } - } else if (this.value === "2") { + } else if (this.value === "1") { for (let i = 0; i < expenseList.length; i++) { expenseList[i].style.display = "none"; diff --git a/src/main/resources/templates/transaction_create.html b/src/main/resources/templates/transaction_create.html index 760047b..8f06bd9 100644 --- a/src/main/resources/templates/transaction_create.html +++ b/src/main/resources/templates/transaction_create.html @@ -45,11 +45,11 @@ 選択してください - - @@ -124,15 +124,15 @@ const tType = '[[${session.tType}]]'; if (tType == "0") { - transactionType.value = 1; + transactionType.value = 0; } else { - transactionType.value = 2; + transactionType.value = 1; } transactionType.addEventListener("change", function () { - if (this.value === "1") { + if (this.value === "0") { for (let i = 0; i < expenseList.length; i++) { expenseList[i].style.display = ""; @@ -142,7 +142,7 @@ incomeList[i].style.display = "none"; } - } else if (this.value === "2") { + } else if (this.value === "1") { for (let i = 0; i < expenseList.length; i++) { expenseList[i].style.display = "none"; From fb031e5255fd649b029933282ffb57b0c3d53d43 Mon Sep 17 00:00:00 2001 From: kkazuya Date: Tue, 29 Sep 2026 12:42:23 +0900 Subject: [PATCH 08/12] =?UTF-8?q?[EDIT]=20=E7=9B=AE=E6=A8=99=E5=90=8D?= =?UTF-8?q?=E3=81=A8=E7=9B=AE=E6=A8=99=E8=AA=AC=E6=98=8E=E5=85=A5=E5=8A=9B?= =?UTF-8?q?=E6=AC=84=E3=81=AErequired=E3=82=92=E5=A4=96=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/goal_create.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/templates/goal_create.html b/src/main/resources/templates/goal_create.html index 2057470..d3d8de2 100644 --- a/src/main/resources/templates/goal_create.html +++ b/src/main/resources/templates/goal_create.html @@ -26,12 +26,12 @@
- +
- +
From 104fa5e3191b87865df5da9287f4ec7fcc3d6d01 Mon Sep 17 00:00:00 2001 From: kkazuya Date: Tue, 29 Sep 2026 12:44:56 +0900 Subject: [PATCH 09/12] =?UTF-8?q?[EDIT]=20SessionKeyWord=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=83=AD=E3=83=BC=E3=83=A9=E5=81=B4=E3=81=A7?= =?UTF-8?q?=E3=81=9D=E3=82=8C=E3=82=92=E5=8F=82=E7=85=A7=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TransactionController.java | 4 ++-- .../presentation/controller/UserController.java | 15 ++++++--------- .../controller/pageproperty/SessionKeyword.java | 6 ++++++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java index b81c0ff..7a0f253 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/TransactionController.java @@ -238,8 +238,8 @@ public class TransactionController { model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm); - session.setAttribute("tType", String.valueOf(transactionForm.getTransactionType())); - + session.setAttribute(SessionKeyword.T_TYPE, String.valueOf(transactionForm.getTransactionType())); + model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList); model.addAttribute(PageReturnAttributeKeyword.TODAY, today.format(DateTimeFormatter.ISO_LOCAL_DATE)); 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 2c3eb8e..d09f9ae 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 @@ -16,6 +16,7 @@ import com.example.demo.app.domain.service.QuestionService; import com.example.demo.app.domain.service.UserService; import com.example.demo.app.infra.entity.QuestionEntity; import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; +import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword; import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.demo.app.presentation.form.UserForm; @@ -58,7 +59,7 @@ public class UserController { model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName()); } - session.setAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName()); + session.setAttribute(SessionKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName()); model.addAttribute(PageReturnAttributeKeyword.COURSE_ID, courseId); model.addAttribute(PageReturnAttributeKeyword.USER_FORM, userForm); @@ -70,11 +71,9 @@ public class UserController { String selectedCourseName, Model model, HttpSession session) { - model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute("selectedCourseName")); + model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME)); - session.setAttribute("questionId", userForm.getSecretQuestionId()); - - System.out.println("return questionId: ****************************:" + userForm.getSecretQuestionId()); + session.setAttribute(SessionKeyword.QUESTION_ID, userForm.getSecretQuestionId()); return TransitionTargetPageNameKeyword.USER_RESISTER_CONFIRM_HTML; @@ -86,11 +85,9 @@ public class UserController { Model model, HttpSession session) { - Long courseId = courseService.findByName((String) session.getAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME)); + Long courseId = courseService.findByName((String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME)); - Long questionId = (Long) session.getAttribute("questionId"); - - System.out.println("confirm questionId: ****************************:" + questionId); + Long questionId = (Long) session.getAttribute(SessionKeyword.QUESTION_ID); userForm.setSecretQuestionId(questionId); diff --git a/src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java b/src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java index b9ee3cc..ca9f1dd 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java +++ b/src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java @@ -3,4 +3,10 @@ package com.example.demo.app.presentation.controller.pageproperty; public class SessionKeyword { // SESSION情報として格納したいログイン者の情報 public static final String LOGIN_USER = "loginUser"; + + public static final String SELECTED_COURSE_NAME = "selectedCourseName"; + + public static final String QUESTION_ID = "questionId"; + + public static final String T_TYPE = "tType"; } From 0b9eff82c54b800c247d0c2ca3405af4b742256b Mon Sep 17 00:00:00 2001 From: kkazuya Date: Tue, 29 Sep 2026 13:06:31 +0900 Subject: [PATCH 10/12] =?UTF-8?q?[EDIT]=20=E4=BA=8C=E6=AC=A1=E5=AE=9F?= =?UTF-8?q?=E8=A3=85=E3=81=AB=E4=BC=B4=E3=81=86=E5=AE=9A=E6=95=B0=E3=81=AE?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=81=A8=E3=80=81AOP=E3=81=AE=E3=82=AF?= =?UTF-8?q?=E3=83=A9=E3=82=B9=E3=82=82=E5=AE=9A=E6=95=B0=E3=82=AF=E3=83=A9?= =?UTF-8?q?=E3=82=B9=E3=82=92=E5=8F=82=E7=85=A7=E3=81=99=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E7=B7=A8=E9=9B=86=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/aop/aspect/SessionCheckAspect.java | 3 ++- .../demo/aop/handler/GlobalExceptionHandler.java | 14 ++++++++------ .../presentation/controller/GoalController.java | 2 +- .../pageproperty/PageReturnAttributeKeyword.java | 3 ++- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/example/demo/aop/aspect/SessionCheckAspect.java b/src/main/java/com/example/demo/aop/aspect/SessionCheckAspect.java index 3043c98..37faa6d 100644 --- a/src/main/java/com/example/demo/aop/aspect/SessionCheckAspect.java +++ b/src/main/java/com/example/demo/aop/aspect/SessionCheckAspect.java @@ -10,6 +10,7 @@ import org.aspectj.lang.annotation.Pointcut; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword; import com.example.demo.exception.NoSessionException; @@ -32,7 +33,7 @@ public class SessionCheckAspect { public void checkSession() { HttpSession session = request.getSession(false); - if (session == null || session.getAttribute("loginUser") == null) { + if (session == null || session.getAttribute(SessionKeyword.LOGIN_USER) == null) { throw new NoSessionException("不正なログインです"); } diff --git a/src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java b/src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java index 2814100..83554ed 100644 --- a/src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java @@ -12,6 +12,8 @@ import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; +import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword; +import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword; import com.example.demo.exception.NoSessionException; @ControllerAdvice @@ -30,18 +32,18 @@ public class GlobalExceptionHandler { LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e); model.addAttribute( - "errorMessage", + PageReturnAttributeKeyword.ERROR_MESSAGE, "システムエラーが発生しました。" + "初めからやり直してください。"); - return "redirect:/login"; + return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN; } @ExceptionHandler(HttpRequestMethodNotSupportedException.class) public String handleBadRequestException(Model model, Exception e, HttpSession session) { - model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST); - model.addAttribute("status", HttpStatus.BAD_REQUEST.value()); + model.addAttribute(PageReturnAttributeKeyword.ERROR, SEVERE_ERROR_MESSAGE_BAD_REQUEST); + model.addAttribute(PageReturnAttributeKeyword.STATUS, HttpStatus.BAD_REQUEST.value()); e.printStackTrace(); @@ -50,7 +52,7 @@ public class GlobalExceptionHandler { System.out.println("session invalidated"); session.invalidate(); - return "error"; + return TransitionTargetPageNameKeyword.ERROR_HTML; } @ExceptionHandler(Exception.class) @@ -60,6 +62,6 @@ public class GlobalExceptionHandler { System.out.println("session invalidated exception"); session.invalidate(); - return "error"; + return TransitionTargetPageNameKeyword.ERROR_HTML; } } diff --git a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java index cb7ee49..2ced072 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java @@ -275,7 +275,7 @@ public class GoalController { int currentAmount = goalService.getCurrentAmount(userId); - model.addAttribute("currentAmount", currentAmount); + model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount); return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML; } diff --git a/src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java b/src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java index 3b0a32a..1b89364 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java +++ b/src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java @@ -4,7 +4,8 @@ public class PageReturnAttributeKeyword { public static final String ERROR_MESSAGE = "errorMessage"; public static final String MESSAGE = "message"; - + public static final String ERROR = "error"; + public static final String STATUS = "status"; public static final String QUESTION_LIST = "questionList"; public static final String USER_FORM = "userForm"; From fd1b098e3c61de0182fac65020a903a21fe2a3ba Mon Sep 17 00:00:00 2001 From: kkazuya Date: Tue, 29 Sep 2026 13:15:40 +0900 Subject: [PATCH 11/12] =?UTF-8?q?[FIX]=20=E5=8F=96=E5=BC=95=E7=99=BB?= =?UTF-8?q?=E9=8C=B2=E3=81=AE=E5=8F=8E=E6=94=AF=E5=8C=BA=E5=88=86=E3=81=AE?= =?UTF-8?q?=E5=88=9D=E6=9C=9F=E5=80=A4=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97?= =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/transaction_create.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/transaction_create.html b/src/main/resources/templates/transaction_create.html index 8f06bd9..ac9d084 100644 --- a/src/main/resources/templates/transaction_create.html +++ b/src/main/resources/templates/transaction_create.html @@ -125,7 +125,7 @@ if (tType == "0") { transactionType.value = 0; - } else { + } else if (tType == "1") { transactionType.value = 1; } From a995a416564b456e4b9a2fd6e9082e8555ddc9da Mon Sep 17 00:00:00 2001 From: n-kawahito Date: Tue, 29 Sep 2026 13:17:44 +0900 Subject: [PATCH 12/12] =?UTF-8?q?[FIX]=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/analysis.html | 8 +++----- src/main/resources/templates/menu.html | 3 +-- src/main/resources/templates/select_course.html | 2 +- src/main/resources/templates/transaction_create.html | 5 ++--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html index dd88457..dfbe44f 100644 --- a/src/main/resources/templates/analysis.html +++ b/src/main/resources/templates/analysis.html @@ -47,7 +47,7 @@ 0
カテゴリ別 支出 前月比
- 食費 - 0 = 0} - ? '＋' + ${category.courseDifferenceAmount} + ? '+' + ${category.courseDifferenceAmount} : ${category.courseDifferenceAmount}" th:class="${category.courseDifferenceAmount >= 0} ? 'text-danger' diff --git a/src/main/resources/templates/menu.html b/src/main/resources/templates/menu.html index 4b4b6b3..8573b98 100644 --- a/src/main/resources/templates/menu.html +++ b/src/main/resources/templates/menu.html @@ -8,10 +8,9 @@ Calendar - - + diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html index 3482b90..7eea6ee 100644 --- a/src/main/resources/templates/select_course.html +++ b/src/main/resources/templates/select_course.html @@ -9,7 +9,7 @@ コース選択 - +

コース選択

diff --git a/src/main/resources/templates/transaction_create.html b/src/main/resources/templates/transaction_create.html index 8f06bd9..31db04f 100644 --- a/src/main/resources/templates/transaction_create.html +++ b/src/main/resources/templates/transaction_create.html @@ -3,10 +3,9 @@ - 取引登録 - - + + 取引登録