Compare commits
4 Commits
378c169c1f
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
48ba386c88 | ||
| a10a4053cf | |||
|
|
a811b0d261 | ||
|
|
9d5dd5b9b2 |
BIN
Monegement.war
Normal file
BIN
Monegement.war
Normal file
Binary file not shown.
@@ -61,7 +61,7 @@ public class GlobalExceptionHandler {
|
|||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
||||||
System.out.println("session invalidated exception");
|
System.out.println("session invalidated exception");
|
||||||
session.invalidate();
|
// session.invalidate();
|
||||||
return TransitionTargetPageNameKeyword.ERROR_HTML;
|
return TransitionTargetPageNameKeyword.ERROR_HTML;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -130,19 +130,14 @@ public class CourseServiceImpl implements CourseService {
|
|||||||
public String deleteCourse(Long courseId, Long userId) {
|
public String deleteCourse(Long courseId, Long userId) {
|
||||||
|
|
||||||
UserEntity userEntity = userRepository.findById(userId).orElse(null);
|
UserEntity userEntity = userRepository.findById(userId).orElse(null);
|
||||||
System.out.println("***********************ここでエラー1");
|
|
||||||
if (userEntity.getCourseEntity().getCourseId() == courseId) {
|
if (userEntity.getCourseEntity().getCourseId() == courseId) {
|
||||||
return "selected";
|
return "selected";
|
||||||
} else if (courseId <= 6) {
|
} else if (courseId <= 6) {
|
||||||
return "original";
|
return "original";
|
||||||
}
|
}
|
||||||
System.out.println("***********************ここでエラー2");
|
|
||||||
allocationRepository.deleteByCourseId(courseId);
|
allocationRepository.deleteByCourseId(courseId);
|
||||||
System.out.println("***********************ここでエラー3");
|
|
||||||
courseOwnerRepository.deleteByCourseId(courseId);
|
courseOwnerRepository.deleteByCourseId(courseId);
|
||||||
System.out.println("***********************ここでエラー4");
|
|
||||||
courseRepository.deleteById(courseId);
|
courseRepository.deleteById(courseId);
|
||||||
System.out.println("***********************ここでエラー5");
|
|
||||||
return "ok";
|
return "ok";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ public class CourseController {
|
|||||||
|
|
||||||
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
|
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
|
||||||
|
|
||||||
System.out.println("**********************cousrId: " + courseId);
|
// System.out.println("**********************cousrId: " + courseId);
|
||||||
String condition = courseService.deleteCourse(courseId, loginUser.getUserId());
|
String condition = courseService.deleteCourse(courseId, loginUser.getUserId());
|
||||||
|
|
||||||
if (condition.equals("selected")) {
|
if (condition.equals("selected")) {
|
||||||
|
|||||||
@@ -275,7 +275,7 @@ public class GoalController {
|
|||||||
|
|
||||||
int currentAmount = goalService.getCurrentAmount(userId);
|
int currentAmount = goalService.getCurrentAmount(userId);
|
||||||
|
|
||||||
System.out.println("************************currentAmount : " + currentAmount);
|
// System.out.println("************************currentAmount : " + currentAmount);
|
||||||
|
|
||||||
session.setAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
|
session.setAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
|
||||||
<title>Calendar</title>
|
<title>カレンダー</title>
|
||||||
|
|
||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.7/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||||
|
|
||||||
|
|||||||
3
src/main/webapp/META-INF/MANIFEST.MF
Normal file
3
src/main/webapp/META-INF/MANIFEST.MF
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
Manifest-Version: 1.0
|
||||||
|
Class-Path:
|
||||||
|
|
||||||
Reference in New Issue
Block a user