Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-oshita

src/main/java/com/example/demo/app/domain/service/impl/CourseServiceImpl.java

@@ -133,6 +133,8 @@ public class CourseServiceImpl implements CourseService {
 		System.out.println("***********************ここでエラー1");
 		if (userEntity.getCourseEntity().getCourseId() == courseId) {
 			return "selected";
+		} else if (courseId <= 6) {
+			return "original";
 		}
 		System.out.println("***********************ここでエラー2");
 		allocationRepository.deleteByCourseId(courseId);

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

@@ -141,6 +141,10 @@ public class CourseController {
 
 			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
 
+		} else if (condition.equals("original")) {
+			model.addAttribute("message", "既存のデータは削除できません");
+
+			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
 		} else if (condition.equals("ok")) {
 			return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
 		} 

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;
 	}

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

@@ -429,7 +429,7 @@ public class TransactionController {
 
 		UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
 
-		List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0)
+		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,6 +214,10 @@ td:hover {
     vertical-align: middle;
 }
 
+.goal {
+	min-width: 300px;
+}
+
 /* =======================
    ボタン
 ======================= */

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>

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

src/main/resources/templates/select_course.html

@@ -22,12 +22,6 @@
 		    </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">
 		<button type="submit" class="btn btn-primary w-100">確定</button>
@@ -42,7 +36,8 @@
 						aria-controls="'collapse' + ${course.courseId}">
 						<span th:text="${course.courseName}"></span>
 					</button>
-					<p style="width: 120px;"><button type="button" class="btn btn-danger w-100"
+					
+					<p th:if="${course.courseId > 6}" style="width: 120px;"><button type="button" class="btn btn-danger w-100"
 							th:attr="data-course-id=${course.courseId}" onclick="deleteCourse(this)">削除</button></p>
 				</h2>
 				<div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse"

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>