diff --git a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
index 2ced072..61133c1 100644
--- a/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
+++ b/src/main/java/com/example/demo/app/presentation/controller/GoalController.java
@@ -57,6 +57,8 @@ public class GoalController {
Long userId = loginUser.getUserId();
+ LocalDate today = LocalDate.now();
+
goalService.updateGoalComplete(userId);
List goalModelList = goalService.getGoalByUserId(userId);
@@ -64,7 +66,8 @@ public class GoalController {
List goalFormList1 = GoalForm.convertFrom(goalModelList);
List goalFormList = goalFormList1.stream()
- .filter(goalForm -> goalForm.getGoalComplete() == 0)
+ .filter(goalForm -> goalForm.getGoalComplete() == 0
+ && !goalForm.getDeadline().isBefore(today))
.collect(Collectors.toList());
model.addAttribute(
@@ -107,8 +110,6 @@ public class GoalController {
1,
1);
- LocalDate today = LocalDate.now();
-
Map> transactionFormMap = new HashMap<>();
transactionService
@@ -233,15 +234,14 @@ public class GoalController {
@GetMapping(TransitionTargetPageNameKeyword.EDIT)
public String editGoal(Model model, HttpSession session, Long goalId) {
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
-
+
Long userId = loginUser.getUserId();
-
+
GoalForm goalForm = GoalForm.convertFrom(goalService.getGoalById(goalId));
-
model.addAttribute(PageReturnAttributeKeyword.GOAL_FORM, goalForm);
return TransitionTargetPageNameKeyword.GOAL_EDIT_HTML;
-
+
}
@SessionCheck
@@ -272,11 +272,11 @@ public class GoalController {
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
Long userId = loginUser.getUserId();
-
+
int currentAmount = goalService.getCurrentAmount(userId);
-
+
model.addAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
-
+
return TransitionTargetPageNameKeyword.GOAL_CREATE_HTML;
}
@@ -305,7 +305,8 @@ public class GoalController {
if (record == null) {
return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL;
} else {
- return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL + TransitionTargetPageNameKeyword.RECORD;
+ return TransitionTargetPageNameKeyword.REDIRECT + TransitionTargetPageNameKeyword.GOAL
+ + TransitionTargetPageNameKeyword.RECORD;
}
}
@@ -314,6 +315,8 @@ public class GoalController {
@GetMapping(TransitionTargetPageNameKeyword.RECORD)
public String getRecord(HttpSession session, Model model) {
+ LocalDate today = LocalDate.now();
+
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
Long userId = loginUser.getUserId();
@@ -325,7 +328,13 @@ public class GoalController {
List goalCompleteFormList = new ArrayList<>();
goalFormList.stream().forEach(goalForm -> {
- if (goalForm.getGoalComplete() == 1) {
+ if (goalForm.getGoalComplete() == 1 || goalForm.getDeadline().isBefore(today)) {
+
+ goalForm.setStatus(
+ goalForm.getGoalComplete() == 1
+ ? "達成"
+ : "未達成");
+
goalCompleteFormList.add(goalForm);
}
});
diff --git a/src/main/java/com/example/demo/app/presentation/form/GoalForm.java b/src/main/java/com/example/demo/app/presentation/form/GoalForm.java
index 30bad09..7b64856 100644
--- a/src/main/java/com/example/demo/app/presentation/form/GoalForm.java
+++ b/src/main/java/com/example/demo/app/presentation/form/GoalForm.java
@@ -29,6 +29,8 @@ public class GoalForm {
private Integer goalComplete;
+ private String status;
+
private Integer achievementRate; // 達成率
private Integer currentAmount; // 現在の資産
@@ -43,6 +45,7 @@ public class GoalForm {
goalModel.getTargetAmount(),
goalModel.getDeadline(),
goalModel.getGoalComplete(),
+ null,
goalModel.getAchievementRate(),
goalModel.getCurrentAmount(),
goalModel.getUserId());
diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css
index 399873b..8632b09 100644
--- a/src/main/resources/static/css/style.css
+++ b/src/main/resources/static/css/style.css
@@ -46,6 +46,10 @@ body {
border-top: 1px solid #d0d7de;
}
+.a-footer {
+ text-decoration: none;
+}
+
/* =======================
カード
======================= */
@@ -178,6 +182,10 @@ td:hover {
text-align: right;
}
+.a-calender {
+ text-decoration: none;
+}
+
/* =======================
金額表示
======================= */
diff --git a/src/main/resources/templates/footer.html b/src/main/resources/templates/footer.html
index 8e446ef..450bdfa 100644
--- a/src/main/resources/templates/footer.html
+++ b/src/main/resources/templates/footer.html
@@ -15,22 +15,22 @@
diff --git a/src/main/resources/templates/goal_record.html b/src/main/resources/templates/goal_record.html
index c5a7e0b..5b17934 100644
--- a/src/main/resources/templates/goal_record.html
+++ b/src/main/resources/templates/goal_record.html
@@ -47,6 +47,12 @@
+ 状態:
+
+
+
+
+
diff --git a/src/main/resources/templates/menu.html b/src/main/resources/templates/menu.html
index 8573b98..ba31ed3 100644
--- a/src/main/resources/templates/menu.html
+++ b/src/main/resources/templates/menu.html
@@ -63,7 +63,7 @@
+ )}" class="a-footer">