From 21ca1a72e22a15c552dfaea52557687e9f39b8b8 Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Thu, 24 Sep 2026 10:03:30 +0900
Subject: [PATCH] =?UTF-8?q?[FIX]=20=E9=80=81=E3=82=8A=E5=85=88=E3=81=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=8A=E3=81=B3=E5=A4=89=E6=95=B0=E5=90=8D?=
 =?UTF-8?q?=E3=80=81=E8=A1=A8=E7=A4=BA=E6=B3=95=E3=81=AE=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/select_course.html    |   1 +
 .../resources/templates/user_register.html    |   7 +-
 .../templates/user_register_confirm.html      | 153 ++++++++++--------
 3 files changed, 90 insertions(+), 71 deletions(-)

diff --git a/src/main/resources/templates/select_course.html b/src/main/resources/templates/select_course.html
index 0c937e1..7fbda20 100644
--- a/src/main/resources/templates/select_course.html
+++ b/src/main/resources/templates/select_course.html
@@ -13,6 +13,7 @@
 	
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">  
 		<button type="submit">確定</button>
+		
 		<div class="accordion" id="accordionExample">
 		  <div class="accordion-item" th:each="course:${courseList}">
 		    <h2 class="accordion-header d-flex align-items-center">
diff --git a/src/main/resources/templates/user_register.html b/src/main/resources/templates/user_register.html
index 8f4e888..c6ec36b 100644
--- a/src/main/resources/templates/user_register.html
+++ b/src/main/resources/templates/user_register.html
@@ -11,7 +11,7 @@
 	<main>
 		<h1>新規会員登録</h1>
 		
-		<form th:action="@{/user/register/confirm}" th:object="${userForm}" method="post">
+		<form th:action="@{/course/select/register}" th:object="${userForm}" method="post">
 			<div>
 				<label for="userName">氏名</label>
 				<input type="text"
@@ -54,7 +54,7 @@
 				        th:field="*{secretQuestionId}"
 				        required>
 				    <option value="">選択してください</option>
-				    <option th:each="question : ${questionList}"
+				    <option th:each="question : ${session.questionList}"
 				            th:value="${question.secretQuestionId}"
 				            th:text="${question.questionText}">
 				    </option>
@@ -109,8 +109,7 @@
 			<div>
 				<label>コース</label>
 				<input type="hidden" th:field="*{courseId}">
-				<span th:text="${selectedCourseName}">未選択</span>
-				<button type="submit"onclick="location.href='/course/select/register'">コース選択</button>
+				<button type="submit">コース選択</button>
 			</div>
 			
 			<div>
diff --git a/src/main/resources/templates/user_register_confirm.html b/src/main/resources/templates/user_register_confirm.html
index 1ec83ed..ffbcb85 100644
--- a/src/main/resources/templates/user_register_confirm.html
+++ b/src/main/resources/templates/user_register_confirm.html
@@ -1,79 +1,98 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-<meta charset="UTF-8">
-<title>新規会員登録確認</title>
+	<meta charset="UTF-8">
+	<title>新規会員登録確認</title>
 </head>
+
 <body class="pb-5 pt-5">
 	<div th:replace="~{header :: header}">
-		</div>
-	
+	</div>
+
 	<main>
 		<h1>新規会員登録確認</h1>
-		
-		<div>
-			<p>氏名</p>
-			<p th:text="${user.userName}"></p>
-		</div>
-		
-		<div>
-			<p>メールアドレス</p>
-			<p th:text="${user.mailAddress}"></p>
-		</div>
-		
-		<div>
-			<p>生年月日</p>
-			<p th:text="${user.birthDate}"></p>
-		</div>
-		
-		<div>
-			<p>パスワード</p>
-			<p>********</p>
-		</div>
-		
-		<div>
-			<p>秘密の質問</p>
-			<p th:text="${user.secretQuestionId}"></p>
-		</div>
-		
-		<div>
-			<p>秘密の質問の回答</p>
-			<p th:text="${user.secretAnswer}"></p>
-		</div>
-		
-		<div>
-			<p>貯蓄金</p>
-			<p th:text="${user.saving}"></p>
-		</div>
-		
-		<div>
-			<p>年収</p>
-			<p th:text="${user.annualIncome}"></p>
-		</div>
-		
-		<div>
-			<p>月別使用可能額</p>
-			<p th:text="${user.monthlyBudget}"></p>
-		</div>
-		
-		<div>
-			<p>目標</p>
-			<p th:text="${user.goalId}"></p>
-		</div>
-		
-		<div>
-			<p>コース</p>
-			<p th:text="${user.courseId}"></p>
-		</div>
-		
-		<div>
-			<form th:action="@{/user/register}" method="get">
-				<button type="submit">戻る</button>
-			</form>
-		</div>
-		<form th:action="@{/user/register/complete}" method="post">
-					<button type="submit">確定</button>
+
+		<form th:action="@{/user/register/complete}" th:object="${userForm}" method="post">
+			<div>
+				<label for="userName">氏名</label>
+				<input type="text" id="userName" th:field="*{userName}" maxlength="100" readonly>
+			</div>
+
+			<div>
+				<label for="mailAddress">メールアドレス</label>
+				<input type="email" id="mailAddress" th:field="*{mailAddress}" maxlength="255" readonly>
+			</div>
+
+			<div>
+				<label for="birthDate">生年月日</label>
+				<input type="date" id="birthDate" name="birthDate" th:value="*{birthDate}" required readonly>
+			</div>
+
+			<div>
+				<label for="password">パスワード</label>
+				<input type="password" id="password" name="password" th:value="*{password}" minlength="8"
+					maxlength="255" required readonly>
+			</div>
+
+			<div>
+				<label for="secretQuestionId">秘密の質問</label>
+				<select id="secretQuestionId" th:field="*{secretQuestionId}" required readonly>
+					<option value="">選択してください</option>
+					<option th:each="question : ${session.questionList}" th:value="${question.secretQuestionId}"
+						th:text="${question.questionText}">
+					</option>
+				</select>
+			</div>
+
+			<div>
+				<label for="secretAnswer">秘密の質問の回答</label>
+				<input type="text" id="secretAnswer" th:field="*{secretAnswer}" maxlength="100" readonly>
+			</div>
+
+			<div>
+				<label for="saving">貯蓄金</label>
+				<input type="number" id="saving" th:field="*{saving}" min="0" readonly>
+			</div>
+
+			<div>
+				<label for="annualIncome">年収</label>
+				<input type="number" id="annualIncome" th:field="*{annualIncome}" min="0" readonly>
+			</div>
+
+			<div>
+				<label for="monthlyBudget">月別使用可能金額</label>
+				<input type="number" id="monthlyBudget" th:field="*{monthlyBudget}" min="0" readonly>
+			</div>
+
+			<div>
+				<label for="goalId">目標</label>
+				<input type="number" id="goalId" th:field="*{goalId}" min="0" readonly>
+			</div>
+
+			<div>
+				<label>コース</label>
+				<input type="hidden" th:field="*{courseId}">
+				<span th:text="${selectedCourseName}">未選択</span>
+				<button type="submit">コース選択</button>
+			</div>
+
+			<div>
+				<button type="submit">作成</button>
+			</div>
+			<div>
+				<form th:action="@{/user/register}" method="get">
+					<button type="submit">戻る</button>
 				</form>
+			</div>
+			<form th:action="@{/user/register/complete}" method="post">
+				<button type="submit">確定</button>
+			</form>
+		</form>
+
+
 	</main>
+
 </body>
+
 </html>
\ No newline at end of file