From f319fcb9f8d9087537b12a5aea6d2fbff63a7924 Mon Sep 17 00:00:00 2001
From: kkazuya <kkazuya@iij.ad.jp>
Date: Tue, 29 Sep 2026 15:22:15 +0900
Subject: [PATCH 1/5] =?UTF-8?q?[EDIT]=20=E5=9B=BA=E5=AE=9A=E8=B2=BB?=
 =?UTF-8?q?=E7=99=BB=E9=8C=B2=E3=81=AE=E5=8F=8E=E6=94=AF=E5=8C=BA=E5=88=86?=
 =?UTF-8?q?=E3=81=A8=E3=82=AB=E3=83=86=E3=82=B4=E3=83=AA=E3=83=BC=E3=82=92?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9B=E5=BF=85=E9=A0=88=E3=81=AB=E3=81=97=E3=81=BE?=
 =?UTF-8?q?=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/fixed_cost_create.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/fixed_cost_create.html b/src/main/resources/templates/fixed_cost_create.html
index 0c478d1..8217b49 100644
--- a/src/main/resources/templates/fixed_cost_create.html
+++ b/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}"

From 31b5e540231d182704181327ee8a3b560c690001 Mon Sep 17 00:00:00 2001
From: n-kawahito <n-kawahito@iij.ad.jp>
Date: Tue, 29 Sep 2026 15:31:23 +0900
Subject: [PATCH 2/5] =?UTF-8?q?[FIX]=E3=83=9C=E3=82=BF=E3=83=B3=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/select_course.html | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html
index e2a5b43..88419b5 100644
--- a/src/main/resources/templates/select_course.html
+++ b/src/main/resources/templates/select_course.html
@@ -21,12 +21,6 @@
 				</button>
 		    </form>
 	    </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>
-		</form>
 
 	</th:block>
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" id="totalForm" method="post">

From 67cc89d2a85880067ff929c7504b3dd7ecd08da9 Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Tue, 29 Sep 2026 15:58:55 +0900
Subject: [PATCH 3/5] =?UTF-8?q?[FIX]=20=E5=9B=BA=E5=AE=9A=E8=B2=BB?=
 =?UTF-8?q?=E3=81=AE=E5=8F=8E=E6=94=AF=E5=8C=BA=E5=88=86=E3=81=8C=E8=87=AA?=
 =?UTF-8?q?=E5=8B=95=E3=81=A7=E5=85=A5=E5=8A=9B=E3=81=95=E3=82=8C=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/transaction_create.html  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/templates/transaction_create.html b/src/main/resources/templates/transaction_create.html
index 0c818e9..c8295ed 100644
--- a/src/main/resources/templates/transaction_create.html
+++ b/src/main/resources/templates/transaction_create.html
@@ -122,6 +122,16 @@
 
 			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") {
@@ -164,12 +174,6 @@
 
 			});
 			
-			if (tType == "0") {
-				transactionType.value = "0";
-			} else if (tType == "1") {
-				transactionType.value = "1";
-			}
-			
 			toggleCategory();
 			
 		</script>

From d3b76fb2cde0f8c69f83fbbdaded2e019d8b6ade Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Tue, 29 Sep 2026 15:59:14 +0900
Subject: [PATCH 4/5] =?UTF-8?q?[FIX]=20=E6=89=80=E6=8C=81=E9=87=91?=
 =?UTF-8?q?=E3=81=8Cnull=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=82=8B=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3=E3=81=97?=
 =?UTF-8?q?=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/app/presentation/controller/GoalController.java    | 6 ++++--
 src/main/resources/templates/goal_create.html               | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
index 61133c1..fdbf9c4 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
@@ -275,7 +275,9 @@ public class GoalController {
 
 		int currentAmount = goalService.getCurrentAmount(userId);
 
-		model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
+		System.out.println("************************currentAmount : " + currentAmount);
+		
+		session.setAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
 
 		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 	}
@@ -292,7 +294,7 @@ public class GoalController {
 			model.addAttribute(PageReturnAttributeKeyword.MESSAGE, "現在所持金より高い金額を設定してください。");
 			return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 		}
-
+		
 		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
 	}
 
diff --git a/src/main/resources/templates/goal_create.html b/src/main/resources/templates/goal_create.html
index 7acbe37..ebb9f05 100644
--- a/src/main/resources/templates/goal_create.html
+++ b/src/main/resources/templates/goal_create.html
@@ -37,7 +37,9 @@
 					<div>
 						<label>目標金額</label>
 						<input type="number" th:field="*{targetAmount}" required min="1">
-						<span th:text="|所持金：${currentAmount}円|"></span>
+						<br>
+						<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>

From 546a2927eb8bd193d362de7bf1676a8ef5d3f036 Mon Sep 17 00:00:00 2001
From: n-kawahito <n-kawahito@iij.ad.jp>
Date: Tue, 29 Sep 2026 16:01:27 +0900
Subject: [PATCH 5/5] =?UTF-8?q?[FIX]=E7=9B=AE=E6=A8=99=E3=81=8C=E3=81=99?=
 =?UTF-8?q?=E3=81=90=E6=94=B9=E8=A1=8C=E3=81=95=E3=82=8C=E3=82=8B=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E8=A7=A3=E6=B6=88=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/css/style.css     |  4 ++++
 src/main/resources/templates/goal_view.html | 17 +++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index 8632b09..b7ebef2 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -214,6 +214,10 @@ td:hover {
     vertical-align: middle;
 }
 
+.goal {
+	min-width: 300px;
+}
+
 /* =======================
    ボタン
 ======================= */
diff --git a/src/main/resources/templates/goal_view.html b/src/main/resources/templates/goal_view.html
index 45b6b63..786d4ff 100644
--- a/src/main/resources/templates/goal_view.html
+++ b/src/main/resources/templates/goal_view.html
@@ -128,27 +128,32 @@
 
 								<tr>
 									<th>目標名</th>
-									<td th:text="${goalForm.goalTitle}"></td>
+									<td th:text="${goalForm.goalTitle}" 
+									    class="goal"></td>
 								</tr>
 
 								<tr>
-									<th>目標説明</th>
-									<td th:text="${goalForm.goalSubtitle}"></td>
+									<th>目標説明</th >
+									<td th:text="${goalForm.goalSubtitle}"
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>目標金額</th>
-									<td th:text="${goalForm.targetAmount}"></td>
+									<td th:text="${goalForm.targetAmount}"
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>目標達成期限</th>
-									<td th:text="${goalForm.deadline}"></td>
+									<td th:text="${goalForm.deadline}"
+									    class="goal"></td>
 								</tr>
 
 								<tr>
 									<th>達成率</th>
-									<td th:text="${goalForm.achievementRate} + '%'"></td>
+									<td th:text="${goalForm.achievementRate} + '%'"
+									    class="goal"></td>
 								</tr>
 
 							</table>