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

Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto

Browse Source
This commit is contained in:
[IIJ] Seidai Morimoto
2026-09-25 14:23:20 +09:00
parent e54e0133f7 e0759c0f6b
commit 5adb527d7a
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ 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;
@@ -371,19 +372,24 @@ public class TransactionController {
model.addAttribute("totalIncome", totalIncome); model.addAttribute("totalIncome", totalIncome);
model.addAttribute("totalExpense", totalExpense); model.addAttribute("totalExpense", totalExpense);
// List<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()); List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0)
// .collect(Collectors.toList());
// model.addAttribute("currentAmount", goalForm.getCurrentAmount());
// GoalForm result = resultList.getFirst();
// model.addAttribute("targetAmount", goalForm.getTargetAmount());
model.addAttribute("achievementRate", result.getAchievementRate());
model.addAttribute("currentAmount", result.getCurrentAmount());
model.addAttribute("targetAmount", result.getTargetAmount());
model.addAttribute("saving", userForm.getSaving()); model.addAttribute("saving", userForm.getSaving());
// model.addAttribute("deadline", goalForm.getDeadline()); model.addAttribute("deadline", result.getDeadline());
return "menu"; return "menu";
} }