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

# Conflicts:
#	src/main/resources/templates/transaction_detail.html

src/main/java/com/example/demo/app/domain/model/GoalModel.java

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

src/main/java/com/example/demo/app/infra/entity/GoalEntity.java

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

src/main/java/com/example/demo/app/presentation/controller/ProfileController.java

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

src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java

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

src/main/resources/templates/transaction_detail.html

@@ -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>