4 Commits

Author SHA1 Message Date
8de220ca8e [DELETE] deleteFlagを削除しました。 2026-09-28 16:47:41 +09:00
f6b03e789d Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-oshita
# Conflicts:
#	src/main/resources/templates/transaction_detail.html
2026-09-28 16:41:52 +09:00
s-choi
0687a1837e [STYLE] 重複コードを削除しました。 2026-09-28 16:40:38 +09:00
s-choi
2a4150c883 [STYLE] 重複コードを削除しました。 2026-09-28 16:37:04 +09:00
5 changed files with 56 additions and 60 deletions

View File

@@ -57,7 +57,7 @@ public class GoalModel {
goalModel.getTargetAmount(),
goalModel.getDeadline(),
0,
userEntity, 0);
userEntity);
}
public static GoalModel convertFrom(GoalForm goalForm) {

View File

@@ -47,6 +47,4 @@ public class GoalEntity {
@JoinColumn(name = "user_id")
private UserEntity userEntity;
private Integer deleteFlag;
}

View File

@@ -57,8 +57,7 @@ public class ProfileController {
profileModel.getBirthDate(),
profileModel.getSaving(),
profileModel.getAnnualIncome(),
profileModel.getMonthlyBudget(),
profileModel.getBirthDate());
profileModel.getMonthlyBudget());
model.addAttribute(PageReturnAttributeKeyword.PROFILE_EDIT_FORM, profileEditForm);
return TransitionTargetPageNameKeyword.PROFILE_EDIT_HTML;

View File

@@ -16,5 +16,4 @@ public class ProfileEditForm {
private Integer saving;
private Integer annualIncome;
private Integer monthlyBudget;
private LocalDate birthDate;
}

View File

@@ -1,153 +1,153 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
<title>収支詳細</title>
<link rel="stylesheet" th:href="@{/css/transaction_detail.css}">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body style="padding-top:80px; padding-bottom:80px;">
<div th:replace="~{header :: header}"></div>
<div class="main-container">
<h2 class="page-title"
th:text="${today}">
</h2>
<div th:each="transactionForm : ${transactionFormList}"
class="card shadow-sm mb-3">
<div class="card-body">
<div class="d-flex justify-content-between">
<span class="fw-bold"
th:text="${transactionForm.categoryName}">
</span>
<span th:text="'¥' + ${transactionForm.amount}">
</span>
</div>
<div class="d-flex justify-content-end gap-2 mt-3">
<form th:action="@{/transaction/update}"
method="get">
<input type="hidden"
name="today"
th:value="${today}">
<input type="hidden"
name="transactionId"
th:value="${transactionForm.transactionId}">
<button class="btn btn-sm btn-primary"
type="submit">
編集
</button>
</form>
<form th:action="@{/transaction/delete}"
method="post">
<input type="hidden"
name="today"
th:value="${today}">
<input type="hidden"
name="transactionId"
th:value="${transactionForm.transactionId}">
<button class="btn btn-sm btn-danger"
type="submit">
削除
</button>
</form>
</div>
</div>
</div>
<div class="d-grid mt-4">
<form th:action="@{/transaction/create}"
method="get">
<input type="hidden"
name="today"
id="today"
th:value="${today}">
<button class="btn btn-success w-100"
type="submit">
新規登録
</button>
</form>
</div>
<div class="d-grid mt-4">
<form th:action="@{/fixed-cost/list}" method="get">
<input type="hidden"
name="today"
id="today"
th:value="${today}">
<button class="btn btn-dark w-100"
type="submit">
固定費一覧
</button>
</form>
</div>
<div class="d-grid mt-4">
<form th:action="@{/category/list}"
method="get">
<input type="hidden"
name="today"
id="today"
th:value="${today}">
<button class="btn btn-dark w-100"
type="submit">
カテゴリ一覧
</button>
</form>
</div>
</div>
<div th:replace="~{footer :: footer}"></div>
</body>
</html>