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

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

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");
+		System.out.println("session invalidated method not supported exception");
     	session.invalidate();
 
 		return TransitionTargetPageNameKeyword.ERROR_HTML;
@@ -61,7 +61,7 @@ public class GlobalExceptionHandler {
 		e.printStackTrace();
 
 		System.out.println("session invalidated exception");
-//		session.invalidate();
+		session.invalidate();
 		return TransitionTargetPageNameKeyword.ERROR_HTML;
 	}
 }

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

@@ -130,14 +130,17 @@ public class CourseServiceImpl implements CourseService {
 	public String deleteCourse(Long courseId, Long userId) {
 
 		UserEntity userEntity = userRepository.findById(userId).orElse(null);
+		System.out.println("***********************ここでエラー1");
 		if (userEntity.getCourseEntity().getCourseId() == courseId) {
 			return "selected";
-		} else if (courseId <= 6) {
-			return "original";
 		}
+		System.out.println("***********************ここでエラー2");
 		allocationRepository.deleteByCourseId(courseId);
+		System.out.println("***********************ここでエラー3");
 		courseOwnerRepository.deleteByCourseId(courseId);
+		System.out.println("***********************ここでエラー4");
 		courseRepository.deleteById(courseId);
+		System.out.println("***********************ここでエラー5");
 		return "ok";
 
 	}

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

@@ -132,7 +132,7 @@ public class CourseController {
 
 		LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
 
-//		System.out.println("**********************cousrId: " + courseId);
+		System.out.println("**********************cousrId: " + courseId);
 		String condition = courseService.deleteCourse(courseId, loginUser.getUserId());
 
 		if (condition.equals("selected")) {
@@ -141,10 +141,6 @@ 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,9 +275,7 @@ public class GoalController {
 
 		int currentAmount = goalService.getCurrentAmount(userId);
 
-//		System.out.println("************************currentAmount : " + currentAmount);
+		model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
-		
-		session.setAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
 
 		return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
 	}

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

@@ -430,6 +430,7 @@ public class TransactionController {
 		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/java/com/example/demo/utility/Constant.java

@@ -0,0 +1,5 @@
+package com.example.demo.utility;
+
+public class Constant {
+
+}

src/main/java/com/example/demo/utility/TestController1.java

@@ -0,0 +1,5 @@
+package com.example.demo.utility;
+
+public class TestController1 {
+
+}

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

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

src/main/resources/static/css/transaction_detail.css

@@ -0,0 +1,15 @@
+.transaction-item {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.transaction-buttons {
+    display: flex;
+    gap: 10px;
+    margin-right: 20px;
+}
+
+.transaction-buttons form {
+    margin: 0;
+}

src/main/resources/templates/fixed_cost_create.html

@@ -37,7 +37,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="transactionType">収入・支出</label>
 
-						<select class="form-select" id="transactionType" required>
+						<select class="form-select" id="transactionType">
 
 							<option value="">選択してください</option>
 							<option value="0">支出</option>
@@ -51,7 +51,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="categoryId">カテゴリ</label>
 
-						<select class="form-select" id="categoryId" th:field="*{categoryId}" required>
+						<select class="form-select" id="categoryId" th:field="*{categoryId}">
 							<option value="">選択してください</option>
 
 							<option class="expenseListClass" th:each="category : ${expenseList}"

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="|所持金：${currentAmount}円|"></span>
-						<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

@@ -54,102 +54,143 @@
 
 			const myChart =
 				new Chart(myCt, {
+
 					type: 'bar',
+
 					data: {
+
 						labels: labels,
+
 						datasets: [
 							{
 								label: '達成率',
+
 								data: achievementRates,
+
 								backgroundColor:
 									'rgba(54, 162, 235, 0.5)',
+
 								borderColor:
 									'rgba(54, 162, 235, 1)',
+
 								borderWidth: 1
 							}
 						]
 					},
+
 					options: {
+
 						responsive: true,
+
 						maintainAspectRatio: false,
+
 						scales: {
+
 							y: {
+
 								beginAtZero: true,
+
 								max: 100,
+
 								ticks: {
+
 									callback: function (value) {
 										return value + '%';
 									}
+
 								}
+
 							}
+
 						}
+
 					}
+
 				});
+
 		</script>
 
 		<ul>
 
 			<li th:each="goalForm : ${goalFormList}">
+
 				<div class="d-flex justify-content-between">
+
 					<form th:action="@{/goal}" method="get" class="w-100">
+
 						<div class="table-responsive">
+
 							<table class="table mb-0">
+
 								<input type="radio" name="goalId" th:value="${goalForm.goalId}"
 									th:checked="${graphGoal != null and graphGoal.goalId == goalForm.goalId}"
 									onchange="this.form.submit()">
 
 								<tr>
 									<th>目標名</th>
-									<td th:text="${goalForm.goalTitle}" 
+									<td th:text="${goalForm.goalTitle}"></td>
-									    class="goal"></td>
 								</tr>
 
 								<tr>
-									<th>目標説明</th >
+									<th>目標説明</th>
-									<td th:text="${goalForm.goalSubtitle}"
+									<td th:text="${goalForm.goalSubtitle}"></td>
-									    class="goal"></td>
 								</tr>
+
 								<tr>
 									<th>目標金額</th>
-									<td th:text="${goalForm.targetAmount}"
+									<td th:text="${goalForm.targetAmount}"></td>
-									    class="goal"></td>
 								</tr>
+
 								<tr>
 									<th>目標達成期限</th>
-									<td th:text="${goalForm.deadline}"
+									<td th:text="${goalForm.deadline}"></td>
-									    class="goal"></td>
 								</tr>
+
 								<tr>
 									<th>達成率</th>
-									<td th:text="${goalForm.achievementRate} + '%'"
+									<td th:text="${goalForm.achievementRate} + '%'"></td>
-									    class="goal"></td>
 								</tr>
+
 							</table>
+
 						</div>
+
 					</form>
+
 				</div>
 
 				<div class="d-flex justify-content-end gap-2 mt-3">
+
 					<form th:action="@{/goal/edit}" method="get">
+
 						<input type="hidden" name="goalId" th:value="${goalForm.goalId}">
+
 						<button type="submit" class="btn btn-sm btn-primary">
 							編集
 						</button>
+
 					</form>
 
 					<form th:action="@{/goal/delete}" method="post">
+
 						<input type="hidden" name="goalId" th:value="${goalForm.goalId}">
+
 						<button type="submit" class="btn btn-sm btn-danger">
 							削除
 						</button>
+
 					</form>
+
 				</div>
+
 			</li>
 
 		</ul>
 
 	</div>
+
 	<div class="d-grid gap-2 mt-4">
+		
 	<form th:action="@{/goal/create}" method="get">
 
 		<button type="submit" class="btn btn-success w-100">
@@ -159,6 +200,7 @@
 	</form>
 
 	<form th:action="@{/goal/record}" method="get">
+
 		<button type="submit" class="btn btn-sm btn-primary w-100">
 			履歴
 		</button>
@@ -166,6 +208,7 @@
 	</form>
 	
 	</div>
+
 	<div th:replace="~{footer :: footer}"></div>
 
 </body>

src/main/resources/templates/menu.html

@@ -6,7 +6,7 @@
 	<meta charset="UTF-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
-	<title>カレンダー</title>
+	<title>Calendar</title>
 
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 
@@ -55,35 +55,51 @@
 
 
 		<tbody>
+
 			<tr th:each="week : ${#numbers.sequence(0, 5)}">
+
 				<td th:each="weekDay : ${#numbers.sequence(0, 6)}">
+
 					<a th:if="${week * 7 + weekDay - firstDayOfWeek + 1 >= 1
 					           and week * 7 + weekDay - firstDayOfWeek + 1 <= lastDay}" th:href="@{/transaction/detail(
 					       todayDates=${T(java.time.LocalDate).of(year, month, week * 7 + weekDay - firstDayOfWeek + 1)}
 					   )}" class="a-footer">
+
+
 						<div
 							th:if="${week * 7 + weekDay - firstDayOfWeek + 1 >= 1 and week * 7 + weekDay - firstDayOfWeek + 1 <= lastDay}">
+
 							<div class="date" th:text="${week * 7 + weekDay - firstDayOfWeek + 1}">
 							</div>
+
 							<div th:each="income : ${incomeList}"
 								th:if="${income.date.dayOfMonth == week * 7 + weekDay - firstDayOfWeek + 1}"
 								class="income" th:text="|収入 +${income.amount}円|">
 							</div>
+
 							<div th:each="expense : ${expenseList}"
 								th:if="${expense.date.dayOfMonth == week * 7 + weekDay - firstDayOfWeek + 1}"
 								class="expense" th:text="|支出 -${expense.amount}円|">
 							</div>
+
 						</div>
+
 					</a>
+
 				</td>
+
 			</tr>
+
+
 		</tbody>
 
 	</table>
 
 
 	<div class="card shadow-sm mb-3">
+
 	    <div class="card-body">
+
 	        <div class="d-flex justify-content-between mb-2">
 	            <span>収入</span>
 	            <span th:text="'￥' + ${totalIncome}"></span>
@@ -108,19 +124,25 @@
 	            <span>目標資金</span>
 	            <span th:text="'￥' + ${targetAmount}"></span>
 	        </div>
+
 	        <div class="d-flex justify-content-between mb-2">
 	            <span>現在高</span>
 	            <span th:text="'￥' + ${currentAmount}"></span>
 	        </div>
+
 	        <div class="d-flex justify-content-between">
 	            <span>貯金額</span>
 	            <span th:text="'￥' + ${saving}"></span>
 	        </div>
+
 	    </div>
 
 	</div>
+	
 	<div class="card shadow-sm">
+
 	    <div class="card-body">
+
 	        <div class="d-flex justify-content-between mb-2">
 	            <span>達成率</span>
 	            <span th:text="${achievementRate} + '%'"

src/main/resources/templates/select_course.html

@@ -22,6 +22,12 @@
 		    </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>
@@ -36,8 +42,7 @@
 						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,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>

src/main/webapp/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-