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

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

@@ -275,9 +275,7 @@ public class GoalController {
 
 		int currentAmount = goalService.getCurrentAmount(userId);
 
-		System.out.println("************************currentAmount : " + currentAmount);
+		model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
-		
-		session.setAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
 
 		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 	}

src/main/resources/templates/fixed_cost_create.html

@@ -37,7 +37,7 @@
 					<div class="mb-3">
 						<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="0">支出</option>
@@ -51,7 +51,7 @@
 					<div class="mb-3">
 						<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 class="expenseListClass" th:each="category : ${expenseList}"

src/main/resources/templates/goal_create.html

@@ -37,9 +37,7 @@
 					<div>
 						<label>目標金額</label>
 						<input type="number" th:field="*{targetAmount}" required min="1">
-						<br>
+						<span th:text="|所持金：${currentAmount}円|"></span>
-						<span th:text="|所持金：${session.currentAmount}円|"></span>
-						<input type="hidden" name="currentAmount" th:value="${currentAmount}">
 						<span th:if="${message != null}">
 							<span th:text="${message}" style="color: red;"></span>
 						</span>

src/main/resources/templates/select_course.html

@@ -13,7 +13,6 @@
 	<div th:replace="~{header :: header}"></div>
 	<h1 class="page-title">コース選択</h1>
 
-<<<<<<< HEAD
 	<div class="d-grid gap-2 mt-4">
 	    <th:block th:if="${mode == 'change'}">
 		    <form th:action="@{/course/create}" method="get">
@@ -24,7 +23,6 @@
 	    </th:block>
 	
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
-=======
 	<th:block th:if="${mode == 'change'}">
 		<form th:action="@{/course/create}" method="get">
 			<button type="submit">新規登録</button>
@@ -32,7 +30,6 @@
 
 	</th:block>
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" id="totalForm" method="post">
->>>>>>> 65b4a9e54a5bc5c1d1480fd4b9255addf73628e4
 		<button type="submit" class="btn btn-primary w-100">確定</button>
 
 		<div class="accordion" id="accordionExample">

src/main/resources/templates/transaction_create.html

@@ -122,16 +122,6 @@
 
 			const tType = '[[${session.tType}]]';
 			
-			console.log("tType: " + tType);
-			
-			if (tType.includes("0")) {
-				console.log("okokokokokokokkkokokokoko");
-				transactionType.value = "0";
-			} else if (tType.includes("1")) {
-				transactionType.value = "1";
-			}
-
-			
 			function toggleCategory() {
 
 			    if (transactionType.value === "0") {
@@ -174,6 +164,12 @@
 
 			});
 			
+			if (tType == "0") {
+				transactionType.value = "0";
+			} else if (tType == "1") {
+				transactionType.value = "1";
+			}
+			
 			toggleCategory();
 			
 		</script>