From 1debde25f2add2098a2507aa3b2c3ea48f7586bb Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 24 Sep 2026 13:19:04 +0900 Subject: [PATCH] =?UTF-8?q?[EDIT]=20menu=E7=94=BB=E9=9D=A2=E3=81=A7?= =?UTF-8?q?=E3=81=AE=E7=9B=AE=E6=A8=99=E8=A1=A8=E7=A4=BA=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=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 --- .../controller/TransactionController.java | 15 ++++--- src/main/resources/templates/menu.html | 40 +++++++++---------- 2 files changed, 27 insertions(+), 28 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 6af43fa..5b4b753 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 @@ -27,7 +27,6 @@ import com.example.demo.app.domain.service.UserService; import com.example.demo.app.presentation.form.CategoryForm; import com.example.demo.app.presentation.form.Expense; import com.example.demo.app.presentation.form.FixedCostForm; -import com.example.demo.app.presentation.form.GoalForm; import com.example.demo.app.presentation.form.Income; import com.example.demo.app.presentation.form.TransactionForm; import com.example.demo.app.presentation.form.UserForm; @@ -349,19 +348,19 @@ public class TransactionController { model.addAttribute("totalIncome", totalIncome); model.addAttribute("totalExpense", totalExpense); - GoalForm goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId())); +// List goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId())); UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId())); - model.addAttribute("achievementRate", goalForm.getAchievementRate()); - - model.addAttribute("currentAmount", goalForm.getCurrentAmount()); - - model.addAttribute("targetAmount", goalForm.getTargetAmount()); +// model.addAttribute("achievementRate", goalForm.getAchievementRate()); +// +// model.addAttribute("currentAmount", goalForm.getCurrentAmount()); +// +// model.addAttribute("targetAmount", goalForm.getTargetAmount()); model.addAttribute("saving", userForm.getSaving()); - model.addAttribute("deadline", goalForm.getDeadline()); +// model.addAttribute("deadline", goalForm.getDeadline()); return "menu"; } diff --git a/src/main/resources/templates/menu.html b/src/main/resources/templates/menu.html index 4470464..02cc0e7 100644 --- a/src/main/resources/templates/menu.html +++ b/src/main/resources/templates/menu.html @@ -113,17 +113,17 @@ -
- 目標貯金 - - 円 -
+ + + + + -
- 現在高 - - 円 -
+ + + + +
貯金額 @@ -133,16 +133,16 @@
-
- 達成率 - - % -
-
- 達成期限 - - 円 -
+ + + + + + + + + +