8 Commits

5 changed files with 24 additions and 8 deletions

View File

@@ -133,6 +133,8 @@ public class CourseServiceImpl implements CourseService {
System.out.println("***********************ここでエラー1"); System.out.println("***********************ここでエラー1");
if (userEntity.getCourseEntity().getCourseId() == courseId) { if (userEntity.getCourseEntity().getCourseId() == courseId) {
return "selected"; return "selected";
} else if (courseId <= 6) {
return "original";
} }
System.out.println("***********************ここでエラー2"); System.out.println("***********************ここでエラー2");
allocationRepository.deleteByCourseId(courseId); allocationRepository.deleteByCourseId(courseId);

View File

@@ -141,6 +141,10 @@ public class CourseController {
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE; return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
} else if (condition.equals("original")) {
model.addAttribute("message", "既存のデータは削除できません");
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
} else if (condition.equals("ok")) { } else if (condition.equals("ok")) {
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE; return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.COURSE;
} }

View File

@@ -214,6 +214,10 @@ td:hover {
vertical-align: middle; vertical-align: middle;
} }
.goal {
min-width: 300px;
}
/* ======================= /* =======================
ボタン ボタン
======================= */ ======================= */

View File

@@ -128,27 +128,32 @@
<tr> <tr>
<th>目標名</th> <th>目標名</th>
<td th:text="${goalForm.goalTitle}"></td> <td th:text="${goalForm.goalTitle}"
class="goal"></td>
</tr> </tr>
<tr> <tr>
<th>目標説明</th > <th>目標説明</th >
<td th:text="${goalForm.goalSubtitle}"></td> <td th:text="${goalForm.goalSubtitle}"
class="goal"></td>
</tr> </tr>
<tr> <tr>
<th>目標金額</th> <th>目標金額</th>
<td th:text="${goalForm.targetAmount}"></td> <td th:text="${goalForm.targetAmount}"
class="goal"></td>
</tr> </tr>
<tr> <tr>
<th>目標達成期限</th> <th>目標達成期限</th>
<td th:text="${goalForm.deadline}"></td> <td th:text="${goalForm.deadline}"
class="goal"></td>
</tr> </tr>
<tr> <tr>
<th>達成率</th> <th>達成率</th>
<td th:text="${goalForm.achievementRate} + '%'"></td> <td th:text="${goalForm.achievementRate} + '%'"
class="goal"></td>
</tr> </tr>
</table> </table>

View File

@@ -36,7 +36,8 @@
aria-controls="'collapse' + ${course.courseId}"> aria-controls="'collapse' + ${course.courseId}">
<span th:text="${course.courseName}"></span> <span th:text="${course.courseName}"></span>
</button> </button>
<p style="width: 120px;"><button type="button" class="btn btn-danger w-100"
<p th:if="${course.courseId > 6}" style="width: 120px;"><button type="button" class="btn btn-danger w-100"
th:attr="data-course-id=${course.courseId}" onclick="deleteCourse(this)">削除</button></p> th:attr="data-course-id=${course.courseId}" onclick="deleteCourse(this)">削除</button></p>
</h2> </h2>
<div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse" <div th:id="'collapse' + ${course.courseId}" class="accordion-collapse collapse"