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/transaction_detail.html

src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java

@@ -55,11 +55,15 @@ public class GlobalExceptionHandler {
 
 	@ExceptionHandler(Exception.class)
 	public String AllException(Model model, Exception e, HttpSession session) {
+		model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
 
 		e.printStackTrace();
 
-		System.out.println("session invalidated exception");
+		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
-		session.invalidate();
+
+		System.out.println("session invalidated");
+    	session.invalidate();
+		
 		return "error";
 	}
 }

src/main/java/com/example/demo/app/domain/model/GoalModel.java

@@ -57,7 +57,7 @@ public class GoalModel {
 				goalModel.getTargetAmount(),
 				goalModel.getDeadline(),
 				0,
-				userEntity);
+				userEntity, 0);
 	}
 	
 	public static GoalModel convertFrom(GoalForm goalForm) {

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

@@ -53,13 +53,13 @@ public class UserServiceImpl implements UserService {
 
 		userEntity.setQuestionEntity(questionEntity);
 		
+		
+		
 		userEntity.setCourseEntity(courseEntity);
 
 		userEntity.setDeleteFlag(0);
 
-		goalEntity.setUserEntity(userRepository.save(userEntity));
+		userRepository.save(userEntity);
-		
-		goalRepository.save(goalEntity);
 	}
 
 	@Override

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

@@ -29,7 +29,7 @@ public class CategoryEntity {
 	@Column(name = "category_id")
 	private Long categoryId;
 
-	@Column(name = "category_name", nullable = false, length = 50)
+	@Column(name = "category_name", nullable = false)
 	private String categoryName;
 
 	@Column(name = "transaction_type", nullable = false)

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

@@ -27,7 +27,7 @@ public class CourseEntity {
 	 @Column(name = "course_id")
 	 private Long courseId;
 	 
-	 @Column(name = "course_name", nullable = false, length = 50)
+	 @Column(name = "course_name", nullable = false)
 	 private String courseName;
 	
 	 

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

@@ -34,7 +34,7 @@ public class FixedCostEntity {
 	@JoinColumn(name = "category_id")
 	private CategoryEntity categoryEntity;
 	
-	@Column(name = "fixed_cost_name", nullable = false, length = 50)
+	@Column(name = "fixed_cost_name", nullable = false)
 	private String fixedCostName;
 
 	@Column(name = "amount", nullable = false)

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

@@ -29,10 +29,10 @@ public class GoalEntity {
 	private Long goalId;
 
 	@Column(name = "goal_title", nullable = true)
-	private String goalTitle = "名前を設定してください";
+	private String goalTitle;
 	
 	@Column(name = "goal_subtitle", nullable = true)
-	private String goalSubtitle = "説明を書いてください";
+	private String goalSubtitle;
 	
 	@Column(name = "target_amount", nullable = true)
 	private Integer targetAmount;
@@ -47,4 +47,6 @@ public class GoalEntity {
 	@JoinColumn(name = "user_id")
 	private UserEntity userEntity;
 	
+	private Integer deleteFlag;
+
 }

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/infra/entity/UserEntity.java

@@ -30,7 +30,7 @@ public class UserEntity {
 	@Column(name = "user_id")
 	private Long userId;
 
-	@Column(name = "user_name", nullable = false, length = 100)
+	@Column(name = "user_name", nullable = false)
 	private String userName;
 
 	@Column(name = "mail_address", nullable = false)
@@ -39,7 +39,7 @@ public class UserEntity {
 	@Column(name = "password", nullable = false)
 	private String password;
 
-	@Column(name = "secret_answer", nullable = false, length = 100)
+	@Column(name = "secret_answer", nullable = false)
 	private String secretQuestionAnswer;
 	
 	@Column(name = "birth_date", nullable = false)

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

@@ -125,6 +125,15 @@ public class CourseController {
 
 		List<AllocationModel> allocationModelList = new ArrayList<>();
 
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId1(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio1()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId2(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio2()));
+		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId3(),
+				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
+				allocationFormList.getAllocationRatio3()));
 		allocationModelList.add(new AllocationModel(allocationFormList.getCategoryId4(),
 				(Long) session.getAttribute(PageReturnAttributeKeyword.COURSE_ID),
 				allocationFormList.getAllocationRatio4()));

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

@@ -11,5 +11,4 @@ public class ErrorController {
 	    public String showError() {
 	        return TransitionTargetPageNameKeyword.ERROR_HTML;
 	    }
-	    
 }

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

@@ -57,7 +57,8 @@ public class ProfileController {
 	                    profileModel.getBirthDate(),
 	                    profileModel.getSaving(),
 	                    profileModel.getAnnualIncome(),
-	                    profileModel.getMonthlyBudget());
+	                    profileModel.getMonthlyBudget(),
+	                    profileModel.getBirthDate());
 
 	    model.addAttribute(PageReturnAttributeKeyword.PROFILE_EDIT_FORM, profileEditForm);
 	    return TransitionTargetPageNameKeyword.PROFILE_EDIT_HTML;

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

@@ -238,7 +238,7 @@ public class TransactionController {
 
 		model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm);
 		
-		session.setAttribute(SessionKeyword.T_TYPE, String.valueOf(transactionForm.getTransactionType()));
+		session.setAttribute("tType", String.valueOf(transactionForm.getTransactionType()));
 
 		model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);
 

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

@@ -16,7 +16,6 @@ import com.example.demo.app.domain.service.QuestionService;
 import com.example.demo.app.domain.service.UserService;
 import com.example.demo.app.infra.entity.QuestionEntity;
 import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
-import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
 import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
 import com.example.demo.app.presentation.form.UserForm;
 
@@ -59,7 +58,7 @@ public class UserController {
 			model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
 		}
 
-		session.setAttribute(SessionKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
+		session.setAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
 		model.addAttribute(PageReturnAttributeKeyword.COURSE_ID, courseId);
 		model.addAttribute(PageReturnAttributeKeyword.USER_FORM, userForm);
 
@@ -71,9 +70,11 @@ public class UserController {
 			String selectedCourseName, Model model,
 			HttpSession session) {
 
-		model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME));
+		model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute("selectedCourseName"));
 		
-		session.setAttribute(SessionKeyword.QUESTION_ID, userForm.getSecretQuestionId());
+		session.setAttribute("questionId", userForm.getSecretQuestionId());
+		
+		System.out.println("return questionId: ****************************:" + userForm.getSecretQuestionId());
 		
 		return TransitionTargetPageNameKeyword.USER_RESISTER_CONFIRM_HTML;
 		
@@ -85,9 +86,11 @@ public class UserController {
 			Model model, 
 			HttpSession session) {
 
-		Long courseId = courseService.findByName((String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME));
+		Long courseId = courseService.findByName((String) session.getAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME));
 		
-		Long questionId = (Long) session.getAttribute(SessionKeyword.QUESTION_ID);
+		Long questionId = (Long) session.getAttribute("questionId");
+		
+		System.out.println("confirm questionId: ****************************:" + questionId);
 		
 		userForm.setSecretQuestionId(questionId);
 		

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

@@ -3,10 +3,4 @@ package com.example.demo.app.presentation.controller.pageproperty;
 public class SessionKeyword {
 	// SESSION情報として格納したいログイン者の情報
     public static final String LOGIN_USER = "loginUser";
-    
-    public static final String SELECTED_COURSE_NAME = "selectedCourseName";
-
-    public static final String QUESTION_ID = "questionId";
-    
-    public static final String T_TYPE = "tType";
 }

src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java

@@ -16,4 +16,5 @@ public class ProfileEditForm {
 	private Integer saving;
 	private Integer annualIncome;
 	private Integer monthlyBudget;
+	private LocalDate birthDate;
 }

src/main/resources/templates/category_create.html

@@ -25,7 +25,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="categoryName">カテゴリ名</label>
 
-						<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}" required>
+						<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}">
 					</div>
 
 					<br>
@@ -33,7 +33,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="transactionType">収入・支出</label>
 
-						<select class="form-select" id="transactionType" th:field="*{transactionType}" required>
+						<select class="form-select" id="transactionType" th:field="*{transactionType}">
 
 							<option value="">選択してください</option>
 							<option value="0">支出</option>

src/main/resources/templates/category_list.html

@@ -9,13 +9,13 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 </head>
 
-<body style="padding-top:80px; padding-bottom:80px;">
+<body class="pb-5 pt-5">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
 
 		<div>
-			<ul class="list-unstyled p-0 m-0">
+			<ul>
 				<li class="card shadow-sm mb-3" th:each="categoryForm : ${categoryFormList}">
 					<div class="card-body">
 						<div class="d-flex justify-content-between">
@@ -49,29 +49,19 @@
 
 						</div>
 
+						<hr>
+						<hr>
 					</div>
 				</li>
 			</ul>
 		</div>
 
-		<div class="d-grid mt-4">
 
-			<form th:action="@{/category/create}" method="get">
 
-				<input type="hidden"
+		<form th:action="@{/category/create}" method="get">
-			           name="today"
+			<input type="hidden" name="today" id="today" th:value="${today}">
-					   id="today"
+			<button type="submit">新規登録</button>
-			           th:value="${today}">
+		</form>
-
-			    <button class="btn btn-success w-100" type="submit">
-					新規登録
-				</button>
-
-			</form>
-
-		</div>
-		
-	</div>
 
 		<div th:replace="~{footer :: footer}"></div>
 </body>

src/main/resources/templates/category_update.html

@@ -25,7 +25,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="categoryName">カテゴリ名</label>
 
-						<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}" required>
+						<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}">
 					</div>
 
 					<br>
@@ -33,7 +33,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="transactionType">収入・支出</label>
 
-						<select class="form-select" id="transactionType" th:field="*{transactionType}" required>
+						<select class="form-select" id="transactionType" th:field="*{transactionType}">
 
 							<option value="">選択してください</option>
 							<option value="0">支出</option>

src/main/resources/templates/course_create.html

@@ -23,7 +23,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="courseName">コース名</label>
 
-						<input class="form-control" type="text" id="courseName" th:field="*{courseName}" required>
+						<input class="form-control" type="text" id="courseName" th:field="*{courseName}">
 					</div>
 
 					<br>

src/main/resources/templates/course_create_ratio.html

@@ -22,70 +22,86 @@
 				<form th:action="@{/course/create}" th:object="${allocationFormList}" method="post">
 
 
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio1">給与</label>
+						<input class="form-control" type="number" id="allocationRatio1" th:field="*{allocationRatio1}">
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio2">賞与</label>
+						<input class="form-control" type="number" id="allocationRatio2" th:field="*{allocationRatio2}">
+					</div>
+
+					<br>
+
+					<div class="mb-3">
+						<label class="form-label" for="allocationRatio3">その他</label>
+						<input class="form-control" type="number" id="allocationRatio3" th:field="*{allocationRatio3}">
+					</div>
+
+					<br>
+
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio4">固定費</label>
-						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio4" th:field="*{allocationRatio4}" required>
+						<input class="form-control" type="number" id="allocationRatio4" th:field="*{allocationRatio4}">
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio5">食費</label>
-						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio5" th:field="*{allocationRatio5}" required>
+						<input class="form-control" type="number" id="allocationRatio5" th:field="*{allocationRatio5}">
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio6">交通費</label>
-						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio6" th:field="*{allocationRatio6}" required>
+						<input class="form-control" type="number" id="allocationRatio6" th:field="*{allocationRatio6}">
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio7">日用品費</label>
-						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio7" th:field="*{allocationRatio7}" required>
+						<input class="form-control" type="number" id="allocationRatio7" th:field="*{allocationRatio7}">
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio8">被服/美容費</label>
-						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio8" th:field="*{allocationRatio8}" required>
+						<input class="form-control" type="number" id="allocationRatio8" th:field="*{allocationRatio8}">
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio9">医療費</label>
-						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio9" th:field="*{allocationRatio9}" required>
+						<input class="form-control" type="number" id="allocationRatio9" th:field="*{allocationRatio9}">
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio10">趣味/娯楽費</label>
-						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio10"
+						<input class="form-control" type="number" id="allocationRatio10"
-							th:field="*{allocationRatio10}" required>
+							th:field="*{allocationRatio10}">
 					</div>
 
 					<br>
 
 					<div class="mb-3">
 						<label class="form-label" for="allocationRatio11">その他</label>
-						<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio11"
+						<input class="form-control" type="number" id="allocationRatio11"
-							th:field="*{allocationRatio11}" required>
+							th:field="*{allocationRatio11}">
-					</div>
-					
-					<div class="mb-3">
-						<label class="form-label" for="allocationRatioTotal">合計(%)</label>
-						<input class="form-control" type="number" value="0" id="allocationRatioTotal" readonly>
 					</div>
 
 					<br>
 					<div class="d-grid">
-						<button type="submit" class="btn btn-primary" id="submit" disabled="true">登録</button>
+						<button type="submit" class="btn btn-primary">登録</button>
 
 					</div>
 				</form>
@@ -95,26 +111,6 @@
 
 	<div th:replace="~{footer :: footer}"></div>
 
-	<script>
-		
-		function inputChange(){
-			let total=0;
-			
-			for(let i=4; i<=11; i++){
-				total += Number(document.getElementById(`allocationRatio${i}`).value || 0);
-				if(total == 100){
-					document.getElementById('submit').disabled = false;
-				}else{
-					document.getElementById('submit').disabled = true;
-				}
-			}
-			
-			
-			document.getElementById("allocationRatioTotal").value = total;
-			
-		}
-		
-	</script>
 
 </body>
 

src/main/resources/templates/fixed_cost.html

@@ -10,7 +10,7 @@
 	<link rel="stylesheet" th:href="@{/css/style.css}">
 </head>
 
-<body style="padding-top:80px; padding-bottom:80px;">
+<body class="pb-5 pt-5">
 
 	<div th:replace="~{header :: header}"></div>
 	<div class="main-container">
@@ -19,7 +19,7 @@
 		<h2 class="page-title" th:text="${today}"></h2>
 
 		<div>
-			<ul class="list-unstyled p-0 m-0">
+			<ul>
 				<li th:each="fixedCostForm : ${fixedCostFormList}" class="card shadow-sm mb-3">
 
 					<div class="card-body">
@@ -52,29 +52,21 @@
 
 						</div>
 
+						<hr>
+						<hr>
 					</div>
 				</li>
-			</ul>
 		</div>
-		<div class="d-grid mt-4">
+		</ul>
-
-			<form th:action="@{/category/create}" method="get">
-
-				<input type="hidden"
-					   name="today"
-					   id="today"
-					   th:value="${today}">
-
-				<button class="btn btn-success w-100" type="submit">
-			    	新規登録
-				</button>
-
-			</form>
-
-		</div>
-		
 	</div>
 
+
+
+	<form th:action="@{/fixed-cost/create}" method="get">
+		<input type="hidden" name="today" id="today" th:value="${today}">
+		<button type="submit">新規登録</button>
+	</form>
+
 	<div th:replace="~{footer :: footer}"></div>
 </body>
 

src/main/resources/templates/fixed_cost_create.html

@@ -40,8 +40,8 @@
 						<select class="form-select" id="transactionType">
 
 							<option value="">選択してください</option>
-							<option value="0">支出</option>
+							<option value="1">支出</option>
-							<option value="1">収入</option>
+							<option value="2">収入</option>
 
 						</select>
 					</div>
@@ -70,7 +70,7 @@
 					<div class="mb-3">
 						<label class="form-label" for="amount">金額</label>
 
-						<input class="form-control" type="number" id="amount" th:field="*{amount}" min="1" placeholder="金額を入力してください"
+						<input class="form-control" type="number" id="amount" th:field="*{amount}" min="0" placeholder="金額を入力してください"
 							required>
 					</div>
 
@@ -94,7 +94,7 @@
 					
 					transactionType.addEventListener("change", function () {
 
-						if (this.value === "0") {
+						if (this.value === "1") {
 
 							for (let i = 0; i < expenseList.length; i++) {
 								expenseList[i].style.display = "";
@@ -104,7 +104,7 @@
 								incomeList[i].style.display = "none";
 							}
 
-						} else if (this.value === "1") {
+						} else if (this.value === "2") {
 
 							for (let i = 0; i < expenseList.length; i++) {
 								expenseList[i].style.display = "none";

src/main/resources/templates/goal_create.html

@@ -26,12 +26,12 @@
 
 					<div>
 						<label>目標名</label>
-						<input type="text" th:field="*{goalTitle}">
+						<input type="text" th:field="*{goalTitle}" required>
 					</div>
 
 					<div>
 						<label>目標説明</label>
-						<textarea th:field="*{goalSubtitle}"></textarea>
+						<textarea th:field="*{goalSubtitle}" required></textarea>
 					</div>
 
 					<div>
@@ -52,11 +52,8 @@
 
 				</form>
 
-			</div>
+				<div th:replace="~{footer :: footer}"></div>
-		</div>
-	</div>
 
-	<div th:replace="~{footer :: footer}"></div>
 
 </body>
 

src/main/resources/templates/goal_record.html

@@ -8,7 +8,7 @@
 	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
 </head>
 
-<body style="padding-top:80px; padding-bottom:80px;">
+<body class="pb-5 pt-5">
 
 	<div th:replace="~{header :: header}"></div>
 
@@ -74,16 +74,16 @@
 				</ul>
 
 			</div>
-		</div>
+			<div class="d-grid mt-4">
+				<form th:action="@{/goal}" method="get">
 
-		<div class="d-grid mt-4">
+					<button class="btn btn-success w-100" type="submit">
-			<form th:action="@{/goal}" method="get">
+						戻る
-				<button class="btn btn-success w-100" type="submit">
+					</button>
-					戻る
-				</button>
-			</form>
-		</div>
 
+				</form>
+			</div>
+		</div>
 	</div>
 
 	<div th:replace="~{footer :: footer}"></div>

src/main/resources/templates/menu.html

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

src/main/resources/templates/select_course.html

@@ -8,8 +8,9 @@
 	<title>コース選択</title>
 </head>
 
-<body style="padding-bottom: 120px; padding-top: 60px;">
+<body style="padding-bottom: 120px">
 	<div th:replace="~{header :: header}"></div>
+
 	<h1 class="page-title">コース選択</h1>
 
 	<th:block th:if="${mode == 'change'}">

src/main/resources/templates/transaction_create.html

@@ -45,11 +45,11 @@
 								選択してください
 							</option>
 
-							<option value="0">
+							<option value="1">
 								支出
 							</option>
 
-							<option value="1">
+							<option value="2">
 								収入
 							</option>
 
@@ -124,15 +124,15 @@
 		const tType = '[[${session.tType}]]';
 		
 		if (tType == "0") {
-			transactionType.value = 0;
-		} else {
 			transactionType.value = 1;
+		} else {
+			transactionType.value = 2;
 		}
 		
 		
 		transactionType.addEventListener("change", function () {
 
-			if (this.value === "0") {
+			if (this.value === "1") {
 
 				for (let i = 0; i < expenseList.length; i++) {
 					expenseList[i].style.display = "";
@@ -142,7 +142,7 @@
 					incomeList[i].style.display = "none";
 				}
 
-			} else if (this.value === "1") {
+			} else if (this.value === "2") {
 
 				for (let i = 0; i < expenseList.length; i++) {
 					expenseList[i].style.display = "none";

src/main/resources/templates/user_register_return.html

@@ -80,7 +80,7 @@
 					</div>
 
 					<div class="mb-3">
-						<label for="goalId" class="form-label">目標貯金額</label>
+						<label for="goalId" class="form-label">目標</label>
 						<input type="number" id="goalId" class="form-control" th:field="*{goalId}" min="0" required>
 					</div>