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

Compare commits

base: 2026_09_5H_Spring_KIZAKI:c484d86c59a8143416b7754b411caf2a082a1070
Branches Tags
2026_09_5H_Spring_KIZAKI:master 2026_09_5H_Spring_KIZAKI:n-kawahito 2026_09_5H_Spring_KIZAKI:s-choi 2026_09_5H_Spring_KIZAKI:s-morimoto 2026_09_5H_Spring_KIZAKI:k-oshita 2026_09_5H_Spring_KIZAKI:k-kobayashi 2026_09_5H_Spring_KIZAKI:s-morimto 2026_09_5H_Spring_KIZAKI:s-kikuchi
...
compare: 2026_09_5H_Spring_KIZAKI:k-kobayashi
Branches Tags
2026_09_5H_Spring_KIZAKI:master 2026_09_5H_Spring_KIZAKI:n-kawahito 2026_09_5H_Spring_KIZAKI:s-choi 2026_09_5H_Spring_KIZAKI:s-morimoto 2026_09_5H_Spring_KIZAKI:k-oshita 2026_09_5H_Spring_KIZAKI:k-kobayashi 2026_09_5H_Spring_KIZAKI:s-morimto 2026_09_5H_Spring_KIZAKI:s-kikuchi

3 Commits
c484d86c59 ... k-kobayash

Author SHA1 Message Date
kkazuya
640240db92 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-29 15:25:22 +09:00
s-choi
bbee55f58f [FIX] 未達成の履歴がメニューに表示される問題を修正しました。 2026-09-29 15:24:56 +09:00
kkazuya
f319fcb9f8 [EDIT] 固定費登録の収支区分とカテゴリーを入力必須にしました 2026-09-29 15:22:15 +09:00
2 changed files with 3 additions and 3 deletions
Expand all files Collapse all files

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

@@ -429,7 +429,7 @@ public class TransactionController {
UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId())); UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0) List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0 && goal.getDeadline().isAfter(today) )
.collect(Collectors.toList()); .collect(Collectors.toList());
if (!resultList.isEmpty()) { if (!resultList.isEmpty()) {

4
src/main/resources/templates/fixed_cost_create.html
View File

@@ -37,7 +37,7 @@
<div class="mb-3"> <div class="mb-3">
<label class="form-label" for="transactionType">収入・支出</label> <label class="form-label" for="transactionType">収入・支出</label>
<select class="form-select" id="transactionType"> <select class="form-select" id="transactionType" required>
<option value="">選択してください</option> <option value="">選択してください</option>
<option value="0">支出</option> <option value="0">支出</option>
@@ -51,7 +51,7 @@
<div class="mb-3"> <div class="mb-3">
<label class="form-label" for="categoryId">カテゴリ</label> <label class="form-label" for="categoryId">カテゴリ</label>
<select class="form-select" id="categoryId" th:field="*{categoryId}"> <select class="form-select" id="categoryId" th:field="*{categoryId}" required>
<option value="">選択してください</option> <option value="">選択してください</option>
<option class="expenseListClass" th:each="category : ${expenseList}" <option class="expenseListClass" th:each="category : ${expenseList}"