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 @@
-
- 達成率 - - % -
-
- 達成期限 - - 円 -
+ + + + + + + + + +