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/menu.html
#	src/main/resources/templates/select_course.html
#	src/main/resources/templates/transaction_detail.html

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

@@ -1,5 +0,0 @@
-package com.example.demo.app.infra.entity;
-
-public class TestController6 {
-
-}

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

@@ -52,7 +52,7 @@ public class PasswordResetController {
 	    System.out.println("isReset=" + isReset);
 
 	    if(!isReset) {
-	        model.addAttribute("Message", "パスワードが一致しません。");
+	        model.addAttribute("message", "パスワードが一致しません。");
 	        return "password_reset";
 	    }
 

src/main/java/com/example/demo/app/presentation/controller/pageproperty/PageReturnAttributeKeyword.java

@@ -0,0 +1,56 @@
+package com.example.demo.app.presentation.controller.pageproperty;
+
+public class PageReturnAttributeKeyword {
+
+	public static final String ERROR_MESSAGE = "errorMessage";
+	public static final String MESSAGE = "message";
+	
+	
+	public static final String QUESTION_LIST = "questionList";
+	public static final String USER_FORM = "userForm";
+	public static final String SELECTED_COURSE_NAME = "selectedCourseName";
+	public static final String COURESE_ID = "courseId";
+	
+	public static final String PASSWOR_RESET_FORM = "passwordResetForm";
+	public static final String PASSWOR_RESET_USER_ID = "passwordResetUserId";
+	
+	public static final String AUTENTICATION_FORM = "authenticationForm";
+	
+	public static final String PROFILE_FORM = "profileForm";
+	public static final String PROFILE_EDIT_FORM = "profileEditForm";
+	
+	public static final String MODE = "mode";
+	public static final String CURRENT_COURSE_ID = "currentCourseId";
+	public static final String COURSE_LIST = "courseList";
+	public static final String COURSE_INFO_LIST = "courseInfoList";	
+	
+	public static final String YEAR = "year";
+	public static final String MONTH = "month";
+	public static final String DAY = "day";
+	public static final String PREVIOUS_YEAR = "previousYear";
+	public static final String PREVIOUS_MONTH = "previousMonth";
+	public static final String LAST_DAY = "lastDay";
+	public static final String FIRST_DAY_OF_WEEK = "firstDayOfWeek";
+	public static final String NEXT_YEAR = "nextYear";
+	public static final String NEXT_MONTH = "nextMonth";
+	public static final String TODAY = "today";
+	public static final String TRANSACTION_FORM_MAP = "transactionFormMap";
+	public static final String TRANSACTION_FORM_LIST = "transactionFormList";
+	public static final String TRANSACTION_FORM = "transactionForm";
+	public static final String TRANSACTION_ID = "transactionId";
+	public static final String CATEGORY_FORM_LIST = "categoryFormList";
+	public static final String INCOME_LIST = "incomeList";
+	public static final String EXPENSE_LIST = "expenseList";
+	public static final String TOTAL_INCOME = "totalIncome";
+	public static final String TOTAL_EXPENSE = "totalExpense";
+	public static final String ACHIEVEMENT_RATE = "achievementRate";
+	public static final String CURRENT_AMOUNT = "currentAmount";
+	public static final String TARGET_AMOUNT = "targetAmount";
+	public static final String SAVING = "saving";
+	public static final String DEADLINE = "deadline";
+	
+	public static final String ANALYSIS_FORM = "analysisForm";
+	
+	public static final String GOAL_FORM = "goalForm";
+	
+}

src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java

@@ -0,0 +1,6 @@
+package com.example.demo.app.presentation.controller.pageproperty;
+
+public class SessionKeyword {
+	// SESSION情報として格納したいログイン者の情報
+    public static final String LOGIN_USER = "loginUser";
+}

src/main/java/com/example/demo/app/presentation/controller/pageproperty/TransitionTargetPageNameKeyword.java

@@ -0,0 +1,76 @@
+package com.example.demo.app.presentation.controller.pageproperty;
+
+public class TransitionTargetPageNameKeyword {
+
+	// HTML
+	public static final String ERROR_HTML = "error";
+	
+	public static final String USER_RESISTER_HTML = "user_resiter";
+	public static final String USER_RESISTER_RETURN_HTML = "user_resiter_return";
+	public static final String USER_RESISTER_CONFIRM_HTML = "user_resiter_confirm";
+
+	public static final String LOGIN_HTML = "login";
+	
+	public static final String PASSWORD_RESET_HTML = "passsword_reset";
+	
+	public static final String AUTHENTICATION_HTML = "authentication";
+	
+	public static final String MENU_HTML = "menu";
+	
+	public static final String PROFILE_HTML = "profile";
+	public static final String PROFILE_EDIT_HTML = "profile_edit";
+	
+	public static final String SELECT_COURSE_HTML = "select_course";
+	
+	public static final String TRANSACTION_LIST_HTML = "transaction_list";
+	public static final String TRANSACTION_DETAIL_HTML = "transaction_detail";
+	public static final String TRANSACTION_CREATE_HTML = "transaction_create";
+	public static final String TRANSACTION_UPDATE_HTML = "transaction_update";
+	
+	public static final String ANALYSIS_HTML = "analysis";
+	
+	public static final String GOAL_VIEW_HTML = "goal_view";
+	public static final String GOAL_EDIT_HTML = "goal_edit";
+	
+	// Countroller
+	public static final String ERROR = "/error";
+	
+	public static final String USER_RESISTER = "/user/register";
+	public static final String USER_RESISTER_RETURN = "/user/register/return";
+	public static final String USER_RESISTER_CONFIRM = "/user/register/confirm";
+	public static final String USER_RESISTER_COMPLETE = "/user/register/complete";
+	
+	
+	public static final String REDIRECT = "redirect:";
+	public static final String LOGIN = "/login";
+	public static final String LOGOUT = "/logout";
+	
+	public static final String AUTHENTICATION = "/authentication";
+	
+	public static final String PASSWORD_RESET = "/passsword/reset";
+	
+	public static final String MENU = "/menu";
+	
+	public static final String PROFILE = "/profile";
+	public static final String PROFILE_EDIT = "/profile/edit";
+	public static final String WITHDRAW = "/withdraw";
+	
+	public static final String SHOW_SELECT_COURSE = "/user/register/course";
+	public static final String COURSE = "/course";
+	public static final String CHANGE = "/change";
+	
+	public static final String INTERROGATION = "?";
+	public static final String EQUAL = "=";
+	public static final String TRANSACTION_LIST = "/transaction/list";
+	public static final String TRANSACTION_DETAIL = "/transaction/detail";
+	public static final String TRANSACTION_CREATE = "/transaction/create";
+	public static final String TRANSACTION_UPDATE = "/transaction/update";
+	public static final String TODAY_DATES = "todayDates";
+	
+	public static final String ANALYSIS = "/analysis";
+	
+	public static final String GOAL = "/goal";
+	public static final String GOAL_EDIT = "/goal/edit";
+	public static final String GOAL_UPDATE = "/goal/update";
+	
+}

src/main/resources/templates/menu.html

@@ -138,6 +138,8 @@
 
 	    </div>
 
+
+
 	</div>
 	
 	<div class="card shadow-sm">

src/main/resources/templates/select_course.html

@@ -11,47 +11,35 @@
 <body>
 	<div th:replace="~{header :: header}"></div>
 	
-	<h1>コース選択</h1>
-
-	<th:block th:if="${mode == 'change'}">
-		<form th:action="@{/course/create}" method="get">
-			<button type="submit">新規登録</button>
-		</form>
+	<h1 class="page-title">コース選択</h1>
 	
 	
-	</th:block>
 	<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">  
-		<button type="submit">確定</button>
+		<button type="submit" class="btn btn-primary w-100">確定</button>
 
 		<div class="accordion" id="accordionExample">
-			<div class="accordion-item" th:each="course:${courseList}">
-				<h2 class="accordion-header d-flex align-items-center">
-					<input type="radio" name="courseId" th:value="${course.courseId}"
-						th:checked="${course.courseId==currentCourseId}" class="form-check-input ms-3 me-2">
-					<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-						th:data-bs-target="'#collapse' + ${course.courseId}" aria-expanded="false"
-						aria-controls="'collapse' + ${course.courseId}">
-						<span th:text="${course.courseName}"></span>
-					</button>
-				</h2>
-				<div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse"
-					data-bs-parent="#accordionExample">
-					<div class="accordion-body">
-						<span th:text="${course.description}"></span>
-						<table border="1">
-							<tr>
-								<th>カテゴリ名</th>
-								<th>配分(%)</th>
-							</tr>
-							<tr th:each="courseInfo:${courseInfoList}"
-								th:if="${course.courseId == courseInfo.courseId}">
-								<td th:text="${courseInfo.categoryName}"></td>
-								<td th:text="${courseInfo.allocationRatio}"></td>
-							</tr>
-						</table>
-					</div>
-				</div>
-			</div>
+		  <div class="accordion-item" th:each="course:${courseList}">
+		    <h2 class="accordion-header d-flex align-items-center">
+			  <input type="radio" name="courseId" th:value="${course.courseId}" th:checked="${course.courseId==currentCourseId}" class="form-check-input ms-3 me-2">
+		      <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" th:data-bs-target="'#collapse' + ${course.courseId}" aria-expanded="false" aria-controls="'collapse' + ${course.courseId}">
+				<span th:text="${course.courseName}"></span>
+		      </button>
+		    </h2>
+		    <div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse" data-bs-parent="#accordionExample">
+		      <div class="accordion-body">
+		        <span th:text="${course.description}"></span>
+				<table class="table table-bordered">
+					<tr>
+						<th>カテゴリ名</th><th>配分(%)</th>
+					</tr>
+					<tr th:each="courseInfo:${courseInfoList}" th:if="${course.courseId == courseInfo.courseId}">
+						<td th:text="${courseInfo.categoryName}"></td>
+						<td th:text="${courseInfo.allocationRatio}"></td>
+					</tr>
+				</table>
+		      </div>
+		    </div>
+		  </div>
 		</div>
 	</form>
 

src/main/resources/templates/transaction_detail.html

@@ -105,7 +105,6 @@
 
 	</div>
 
-
 	<form th:action="@{/transaction/create}" method="get">
 		<input type="hidden" name="today" id="today" th:value="${today}">
 		<button type="submit">新規登録</button>