This commit is contained in:
2026-09-29 13:36:21 +09:00
24 changed files with 169 additions and 140 deletions

View File

@@ -10,6 +10,7 @@ import org.aspectj.lang.annotation.Pointcut;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.example.demo.app.presentation.controller.pageproperty.SessionKeyword;
import com.example.demo.exception.NoSessionException;
@@ -32,7 +33,7 @@ public class SessionCheckAspect {
public void checkSession() {
HttpSession session = request.getSession(false);
if (session == null || session.getAttribute("loginUser") == null) {
if (session == null || session.getAttribute(SessionKeyword.LOGIN_USER) == null) {
throw new NoSessionException("不正なログインです");
}

View File

@@ -12,6 +12,8 @@ import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import com.example.demo.app.presentation.controller.pageproperty.PageReturnAttributeKeyword;
import com.example.demo.app.presentation.controller.pageproperty.TransitionTargetPageNameKeyword;
import com.example.demo.exception.NoSessionException;
@ControllerAdvice
@@ -30,18 +32,18 @@ public class GlobalExceptionHandler {
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
model.addAttribute(
"errorMessage",
PageReturnAttributeKeyword.ERROR_MESSAGE,
"システムエラーが発生しました。"
+ "初めからやり直してください。");
return "redirect:/login";
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.LOGIN;
}
@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
public String handleBadRequestException(Model model, Exception e, HttpSession session) {
model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
model.addAttribute("status", HttpStatus.BAD_REQUEST.value());
model.addAttribute(PageReturnAttributeKeyword.ERROR, SEVERE_ERROR_MESSAGE_BAD_REQUEST);
model.addAttribute(PageReturnAttributeKeyword.STATUS, HttpStatus.BAD_REQUEST.value());
e.printStackTrace();
@@ -50,7 +52,7 @@ public class GlobalExceptionHandler {
System.out.println("session invalidated method not supported exception");
session.invalidate();
return "error";
return TransitionTargetPageNameKeyword.ERROR_HTML;
}
@ExceptionHandler(Exception.class)
@@ -60,6 +62,6 @@ public class GlobalExceptionHandler {
System.out.println("session invalidated exception");
session.invalidate();
return "error";
return TransitionTargetPageNameKeyword.ERROR_HTML;
}
}

View File

@@ -25,6 +25,8 @@ public class LoginServiceImpl implements LoginService {
if (userEntity == null) {
return null;
} else if (userEntity.getDeleteFlag() == 1) {
return null;
}
boolean isValidPassword = false;

View File

@@ -125,15 +125,6 @@ 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()));

View File

@@ -275,7 +275,7 @@ public class GoalController {
int currentAmount = goalService.getCurrentAmount(userId);
model.addAttribute("currentAmount", currentAmount);
model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
}

View File

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

View File

@@ -16,6 +16,7 @@ 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;
@@ -58,7 +59,7 @@ public class UserController {
model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
}
session.setAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
session.setAttribute(SessionKeyword.SELECTED_COURSE_NAME, courseService.findById(courseId).getCourseName());
model.addAttribute(PageReturnAttributeKeyword.COURSE_ID, courseId);
model.addAttribute(PageReturnAttributeKeyword.USER_FORM, userForm);
@@ -70,11 +71,9 @@ public class UserController {
String selectedCourseName, Model model,
HttpSession session) {
model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute("selectedCourseName"));
model.addAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME, (String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME));
session.setAttribute("questionId", userForm.getSecretQuestionId());
System.out.println("return questionId: ****************************:" + userForm.getSecretQuestionId());
session.setAttribute(SessionKeyword.QUESTION_ID, userForm.getSecretQuestionId());
return TransitionTargetPageNameKeyword.USER_RESISTER_CONFIRM_HTML;
@@ -86,11 +85,9 @@ public class UserController {
Model model,
HttpSession session) {
Long courseId = courseService.findByName((String) session.getAttribute(PageReturnAttributeKeyword.SELECTED_COURSE_NAME));
Long courseId = courseService.findByName((String) session.getAttribute(SessionKeyword.SELECTED_COURSE_NAME));
Long questionId = (Long) session.getAttribute("questionId");
System.out.println("confirm questionId: ****************************:" + questionId);
Long questionId = (Long) session.getAttribute(SessionKeyword.QUESTION_ID);
userForm.setSecretQuestionId(questionId);

View File

@@ -4,7 +4,8 @@ public class PageReturnAttributeKeyword {
public static final String ERROR_MESSAGE = "errorMessage";
public static final String MESSAGE = "message";
public static final String ERROR = "error";
public static final String STATUS = "status";
public static final String QUESTION_LIST = "questionList";
public static final String USER_FORM = "userForm";

View File

@@ -3,4 +3,10 @@ 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";
}

View File

@@ -35,7 +35,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>
@@ -47,7 +47,7 @@
0
</td>
<td th:text="${analysisForm.totalDifferenceAmount >= 0}
? '+' + ${analysisForm.totalDifferenceAmount}
? '+' + ${analysisForm.totalDifferenceAmount}
: ${analysisForm.totalDifferenceAmount}"
th:class="${analysisForm.totalDifferenceAmount >= 0}
? 'text-danger'
@@ -73,16 +73,14 @@
<th scope="row"
th:text="${category.categoryName}">
食費
</th>
<td th:text="'¥' + ${category.currentMonthAmount}">
0
</td>
<td>
<span th:text="${category.monthDifferenceAmount >= 0}
? '+' + ${category.monthDifferenceAmount}
? '+' + ${category.monthDifferenceAmount}
: ${category.monthDifferenceAmount}"
th:class="${category.monthDifferenceAmount >= 0}
? 'text-danger'
@@ -90,7 +88,7 @@
</span>
<br>
<span th:text="${category.courseDifferenceAmount >= 0}
? '+' + ${category.courseDifferenceAmount}
? '+' + ${category.courseDifferenceAmount}
: ${category.courseDifferenceAmount}"
th:class="${category.courseDifferenceAmount >= 0}
? 'text-danger'

View File

@@ -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}">
<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}" required>
</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}">
<select class="form-select" id="transactionType" th:field="*{transactionType}" required>
<option value="">選択してください</option>
<option value="0">支出</option>

View File

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

View File

@@ -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}">
<input class="form-control" type="text" id="categoryName" th:field="*{categoryName}" required>
</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}">
<select class="form-select" id="transactionType" th:field="*{transactionType}" required>
<option value="">選択してください</option>
<option value="0">支出</option>
@@ -47,7 +47,7 @@
<input type="hidden" name="categoryId" th:value="${categoryId}">
<div class="d-grid">
<button type="submit" class="btn btn-primary">登録</button>
<button type="submit" class="btn btn-primary">更新</button>
</div>
</form>
</div>

View File

@@ -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}">
<input class="form-control" type="text" id="courseName" th:field="*{courseName}" required>
</div>
<br>

View File

@@ -22,86 +22,70 @@
<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" id="allocationRatio4" th:field="*{allocationRatio4}">
<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio4" th:field="*{allocationRatio4}" required>
</div>
<br>
<div class="mb-3">
<label class="form-label" for="allocationRatio5">食費</label>
<input class="form-control" type="number" id="allocationRatio5" th:field="*{allocationRatio5}">
<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio5" th:field="*{allocationRatio5}" required>
</div>
<br>
<div class="mb-3">
<label class="form-label" for="allocationRatio6">交通費</label>
<input class="form-control" type="number" id="allocationRatio6" th:field="*{allocationRatio6}">
<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio6" th:field="*{allocationRatio6}" required>
</div>
<br>
<div class="mb-3">
<label class="form-label" for="allocationRatio7">日用品費</label>
<input class="form-control" type="number" id="allocationRatio7" th:field="*{allocationRatio7}">
<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio7" th:field="*{allocationRatio7}" required>
</div>
<br>
<div class="mb-3">
<label class="form-label" for="allocationRatio8">被服/美容費</label>
<input class="form-control" type="number" id="allocationRatio8" th:field="*{allocationRatio8}">
<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio8" th:field="*{allocationRatio8}" required>
</div>
<br>
<div class="mb-3">
<label class="form-label" for="allocationRatio9">医療費</label>
<input class="form-control" type="number" id="allocationRatio9" th:field="*{allocationRatio9}">
<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio9" th:field="*{allocationRatio9}" required>
</div>
<br>
<div class="mb-3">
<label class="form-label" for="allocationRatio10">趣味/娯楽費</label>
<input class="form-control" type="number" id="allocationRatio10"
th:field="*{allocationRatio10}">
<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio10"
th:field="*{allocationRatio10}" required>
</div>
<br>
<div class="mb-3">
<label class="form-label" for="allocationRatio11">その他</label>
<input class="form-control" type="number" id="allocationRatio11"
th:field="*{allocationRatio11}">
<input class="form-control" type="number" min="0" max="100" onchange="inputChange()" id="allocationRatio11"
th:field="*{allocationRatio11}" required>
</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">登録</button>
<button type="submit" class="btn btn-primary" id="submit" disabled="true">登録</button>
</div>
</form>
@@ -111,6 +95,26 @@
<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>

View File

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

View File

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

View File

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

View File

@@ -8,7 +8,7 @@
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
</head>
<body class="pb-5 pt-5">
<body style="padding-top:80px; padding-bottom:80px;">
<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">
<button class="btn btn-success w-100" type="submit">
戻る
</button>
</form>
</div>
</div>
</div>
<div th:replace="~{footer :: footer}"></div>

View File

@@ -189,6 +189,8 @@
</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">
@@ -205,6 +207,8 @@
</form>
</div>
<div th:replace="~{footer :: footer}"></div>
</body>

View File

@@ -8,10 +8,9 @@
<title>Calendar</title>
<link rel="stylesheet" th:href="@{/css/style.css}">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" th:href="@{/css/style.css}">
</head>
<body>

View File

@@ -100,17 +100,17 @@
min="0"
max="10000000"
required>
</div>
</div>
<div class="d-grid">
<button type="submit"
class="btn btn-primary">
確定
編集
</button>
</div>
</div>
</form>
</div>

View File

@@ -5,20 +5,23 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" th:href="@{/css/style.css}">
<title>コース選択</title>
</head>
<body style="padding-bottom: 120px; padding-top: 60px;">
<body style="padding-bottom: 120px; padding-top: 80px;">
<div th:replace="~{header :: header}"></div>
<h1 class="page-title">コース選択</h1>
<div class="d-grid gap-2 mt-4">
<th:block th:if="${mode == 'change'}">
<form th:action="@{/course/create}" method="get">
<button type="submit">新規登録</button>
<button class="btn btn-success w-100" type="submit">
新規登録
</button>
</form>
</th:block>
<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
<button type="submit" class="btn btn-primary w-100">確定</button>
@@ -53,6 +56,7 @@
</div>
</div>
</form>
</div>
<th:block th:if="${mode=='change'}">
<div th:replace="~{footer :: footer}"></div>

View File

@@ -3,10 +3,9 @@
<head>
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1" http-equiv="Content-Type">
<title>取引登録</title>
<link rel="stylesheet" th:href="@{/css/menu.css}">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" th:href="@{/css/style.css}">
<title>取引登録</title>
</head>
<body style="padding-top:80px; padding-bottom:80px;">
@@ -45,11 +44,11 @@
選択してください
</option>
<option value="1">
<option value="0">
支出
</option>
<option value="2">
<option value="1">
収入
</option>
@@ -124,15 +123,15 @@
const tType = '[[${session.tType}]]';
if (tType == "0") {
transactionType.value = 0;
} else if (tType == "1") {
transactionType.value = 1;
} else {
transactionType.value = 2;
}
transactionType.addEventListener("change", function () {
if (this.value === "1") {
if (this.value === "0") {
for (let i = 0; i < expenseList.length; i++) {
expenseList[i].style.display = "";
@@ -142,7 +141,7 @@
incomeList[i].style.display = "none";
}
} else if (this.value === "2") {
} else if (this.value === "1") {
for (let i = 0; i < expenseList.length; i++) {
expenseList[i].style.display = "none";