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 s-choi

Browse Source 
# Conflicts:
#	src/main/java/com/example/demo/app/presentation/controller/CourseController.java
#	src/main/java/com/example/demo/app/presentation/controller/GoalController.java
#	src/main/java/com/example/demo/app/presentation/controller/LoginController.java
#	src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java
#	src/main/java/com/example/demo/app/presentation/controller/TransactionController.java
#	src/main/resources/templates/select_course.html
This commit is contained in:
s-choi
2026-09-25 17:09:35 +09:00
parent 5be30572cb 6d0cad2454
commit 054eeb7f7a
19 changed files with 455 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/resources/templates/goal_edit.html
View File

@@ -24,30 +24,35 @@
<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>
<label>目標金額</label>
<input type="number" th:field="*{targetAmount}" min="0" max="1000000000" required>
<input type="number" th:field="*{targetAmount}" min="1" max="1000000000" required>
</div>
<div>
<label>目標達成期限</label>
<input type="date" th:field="*{deadline}" th:min="${#temporals.format(#temporals.createNow(), 'yyyy-MM-dd')}" required>
</div>
<div>
<input type="hidden" th:field="*{goalComplete}">
</div>
<button type="submit" class="btn btn-sm btn-primary w-100">更新する</button>
</form>
</div>
</div>
<button type="submit" class="btn btn-sm btn-primary w-100">更新する</button>
</div>

4
src/main/resources/templates/password_reset.html
View File

@@ -38,7 +38,7 @@
class="form-control"
th:field="*{password}"
minlength="8"
maxlength="255"
maxlength="24"
required>
</div>
@@ -55,7 +55,7 @@
class="form-control"
th:field="*{passwordConfirm}"
minlength="8"
maxlength="255"
maxlength="24"
required>
</div>

7
src/main/resources/templates/select_course.html
View File

@@ -10,8 +10,7 @@
<body>
<div th:replace="~{header :: header}"></div>
<h1>コース選択</h1>
<h1 class="page-title">コース選択</h1>
<th:block th:if="${mode == 'change'}">
<form th:action="@{/course/create}" method="get">
@@ -21,7 +20,7 @@
</th:block>
<form th:action="${mode == 'regist'} ? @{/user/register/return}: @{/change}" method="post">
<button type="submit">確定</button>
<button type="submit" class="btn btn-primary w-100">確定</button>
<div class="accordion" id="accordionExample">
<div class="accordion-item" th:each="course:${courseList}">
@@ -38,7 +37,7 @@
data-bs-parent="#accordionExample">
<div class="accordion-body">
<span th:text="${course.description}"></span>
<table border="1">
<table class="table table-bordered">
<tr>
<th>カテゴリ名</th>
<th>配分(%)</th>

2
src/main/resources/templates/user_register.html
View File

@@ -86,7 +86,7 @@
class="form-control"
th:field="*{password}"
minlength="8"
maxlength="255"
maxlength="24"
required>
</div>

2
src/main/resources/templates/user_register_confirm.html
View File

@@ -39,7 +39,7 @@
<div class="mb-3">
<label for="password" class="form-label">パスワード</label>
<input type="password" id="password" class="form-control" name="password" th:value="*{password}" minlength="8"
maxlength="255" required readonly>
maxlength="24" required readonly>
</div>
<div class="mb-3">

2
src/main/resources/templates/user_register_return.html
View File

@@ -54,7 +54,7 @@
class="form-control"
th:value="*{password}"
minlength="8"
maxlength="255"
maxlength="24"
required>
</div>