7 Commits

7 changed files with 34 additions and 10 deletions

View File

@@ -4,6 +4,8 @@ package com.example.demo.aop.handler;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import jakarta.servlet.http.HttpSession;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.ui.Model; import org.springframework.ui.Model;
import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -37,25 +39,31 @@ public class GlobalExceptionHandler {
} }
@ExceptionHandler(HttpRequestMethodNotSupportedException.class) @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
public String handleBadRequestException(Model model, Exception e) { public String handleBadRequestException(Model model, Exception e, HttpSession session) {
model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST); model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
model.addAttribute("status", HttpStatus.BAD_REQUEST.value()); model.addAttribute("status", HttpStatus.BAD_REQUEST.value());
e.printStackTrace(); e.printStackTrace();
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e); LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
System.out.println("session invalidated");
session.invalidate();
return "error"; return "error";
} }
@ExceptionHandler(Exception.class) @ExceptionHandler(Exception.class)
public String AllException(Model model, Exception e) { public String AllException(Model model, Exception e, HttpSession session) {
model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST); model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
e.printStackTrace(); e.printStackTrace();
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e); LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
System.out.println("session invalidated");
session.invalidate();
return "error"; return "error";
} }
} }

View File

@@ -58,6 +58,7 @@ public class ProfileServiceImpl implements ProfileService{
userEntity.setSaving(profileEditForm.getSaving()); userEntity.setSaving(profileEditForm.getSaving());
userEntity.setAnnualIncome(profileEditForm.getAnnualIncome()); userEntity.setAnnualIncome(profileEditForm.getAnnualIncome());
userEntity.setMonthlyBudget(profileEditForm.getMonthlyBudget()); userEntity.setMonthlyBudget(profileEditForm.getMonthlyBudget());
userEntity.setBirthDate(profileEditForm.getBirthDate());
userRepository.save(userEntity); userRepository.save(userEntity);
} }
} }

View File

@@ -237,6 +237,8 @@ public class TransactionController {
model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList); model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm); model.addAttribute(PageReturnAttributeKeyword.TRANSACTION_FORM, transactionForm);
session.setAttribute("tType", String.valueOf(transactionForm.getTransactionType()));
model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList); model.addAttribute(PageReturnAttributeKeyword.CATEGORY_FORM_LIST, categoryFormList);

View File

@@ -83,6 +83,7 @@
<div th:replace="~{footer :: footer}"></div> <div th:replace="~{footer :: footer}"></div>
<script> <script>
const transactionType = document.getElementById("transactionType"); const transactionType = document.getElementById("transactionType");
const categoryId = document.getElementById("categoryId"); const categoryId = document.getElementById("categoryId");
@@ -90,6 +91,7 @@
const expenseList = document.getElementsByClassName("expenseListClass"); const expenseList = document.getElementsByClassName("expenseListClass");
const incomeList = document.getElementsByClassName("incomeListClass"); const incomeList = document.getElementsByClassName("incomeListClass");
transactionType.addEventListener("change", function () { transactionType.addEventListener("change", function () {
if (this.value === "1") { if (this.value === "1") {

View File

@@ -52,13 +52,15 @@
<div class="mb-3"> <div class="mb-3">
<label class="form-label"> <label class="form-label">
パスワード 生年月日
</label> </label>
<input type="password" <input type="date"
class="form-control" class="form-control"
value="********" id="birthDate"
disabled> name="birthDate"
th:value="*{birthDate}"
required>
</div> </div>
<div class="mb-3"> <div class="mb-3">
@@ -105,7 +107,7 @@
<div class="d-grid"> <div class="d-grid">
<button type="submit" <button type="submit"
class="btn btn-primary"> class="btn btn-primary">
確認 確定
</button> </button>
</div> </div>

View File

@@ -8,7 +8,7 @@
<title>コース選択</title> <title>コース選択</title>
</head> </head>
<body> <body style="padding-bottom: 120px">
<div th:replace="~{header :: header}"></div> <div th:replace="~{header :: header}"></div>
<h1 class="page-title">コース選択</h1> <h1 class="page-title">コース選択</h1>

View File

@@ -39,7 +39,7 @@
収入・支出 収入・支出
</label> </label>
<select id="transactionType" class="form-select" th:field="*{transactionType}" required> <select id="transactionType" class="form-select" name="transactionType" required>
<option value=""> <option value="">
選択してください 選択してください
@@ -114,13 +114,22 @@
<div th:replace="~{footer :: footer}"></div> <div th:replace="~{footer :: footer}"></div>
<script> <script inline="javascript">
const transactionType = document.getElementById("transactionType"); const transactionType = document.getElementById("transactionType");
const categoryId = document.getElementById("categoryId"); const categoryId = document.getElementById("categoryId");
const expenseList = document.getElementsByClassName("expenseListClass"); const expenseList = document.getElementsByClassName("expenseListClass");
const incomeList = document.getElementsByClassName("incomeListClass"); const incomeList = document.getElementsByClassName("incomeListClass");
const tType = '[[${session.tType}]]';
if (tType == "0") {
transactionType.value = 1;
} else {
transactionType.value = 2;
}
transactionType.addEventListener("change", function () { transactionType.addEventListener("change", function () {
if (this.value === "1") { if (this.value === "1") {