[FIX] 送り先の修正及び変数名、表示法の修正

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

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">コース選択</button>
-				<button type="submit"onclick="location.href='/course/select/register'">コース選択</button>
 			</div>
 			
 			<div>

src/main/resources/templates/user_register_confirm.html

@@ -1,9 +1,11 @@
 <!DOCTYPE html>
 <html>
+
 <head>
-<meta charset="UTF-8">
+	<meta charset="UTF-8">
-<title>新規会員登録確認</title>
+	<title>新規会員登録確認</title>
 </head>
+
 <body class="pb-5 pt-5">
 	<div th:replace="~{header :: header}">
 	</div>
@@ -11,61 +13,73 @@
 	<main>
 		<h1>新規会員登録確認</h1>
 
+		<form th:action="@{/user/register/complete}" th:object="${userForm}" method="post">
 			<div>
-			<p>氏名</p>
+				<label for="userName">氏名</label>
-			<p th:text="${user.userName}"></p>
+				<input type="text" id="userName" th:field="*{userName}" maxlength="100" readonly>
 			</div>
 
 			<div>
-			<p>メールアドレス</p>
+				<label for="mailAddress">メールアドレス</label>
-			<p th:text="${user.mailAddress}"></p>
+				<input type="email" id="mailAddress" th:field="*{mailAddress}" maxlength="255" readonly>
 			</div>
 
 			<div>
-			<p>生年月日</p>
+				<label for="birthDate">生年月日</label>
-			<p th:text="${user.birthDate}"></p>
+				<input type="date" id="birthDate" name="birthDate" th:value="*{birthDate}" required readonly>
 			</div>
 
 			<div>
-			<p>パスワード</p>
+				<label for="password">パスワード</label>
-			<p>********</p>
+				<input type="password" id="password" name="password" th:value="*{password}" minlength="8"
+					maxlength="255" required readonly>
 			</div>
 
 			<div>
-			<p>秘密の質問</p>
+				<label for="secretQuestionId">秘密の質問</label>
-			<p th:text="${user.secretQuestionId}"></p>
+				<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>
-			<p>秘密の質問の回答</p>
+				<label for="secretAnswer">秘密の質問の回答</label>
-			<p th:text="${user.secretAnswer}"></p>
+				<input type="text" id="secretAnswer" th:field="*{secretAnswer}" maxlength="100" readonly>
 			</div>
 
 			<div>
-			<p>貯蓄金</p>
+				<label for="saving">貯蓄金</label>
-			<p th:text="${user.saving}"></p>
+				<input type="number" id="saving" th:field="*{saving}" min="0" readonly>
 			</div>
 
 			<div>
-			<p>年収</p>
+				<label for="annualIncome">年収</label>
-			<p th:text="${user.annualIncome}"></p>
+				<input type="number" id="annualIncome" th:field="*{annualIncome}" min="0" readonly>
 			</div>
 
 			<div>
-			<p>月別使用可能額</p>
+				<label for="monthlyBudget">月別使用可能金額</label>
-			<p th:text="${user.monthlyBudget}"></p>
+				<input type="number" id="monthlyBudget" th:field="*{monthlyBudget}" min="0" readonly>
 			</div>
 
 			<div>
-			<p>目標</p>
+				<label for="goalId">目標</label>
-			<p th:text="${user.goalId}"></p>
+				<input type="number" id="goalId" th:field="*{goalId}" min="0" readonly>
 			</div>
 
 			<div>
-			<p>コース</p>
+				<label>コース</label>
-			<p th:text="${user.courseId}"></p>
+				<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>
@@ -74,6 +88,11 @@
 			<form th:action="@{/user/register/complete}" method="post">
 				<button type="submit">確定</button>
 			</form>
+		</form>
+
+
 	</main>
+
 </body>
+
 </html>