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 6593154..38cc5c3 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 @@ -297,6 +297,23 @@ public class TransactionController { transactionService.findMoneyRecord(transactionId), CategoryForm.convertFrom(categoryService.findByTransactionId(transactionId)).getTransactionType()); + 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_ID, transactionId); model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm); @@ -304,6 +321,8 @@ public class TransactionController { model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList); model.addAttribute(PageReturnAttributeKeyword.TODAY, today); + + session.setAttribute(SessionKeyword.T_TYPE, transactionForm.getTransactionType()); return TransitionTargetPageNameKeyword.TRANSACTION_UPDATE_HTML; diff --git a/src/main/resources/templates/transaction_update.html b/src/main/resources/templates/transaction_update.html index 3817ee4..d9d54e7 100644 --- a/src/main/resources/templates/transaction_update.html +++ b/src/main/resources/templates/transaction_update.html @@ -83,21 +83,36 @@ カテゴリ - + + @@ -141,6 +156,60 @@
+ + + \ No newline at end of file