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

# Conflicts:
#	src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java

src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java

@@ -28,5 +28,5 @@ public interface AllocationRepository extends JpaRepository<AllocationEntity, Al
 			+ " ORDER BY a.courseEntity.courseId ASC, "
 			+ " a.categoryEntity.categoryId ASC ")
 	List<CourseInfoModel> findAllJoinedAllocation();
-	
+
 }

src/main/java/com/example/demo/app/infra/repository/UserRepository.java

@@ -16,5 +16,6 @@ public interface UserRepository extends JpaRepository<UserEntity, Long> {
             String mailAddress,
             String password);
 
+    Optional<UserEntity> findByMailAddress(String mailAddress);
 }
 

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

@@ -31,5 +31,19 @@ public class UserController {
 
 	    return "user_register_confirm";
 	}
+	
+	@PostMapping("/user/register/complete")
+	public String completeRegister(HttpSession session) {
+
+	    UserForm userForm =
+	            (UserForm) session.getAttribute("userForm");
+
+	    // DBへの登録処理
+
+	    session.removeAttribute("userForm");
+
+	    return "redirect:/login";
+	}
+
 
 }

src/main/resources/templates/analysis.html

@@ -12,7 +12,7 @@
 	<table class="table text-center">
         <thead>
 	        <tr>
-                <th scope="col">カテゴリ別</th>
+                <th scope="col"></th>
 			    <th scope="col">支出</th>
 			    <th scope="col">前月比</th>
 			</tr>
@@ -20,8 +20,17 @@
         <tbody>
 			<tr>
 		      <th scope="row">総支出</th>
-			      <td th:text="'￥' + ${analysisForm.currentMonthTotalAmount}">0</td>
+			      <td th:text="'￥' + ${analysisForm.currentMonthTotalAmount}">
-			      <td th:text="'￥' + ${analysisForm.totalDifferenceAmount}">0</td>
+					0
+				  </td>
+			      <td th:text="${analysisForm.totalDifferenceAmount >= 0}
+					      ? '+' + ${analysisForm.totalDifferenceAmount}
+						  : '-' + ${analysisForm.totalDifferenceAmount}"
+				      th:class="${analysisForm.totalDifferenceAmount >= 0}
+					      ? 'color-danger;'
+						  : 'color-primary;'">
+					0
+				  </td>
 		      </tr>
 		</tbody>
 	</table>
@@ -44,7 +53,7 @@
 		<tr th:each="category : ${analysisForm.categoryAnalysisFormList}">
 			
 	      <th scope="row"
-		      th;text="${category.categoryName}">
+		      th:text="${category.categoryName}">
 			  食費
 		  </th>
 		  
@@ -53,10 +62,20 @@
 		  </td>
 		  
 	      <td>
-			<span th:text="'￥' + ${category.monthDifferenceAmount}">
+			<span th:text="${category.monthDifferenceAmount >= 0}
+			          ? '+' + ${category.monthDifferenceAmount}
+				      : '-' + ${category.monthDifferenceAmount}"
+			      th:class="${category.monthDifferenceAmount >= 0}
+				      ? 'color-danger;'
+				  	  : 'color-primary;'">
 			</span>
 			<br>
-			<span th:text="'￥' + ${category.courseDifferenceAmount}">
+			<span th:text="${category.courseDifferenceAmount >= 0}
+				      ? '+' + ${category.courseDifferenceAmount}
+					  : '-' + ${category.courseDifferenceAmount}"
+			      th:class="${category.courseDifferenceAmount >= 0}
+				      ? 'color-danger;'
+				      : 'color-primary;'">
 			</span>
 		  </td>
 	    </tr>