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 ce0319e..009acc8 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 @@ -218,6 +218,24 @@ public class TransactionController { } } + + List expenseList = new ArrayList(); + + List incomeList = new ArrayList(); + + for (CategoryForm categoryForm : categoryFormList) { + + if (categoryForm.getTransactionType() == 0) { + expenseList.add(categoryForm); + } else { + incomeList.add(categoryForm); + } + + } + + model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList); + model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList); + model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm); model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList); @@ -408,7 +426,7 @@ public class TransactionController { } else { final String MESSAGE = "目標を設定してください"; - + model.addAttribute(PageReturnAttributeKeyword.ACHIEVEMENT_RATE, MESSAGE); model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, MESSAGE); diff --git a/src/main/resources/templates/transaction_create.html b/src/main/resources/templates/transaction_create.html index 8ad421c..115ae4f 100644 --- a/src/main/resources/templates/transaction_create.html +++ b/src/main/resources/templates/transaction_create.html @@ -15,127 +15,149 @@
-

- 取引登録 -

+

+ 取引登録 +

-
+
-
+
-
+
- - + +
-
+
- + - - + - + - + - + -
+
-
+
- + - - + - + - + -
+ -
+
- +
- + -
+ - +
-
+ - + 登録 -
+ -
+
-
+ -
+
+ +
+ +