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/aop/handler/GlobalExceptionHandler.java

@@ -49,7 +49,7 @@ public class GlobalExceptionHandler {
 
 		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
 		
-		System.out.println("session invalidated method not supported exception");
+		System.out.println("session invalidated");
     	session.invalidate();
 
 		return TransitionTargetPageNameKeyword.ERROR_HTML;

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);
-		
-		session.setAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
+		model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
 
 		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 	}
@@ -294,7 +292,7 @@ public class GoalController {
 			model.addAttribute(PageReturnAttributeKeyword.MESSAGE, "現在所持金より高い金額を設定してください。");
 			return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 		}
-		
+
 		return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
 	}
 

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

@@ -372,29 +372,29 @@ public class TransactionController {
 			@RequestParam(required = false, defaultValue = "0") String months) {
 
 		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
-	
+
 		LocalDate today = LocalDate.now();
-	
+
 		int year = (years.equals("0")) ? today.getYear() : Integer.parseInt(years);
-	
+
 		int month = (months.equals("0")) ? today.getMonthValue() : Integer.parseInt(months);
-	
+
 		YearMonth yearMonth = YearMonth.of(year, month);
-	
+
 		int lastDay = yearMonth.lengthOfMonth();
-	
+
 		int firstDayOfWeek = yearMonth.atDay(1).getDayOfWeek().getValue() % 7;
-	
+
 		YearMonth previousYearMonth = yearMonth.minusMonths(1);
-	
+
 		int previousYear = previousYearMonth.getYear();
 		int previousMonth = previousYearMonth.getMonthValue();
-	
+
 		YearMonth nextYearMonth = yearMonth.plusMonths(1);
-	
+
 		int nextYear = nextYearMonth.getYear();
 		int nextMonth = nextYearMonth.getMonthValue();
-	
+
 		model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
 		model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
 		model.addAttribute(PageReturnAttributeKeyword.DAY, today.getDayOfMonth());
@@ -410,27 +410,26 @@ public class TransactionController {
 
 		LocalDate startDate = yearMonth.atDay(1);
 		LocalDate endDate = yearMonth.atEndOfMonth();
-	
+
 		List<Income> incomeList = transactionService.findTotalIncomeList(startDate, endDate, loginUser.getUserId());
 
 		List<Expense> expenseList = transactionService.findTotalExpenseList(startDate, endDate, loginUser.getUserId());
-	
+
 		model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
 		model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
-		
+
 		int totalIncome = transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId());
 
 		int totalExpense = transactionService.findTotalExpense(startDate, endDate, loginUser.getUserId());
-	
+
 		model.addAttribute(PageReturnAttributeKeyword.TOTAL_INCOME, totalIncome);
 		model.addAttribute(PageReturnAttributeKeyword.TOTAL_EXPENSE, totalExpense);
-	
+
 		List<GoalForm> goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId()));
 
 		UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
 
 		List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0 && goal.getDeadline().isAfter(today) )
-
 				.collect(Collectors.toList());
 
 		if (!resultList.isEmpty()) {

src/main/resources/static/css/style.css

@@ -214,10 +214,6 @@ td:hover {
     vertical-align: middle;
 }
 
-.goal {
-	min-width: 300px;
-}
-
 /* =======================
    ボタン
 ======================= */

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="|所持金：${session.currentAmount}円|"></span>
-						<input type="hidden" name="currentAmount" th:value="${currentAmount}">
+						<span th:text="|所持金：${currentAmount}円|"></span>
 						<span th:if="${message != null}">
 							<span th:text="${message}" style="color: red;"></span>
 						</span>

src/main/resources/templates/goal_view.html

@@ -128,32 +128,27 @@
 
 								<tr>
 									<th>目標名</th>
-									<td th:text="${goalForm.goalTitle}" 
-									    class="goal"></td>
+									<td th:text="${goalForm.goalTitle}"></td>
 								</tr>
 
 								<tr>
-									<th>目標説明</th >
-									<td th:text="${goalForm.goalSubtitle}"
-									    class="goal"></td>
+									<th>目標説明</th>
+									<td th:text="${goalForm.goalSubtitle}"></td>
 								</tr>
 
 								<tr>
 									<th>目標金額</th>
-									<td th:text="${goalForm.targetAmount}"
-									    class="goal"></td>
+									<td th:text="${goalForm.targetAmount}"></td>
 								</tr>
 
 								<tr>
 									<th>目標達成期限</th>
-									<td th:text="${goalForm.deadline}"
-									    class="goal"></td>
+									<td th:text="${goalForm.deadline}"></td>
 								</tr>
 
 								<tr>
 									<th>達成率</th>
-									<td th:text="${goalForm.achievementRate} + '%'"
-									    class="goal"></td>
+									<td th:text="${goalForm.achievementRate} + '%'"></td>
 								</tr>
 
 							</table>

src/main/resources/templates/select_course.html

@@ -21,6 +21,12 @@
 				</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">

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>