2026_09_5H_Spring_KIZAKI/Monegement
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[EDIT] menu画面での目標表示を削除しました。

Browse Source
This commit is contained in:
s-choi
2026-09-24 13:19:04 +09:00
parent 714ffba31f
commit 1debde25f2
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
View File

@@ -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.CategoryForm;
import com.example.demo.app.presentation.form.Expense; import com.example.demo.app.presentation.form.Expense;
import com.example.demo.app.presentation.form.FixedCostForm; 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.Income;
import com.example.demo.app.presentation.form.TransactionForm; import com.example.demo.app.presentation.form.TransactionForm;
import com.example.demo.app.presentation.form.UserForm; import com.example.demo.app.presentation.form.UserForm;
@@ -349,19 +348,19 @@ public class TransactionController {
model.addAttribute("totalIncome", totalIncome); model.addAttribute("totalIncome", totalIncome);
model.addAttribute("totalExpense", totalExpense); model.addAttribute("totalExpense", totalExpense);
GoalForm goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId())); // List<GoalForm> goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId()));
UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId())); UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
model.addAttribute("achievementRate", goalForm.getAchievementRate()); // model.addAttribute("achievementRate", goalForm.getAchievementRate());
//
model.addAttribute("currentAmount", goalForm.getCurrentAmount()); // model.addAttribute("currentAmount", goalForm.getCurrentAmount());
//
model.addAttribute("targetAmount", goalForm.getTargetAmount()); // model.addAttribute("targetAmount", goalForm.getTargetAmount());
model.addAttribute("saving", userForm.getSaving()); model.addAttribute("saving", userForm.getSaving());
model.addAttribute("deadline", goalForm.getDeadline()); // model.addAttribute("deadline", goalForm.getDeadline());
return "menu"; return "menu";
} }

40
src/main/resources/templates/menu.html
View File

@@ -113,17 +113,17 @@
</div> </div>
<div> <!-- <div>-->
<span>目標貯金</span> <!-- <span>目標貯金</span>-->
<span th:text="${targetAmount}"></span> <!-- <span th:text="${targetAmount}"></span>-->
<span>円</span> <!-- <span>円</span>-->
</div> <!-- </div>-->
<div> <!-- <div>-->
<span>現在高</span> <!-- <span>現在高</span>-->
<span th:text="${currentAmount}"></span> <!-- <span th:text="${currentAmount}"></span>-->
<span>円</span> <!-- <span>円</span>-->
</div> <!-- </div>-->
<div> <div>
<span>貯金額</span> <span>貯金額</span>
@@ -133,16 +133,16 @@
<hr> <hr>
<div> <!-- <div>-->
<span>達成率</span> <!-- <span>達成率</span>-->
<span th:text="${achievementRate}"></span> <!-- <span th:text="${achievementRate}"></span>-->
<span>%</span> <!-- <span>%</span>-->
</div> <!-- </div>-->
<div> <!-- <div>-->
<span>達成期限</span> <!-- <span>達成期限</span>-->
<span th:text="${deadline}"></span> <!-- <span th:text="${deadline}"></span>-->
<span>円</span> <!-- <span>円</span>-->
</div> <!-- </div>-->
<div th:replace="~{footer :: footer}"></div> <div th:replace="~{footer :: footer}"></div>