2026_09_5H_Spring_KIZAKI/Monegement
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
[IIJ] Naoki Kawahito
2026-09-29 12:53:21 +09:00
parent 438ff59bc2 104fa5e319
commit 150b6287c4
11 changed files with 69 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/example/demo/app/presentation/controller/CourseController.java
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()));

2
src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
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);

15
src/main/java/com/example/demo/app/presentation/controller/UserController.java
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);

6
src/main/java/com/example/demo/app/presentation/controller/pageproperty/SessionKeyword.java
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";
}

4
src/main/resources/templates/category_create.html
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>

4
src/main/resources/templates/category_update.html
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>

2
src/main/resources/templates/course_create.html
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>

68
src/main/resources/templates/course_create_ratio.html
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>

10
src/main/resources/templates/fixed_cost_create.html
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";

4
src/main/resources/templates/goal_create.html
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>

12
src/main/resources/templates/transaction_create.html
View File

@@ -45,11 +45,11 @@
選択してください
</option>
<option value="1">
<option value="0">
支出
</option>
<option value="2">
<option value="1">
収入
</option>
@@ -124,15 +124,15 @@
const tType = '[[${session.tType}]]';
if (tType == "0") {
transactionType.value = 1;
transactionType.value = 0;
} else {
transactionType.value = 2;
transactionType.value = 1;
}
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 +142,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";