@@ -35,7 +38,12 @@
-
+
+
+ 상세보기
+
+
From 2b8b0a1bada9f8cc1aee93c1f71d9d7867049d65 Mon Sep 17 00:00:00 2001
From: Taehyeon Jo <70999462+whxogus215@users.noreply.github.com>
Date: Sat, 16 Nov 2024 14:15:30 +0900
Subject: [PATCH 04/29] =?UTF-8?q?feat:=20=EB=AA=A8=EB=8B=AC=EC=B0=BD=20?=
=?UTF-8?q?=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=EC=97=B4=EA=B8=B0/=EB=8B=AB?=
=?UTF-8?q?=EA=B8=B0=20=ED=8A=B8=EB=A6=AC=EA=B1=B0=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/static/js/modal.js | 9 +++++++++
src/main/resources/submodule-properties | 2 +-
.../resources/templates/gonghak/AbeekDetailModal.html | 7 ++++---
src/main/resources/templates/gonghak/statusForm.html | 2 +-
4 files changed, 15 insertions(+), 5 deletions(-)
create mode 100644 src/main/resources/static/js/modal.js
diff --git a/src/main/resources/static/js/modal.js b/src/main/resources/static/js/modal.js
new file mode 100644
index 0000000..bd87116
--- /dev/null
+++ b/src/main/resources/static/js/modal.js
@@ -0,0 +1,9 @@
+function openModal() {
+ document.getElementById("modal-background").style.display = "block";
+ document.getElementById("modal-container").style.display = "block";
+}
+
+function closeModal() {
+ document.getElementById("modal-background").style.display = "none";
+ document.getElementById("modal-container").style.display = "none";
+}
diff --git a/src/main/resources/submodule-properties b/src/main/resources/submodule-properties
index 1418f5d..920fd67 160000
--- a/src/main/resources/submodule-properties
+++ b/src/main/resources/submodule-properties
@@ -1 +1 @@
-Subproject commit 1418f5d4c4368c33630b08d9086bbb46aaf54e91
+Subproject commit 920fd67beab95c36c8895217290a124b7058db0c
diff --git a/src/main/resources/templates/gonghak/AbeekDetailModal.html b/src/main/resources/templates/gonghak/AbeekDetailModal.html
index ef800b6..15fb57c 100644
--- a/src/main/resources/templates/gonghak/AbeekDetailModal.html
+++ b/src/main/resources/templates/gonghak/AbeekDetailModal.html
@@ -4,11 +4,11 @@
-
-
-
+
+
From 5afc40b95c21de1ed9e9e602ba030457a16249ce Mon Sep 17 00:00:00 2001
From: Taehyeon Jo <70999462+whxogus215@users.noreply.github.com>
Date: Sun, 17 Nov 2024 16:41:27 +0900
Subject: [PATCH 08/29] =?UTF-8?q?feat:=20=ED=8A=B9=EC=A0=95=20=ED=83=80?=
=?UTF-8?q?=EC=9E=85=EC=9D=98=20=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0?=
=?UTF-8?q?=EB=A5=BC=20=EB=88=8C=EB=A0=80=EC=9D=84=20=EB=95=8C,=20?=
=?UTF-8?q?=ED=95=B4=EB=8B=B9=20=ED=83=80=EC=9E=85=EC=9D=98=20=ED=85=8C?=
=?UTF-8?q?=EC=9D=B4=EB=B8=94=EB=A7=8C=20=ED=91=9C=EC=8B=9C=EB=90=98?=
=?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/static/js/modal.js | 15 ++++++++++++++-
.../resources/templates/gonghak/statusForm.html | 5 +++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/static/js/modal.js b/src/main/resources/static/js/modal.js
index bd87116..763de24 100644
--- a/src/main/resources/static/js/modal.js
+++ b/src/main/resources/static/js/modal.js
@@ -1,4 +1,17 @@
-function openModal() {
+function openModal(typeName) {
+
+ const allTbody = document.querySelectorAll(".modal-body tbody");
+ allTbody.forEach(tbody => {
+ tbody.style.display = "none";
+ });
+
+ const findTbody = document.getElementById(typeName);
+ if (findTbody) {
+ findTbody.style.display = "table-row-group";
+ } else {
+ console.error(`${typeName}에 해당하는 상세정보가 존재하지 않습니다.`);
+ }
+
document.getElementById("modal-background").style.display = "block";
document.getElementById("modal-container").style.display = "block";
}
diff --git a/src/main/resources/templates/gonghak/statusForm.html b/src/main/resources/templates/gonghak/statusForm.html
index c7a1cc2..4e4ba43 100644
--- a/src/main/resources/templates/gonghak/statusForm.html
+++ b/src/main/resources/templates/gonghak/statusForm.html
@@ -40,9 +40,10 @@
-
+
상세보기
-
+
Date: Sun, 17 Nov 2024 16:56:11 +0900
Subject: [PATCH 10/29] refactor: CompletedCoursesService
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
기준을 벗어난 학수번호일 경우 저장하지 않음
---
.../completed/service/CompletedCoursesService.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/example/gimmegonghakauth/completed/service/CompletedCoursesService.java b/src/main/java/com/example/gimmegonghakauth/completed/service/CompletedCoursesService.java
index c181a58..05c4da3 100644
--- a/src/main/java/com/example/gimmegonghakauth/completed/service/CompletedCoursesService.java
+++ b/src/main/java/com/example/gimmegonghakauth/completed/service/CompletedCoursesService.java
@@ -148,8 +148,12 @@ public void checkUser(UserDomain userDomain) {
}
private Long courseIdToLong(String courseIdAsString) {
- if (courseIdAsString.charAt(0) == 'P') {
- courseIdAsString = '0' + courseIdAsString.substring(1);
+ if (!Character.isDigit(courseIdAsString.charAt(0))){
+ if (courseIdAsString.charAt(0) == 'P'){
+ courseIdAsString = '0' + courseIdAsString.substring(1);
+ } else{
+ return 0L;
+ }
}
return Long.parseLong(courseIdAsString);
}
From d14fd64829ed5ba00dd81e5f566eeecf03a37225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=ED=9D=AC=EC=88=98?=
Date: Mon, 18 Nov 2024 05:48:34 +0900
Subject: [PATCH 11/29] refactor: GonghakCoursesByMajorDto
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
GonghakCoursesByMajorDto 를 CourseDetailsDto로 변경하고 이번 modal 기능에 필요한 semester 필드만 추가하였습니다.
---
.../status/infrastructure/GonghakDao.java | 4 +--
.../infrastructure/GonghakRepository.java | 4 +--
...sByMajorDto.java => CourseDetailsDto.java} | 36 ++++++++++---------
3 files changed, 23 insertions(+), 21 deletions(-)
rename src/main/java/com/example/gimmegonghakauth/status/service/dto/{GonghakCoursesByMajorDto.java => CourseDetailsDto.java} (87%)
diff --git a/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakDao.java b/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakDao.java
index 9bc01c4..62acd3b 100644
--- a/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakDao.java
+++ b/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakDao.java
@@ -4,7 +4,7 @@
import com.example.gimmegonghakauth.common.constant.CourseCategoryConst;
import com.example.gimmegonghakauth.status.domain.AbeekDomain;
import com.example.gimmegonghakauth.common.domain.MajorsDomain;
-import com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
import com.example.gimmegonghakauth.status.service.dto.GonghakStandardDto;
import com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto;
import java.util.List;
@@ -41,7 +41,7 @@ public Optional findStandard(MajorsDomain majorsDomain){
// gonghakCourse 중 이수한 과목을 불러온다.
@Override
- public List findUserCompletedCourses(
+ public List findUserCompletedCourses(
Long studentId, MajorsDomain majorsDomain) {
return gonghakCoursesDao.findUserCompletedCourses(studentId,majorsDomain.getId(), studentId/DIVIDER);
}
diff --git a/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakRepository.java b/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakRepository.java
index 1e825e3..497203d 100644
--- a/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakRepository.java
+++ b/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakRepository.java
@@ -3,7 +3,7 @@
import com.example.gimmegonghakauth.common.constant.CourseCategoryConst;
import com.example.gimmegonghakauth.status.domain.AbeekDomain;
import com.example.gimmegonghakauth.common.domain.MajorsDomain;
-import com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
import com.example.gimmegonghakauth.status.service.dto.GonghakStandardDto;
import com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto;
import java.util.List;
@@ -17,7 +17,7 @@ public interface GonghakRepository {
Optional findStandard(MajorsDomain majorsDomain);
- List findUserCompletedCourses(Long studentId, MajorsDomain majorsDomain);
+ List findUserCompletedCourses(Long studentId, MajorsDomain majorsDomain);
List findUserIncompletedCourses(
CourseCategoryConst courseCategory,Long studentId, MajorsDomain majorsDomain);
diff --git a/src/main/java/com/example/gimmegonghakauth/status/service/dto/GonghakCoursesByMajorDto.java b/src/main/java/com/example/gimmegonghakauth/status/service/dto/CourseDetailsDto.java
similarity index 87%
rename from src/main/java/com/example/gimmegonghakauth/status/service/dto/GonghakCoursesByMajorDto.java
rename to src/main/java/com/example/gimmegonghakauth/status/service/dto/CourseDetailsDto.java
index a62bcef..f1f2a74 100644
--- a/src/main/java/com/example/gimmegonghakauth/status/service/dto/GonghakCoursesByMajorDto.java
+++ b/src/main/java/com/example/gimmegonghakauth/status/service/dto/CourseDetailsDto.java
@@ -1,17 +1,19 @@
-package com.example.gimmegonghakauth.status.service.dto;
-
-import com.example.gimmegonghakauth.common.constant.CourseCategoryConst;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-@Getter
-@RequiredArgsConstructor
-public class GonghakCoursesByMajorDto {
- private final Long courseId;
- private final String courseName;
- private final int year;
- private final CourseCategoryConst courseCategory;
- private final String passCategory;
- private final double designCredit;
- private final int credit;
-}
+package com.example.gimmegonghakauth.status.service.dto;
+
+import com.example.gimmegonghakauth.common.constant.CourseCategoryConst;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public class CourseDetailsDto {
+
+ private final Long courseId;
+ private final String courseName;
+ private final int year;
+ private final String semester;
+ private final CourseCategoryConst courseCategory;
+ private final String passCategory;
+ private final double designCredit;
+ private final int credit;
+}
From 675e790b1834c274ac6d320ed2cca38cb1cc8ac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=ED=9D=AC=EC=88=98?=
Date: Mon, 18 Nov 2024 05:49:26 +0900
Subject: [PATCH 12/29] refactor:GonghakCoursesDao
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
GonghakCoursesByMajorDto 를 리팩토링함에 따라 semester도 함께 반환하도록 리팩토링하였습니다.
---
.../status/infrastructure/GonghakCoursesDao.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakCoursesDao.java b/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakCoursesDao.java
index 0994fa0..37316c0 100644
--- a/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakCoursesDao.java
+++ b/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakCoursesDao.java
@@ -3,7 +3,7 @@
import com.example.gimmegonghakauth.common.constant.CourseCategoryConst;
import com.example.gimmegonghakauth.status.domain.GonghakCoursesDomain;
import com.example.gimmegonghakauth.common.domain.MajorsDomain;
-import com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
import com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -14,10 +14,10 @@
@Repository
public interface GonghakCoursesDao extends JpaRepository {
- @Query("select new com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto(GCD.coursesDomain.courseId, GCD.coursesDomain.name, GCD.year, GCD.courseCategory, GCD.passCategory, GCD.designCredit, GCD.coursesDomain.credit) from GonghakCoursesDomain GCD "
+ @Query("select new com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto(GCD.coursesDomain.courseId, GCD.coursesDomain.name, GCD.year, CCD.semester, GCD.courseCategory, GCD.passCategory, GCD.designCredit, GCD.coursesDomain.credit) from GonghakCoursesDomain GCD "
+ "join CompletedCoursesDomain CCD on GCD.coursesDomain = CCD.coursesDomain "
+ "where CCD.userDomain.studentId =:studentId and GCD.majorsDomain.id = :majorsId and GCD.year = :year")
- List findUserCompletedCourses(@Param("studentId") Long studentId, @Param("majorsId") Long majorId, @Param("year") Long year);
+ List findUserCompletedCourses(@Param("studentId") Long studentId, @Param("majorsId") Long majorId, @Param("year") Long year);
@Query("select new com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto(GCD.coursesDomain.name, GCD.courseCategory, GCD.coursesDomain.credit, GCD.designCredit) from GonghakCoursesDomain GCD "
+ "left join CompletedCoursesDomain CCD on CCD.coursesDomain = GCD.coursesDomain "
From 3d3b5d031bf7b2166cec21714cf72e9f345b61ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=ED=9D=AC=EC=88=98?=
Date: Mon, 18 Nov 2024 05:54:14 +0900
Subject: [PATCH 13/29] =?UTF-8?q?refactor:=20dto=20=EA=B5=AC=EC=A1=B0=20?=
=?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
최종적으로 controller로 반환되는 GongakResultDto는 AbeekTypeConst 별 AbeekDetailsDto를 가지고 있고 AbeekDetailsDto는 이수 학점 정보인 ResultPoint와 기이수 과목 정보 리스트 coursesDetails 을 가지고 있습니다.
---
.../status/service/dto/AbeekDetailsDto.java | 14 ++++++++++++++
.../status/service/dto/GonghakResultDto.java | 8 +-------
.../status/service/dto/ResultPointDto.java | 14 ++++++++++++++
3 files changed, 29 insertions(+), 7 deletions(-)
create mode 100644 src/main/java/com/example/gimmegonghakauth/status/service/dto/AbeekDetailsDto.java
create mode 100644 src/main/java/com/example/gimmegonghakauth/status/service/dto/ResultPointDto.java
diff --git a/src/main/java/com/example/gimmegonghakauth/status/service/dto/AbeekDetailsDto.java b/src/main/java/com/example/gimmegonghakauth/status/service/dto/AbeekDetailsDto.java
new file mode 100644
index 0000000..77309db
--- /dev/null
+++ b/src/main/java/com/example/gimmegonghakauth/status/service/dto/AbeekDetailsDto.java
@@ -0,0 +1,14 @@
+package com.example.gimmegonghakauth.status.service.dto;
+
+
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class AbeekDetailsDto {
+
+ private ResultPointDto resultPoint;
+ private List coursesDetails;
+}
diff --git a/src/main/java/com/example/gimmegonghakauth/status/service/dto/GonghakResultDto.java b/src/main/java/com/example/gimmegonghakauth/status/service/dto/GonghakResultDto.java
index 6883340..fd3c977 100644
--- a/src/main/java/com/example/gimmegonghakauth/status/service/dto/GonghakResultDto.java
+++ b/src/main/java/com/example/gimmegonghakauth/status/service/dto/GonghakResultDto.java
@@ -8,12 +8,6 @@
@Getter
@RequiredArgsConstructor
public class GonghakResultDto {
- @Getter
- @RequiredArgsConstructor
- public static class ResultPointDto {
- private final Double userPoint;
- private final int standardPoint;
- }
- private final Map userResultRatio;
+ private final Map userResult;
}
diff --git a/src/main/java/com/example/gimmegonghakauth/status/service/dto/ResultPointDto.java b/src/main/java/com/example/gimmegonghakauth/status/service/dto/ResultPointDto.java
new file mode 100644
index 0000000..292d99a
--- /dev/null
+++ b/src/main/java/com/example/gimmegonghakauth/status/service/dto/ResultPointDto.java
@@ -0,0 +1,14 @@
+package com.example.gimmegonghakauth.status.service.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class ResultPointDto {
+
+ private Double userPoint;
+ private int standardPoint;
+}
From 26166da1275013edd608a01e41c82d2c8d2b13ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=ED=9D=AC=EC=88=98?=
Date: Mon, 18 Nov 2024 05:57:05 +0900
Subject: [PATCH 14/29] refactor: Test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
dto 네이밍 변경에 따른 테스트 코드 리팩토링
---
.../Service/GonghakCalculateServiceTest.java | 84 ++++++++++---------
.../dao/GonghakRepositoryTest.java | 8 +-
2 files changed, 50 insertions(+), 42 deletions(-)
diff --git a/src/test/java/com/example/gimmegonghakauth/Service/GonghakCalculateServiceTest.java b/src/test/java/com/example/gimmegonghakauth/Service/GonghakCalculateServiceTest.java
index f5d5cef..33c5771 100644
--- a/src/test/java/com/example/gimmegonghakauth/Service/GonghakCalculateServiceTest.java
+++ b/src/test/java/com/example/gimmegonghakauth/Service/GonghakCalculateServiceTest.java
@@ -4,14 +4,19 @@
import com.example.gimmegonghakauth.Service.GonghakCalculateServiceTest.CalculateTestConfig;
import com.example.gimmegonghakauth.common.constant.AbeekTypeConst;
+import com.example.gimmegonghakauth.common.domain.CoursesDomain;
import com.example.gimmegonghakauth.common.domain.MajorsDomain;
+import com.example.gimmegonghakauth.completed.domain.CompletedCoursesDomain;
import com.example.gimmegonghakauth.status.infrastructure.AbeekDao;
import com.example.gimmegonghakauth.status.infrastructure.GonghakCoursesDao;
import com.example.gimmegonghakauth.status.infrastructure.GonghakDao;
import com.example.gimmegonghakauth.status.infrastructure.GonghakRepository;
import com.example.gimmegonghakauth.status.service.GonghakCalculateService;
-import com.example.gimmegonghakauth.status.service.dto.GonghakResultDto.ResultPointDto;
+import com.example.gimmegonghakauth.status.service.dto.AbeekDetailsDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
+import com.example.gimmegonghakauth.status.service.dto.ResultPointDto;
import com.example.gimmegonghakauth.user.domain.UserDomain;
+import java.util.List;
import java.util.Map;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -33,23 +38,54 @@
@ActiveProfiles("test")
class GonghakCalculateServiceTest {
+ private static final MajorsDomain TEST_MAJORSDOMAIN = MajorsDomain.builder()
+ .id(1L)
+ .major("컴퓨터공학과").build();
+ private static final UserDomain TEST_USERDOMAIN = UserDomain.builder()
+ .email("testEmail")
+ .name("홍지섭")
+ .password("qwer")
+ .studentId(19011706L)
+ .majorsDomain(TEST_MAJORSDOMAIN).build();
+
@Autowired
private GonghakCalculateService gonghakCalculateService;
- private static final MajorsDomain TEST_MAJORSDOMAIN = MajorsDomain.builder()
- .id(1L)
- .major("컴퓨터공학과").build();
+ @Test
+ @DisplayName("check log gonghakCalculateServiceTest")
+ void logGonghakCalculateServiceTest() {
+ Map userResultRatio = gonghakCalculateService.getResult(
+ TEST_USERDOMAIN).get().getUserResult();
- private static final UserDomain TEST_USERDOMAIN = UserDomain.builder()
- .email("testEmail")
- .name("홍지섭")
- .password("qwer")
- .studentId(19011706L)
- .majorsDomain(TEST_MAJORSDOMAIN).build();
+ log.info("userResultRatio = {}", userResultRatio);
+ }
+
+ @Test
+ @DisplayName("컴퓨터공학과 GonghakCalculateService 계산 결과 체크")
+ void correctGonghakCalculateServiceTestCom() {
+ Map userResultRatio = gonghakCalculateService.getResult(
+ TEST_USERDOMAIN).get().getUserResult();
+
+ userResultRatio.keySet().forEach(
+ abeekTypeConst -> {
+ Double userPoint = userResultRatio.get(abeekTypeConst).getResultPoint().getUserPoint();
+ assertThat(userPoint).isLessThanOrEqualTo(1);
+ assertThat(userPoint).isGreaterThanOrEqualTo(0);
+ }
+ );
+ }
+
+
+ private double getExpectedCredit(int credit, Map standard,
+ AbeekTypeConst abeekTypeConst) {
+ return Double.valueOf(
+ String.format("%.4f", (double) credit / standard.get(abeekTypeConst)));
+ }
@TestConfiguration
@RequiredArgsConstructor
static class CalculateTestConfig {
+
private final AbeekDao abeekDao;
private final GonghakCoursesDao gonghakCoursesDao;
@@ -63,32 +99,4 @@ public GonghakCalculateService gonghakCalculateService() {
return new GonghakCalculateService(gonghakRepository());
}
}
-
- @Test
- @DisplayName("check log gonghakCalculateServiceTest")
- void logGonghakCalculateServiceTest() {
- Map userResultRatio = gonghakCalculateService.getResultRatio(
- TEST_USERDOMAIN).get().getUserResultRatio();
-
- log.info("userResultRatio = {}", userResultRatio);
- }
-
- @Test
- @DisplayName("컴퓨터공학과 GonghakCalculateService 계산 결과 체크")
- void correctGonghakCalculateServiceTestCom() {
- Map userResultRatio = gonghakCalculateService.getResultRatio(
- TEST_USERDOMAIN).get().getUserResultRatio();
-
- userResultRatio.keySet().forEach(
- abeekTypeConst -> {
- Double userPoint = userResultRatio.get(abeekTypeConst).getUserPoint();
- assertThat(userPoint).isLessThanOrEqualTo(1);
- assertThat(userPoint).isGreaterThanOrEqualTo(0);
- }
- );
- }
-
- private double getExpectedCredit(int credit, Map standard, AbeekTypeConst abeekTypeConst) {
- return Double.valueOf(String.format("%.4f", (double) credit / standard.get(abeekTypeConst)));
- }
}
diff --git a/src/test/java/com/example/gimmegonghakauth/dao/GonghakRepositoryTest.java b/src/test/java/com/example/gimmegonghakauth/dao/GonghakRepositoryTest.java
index 54517ef..aa82c8c 100644
--- a/src/test/java/com/example/gimmegonghakauth/dao/GonghakRepositoryTest.java
+++ b/src/test/java/com/example/gimmegonghakauth/dao/GonghakRepositoryTest.java
@@ -11,7 +11,7 @@
import com.example.gimmegonghakauth.common.domain.MajorsDomain;
import com.example.gimmegonghakauth.status.domain.MajorName;
import com.example.gimmegonghakauth.status.infrastructure.GonghakRepository;
-import com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
import com.example.gimmegonghakauth.status.service.dto.GonghakStandardDto;
import com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto;
import com.example.gimmegonghakauth.user.domain.UserDomain;
@@ -109,7 +109,7 @@ void displayDaoMethod() {
}
);
- List withCompletedCourses = gonghakRepository.findUserCompletedCourses(
+ List withCompletedCourses = gonghakRepository.findUserCompletedCourses(
COM_TEST_STUDENT_ID, COM_TEST_MAJORDOMAIN
);
@@ -138,11 +138,11 @@ void findStandardKeySetTest() {
@Test
@DisplayName("findUserCoursesByMajorByGonghakCoursesWithCompletedCourses 테스트 ")
void findUserCoursesByMajorByGonghakCoursesWithCompletedCoursesTest() {
- List userDataForCalculate = gonghakRepository.findUserCompletedCourses(
+ List userDataForCalculate = gonghakRepository.findUserCompletedCourses(
COM_TEST_STUDENT_ID, COM_TEST_MAJORDOMAIN);
log.info("userDataForCalculate size = {}", userDataForCalculate.size());
- for (GonghakCoursesByMajorDto course : userDataForCalculate) {
+ for (CourseDetailsDto course : userDataForCalculate) {
log.info(
"Course ID: {}, Course Name: {}, Year: {}, Course Category: {}, Pass Category: {}, Design Credit: {}, Credit: {}",
course.getCourseId(),
From 9c816c70923ae9cdfd36f0e6bd92883ee2cbe03b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=ED=9D=AC=EC=88=98?=
Date: Mon, 18 Nov 2024 05:58:25 +0900
Subject: [PATCH 15/29] refactor: GonghakCalculateService
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
메서드 분리, CourseDetails 로직 추가
---
.../service/GonghakCalculateService.java | 154 +++++++++---------
1 file changed, 76 insertions(+), 78 deletions(-)
diff --git a/src/main/java/com/example/gimmegonghakauth/status/service/GonghakCalculateService.java b/src/main/java/com/example/gimmegonghakauth/status/service/GonghakCalculateService.java
index b8d3cae..87fd638 100644
--- a/src/main/java/com/example/gimmegonghakauth/status/service/GonghakCalculateService.java
+++ b/src/main/java/com/example/gimmegonghakauth/status/service/GonghakCalculateService.java
@@ -2,11 +2,13 @@
import com.example.gimmegonghakauth.common.constant.AbeekTypeConst;
import com.example.gimmegonghakauth.status.infrastructure.GonghakRepository;
-import com.example.gimmegonghakauth.status.service.dto.GonghakCoursesByMajorDto;
+import com.example.gimmegonghakauth.status.service.dto.AbeekDetailsDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
import com.example.gimmegonghakauth.status.service.dto.GonghakResultDto;
-import com.example.gimmegonghakauth.status.service.dto.GonghakResultDto.ResultPointDto;
import com.example.gimmegonghakauth.status.service.dto.GonghakStandardDto;
+import com.example.gimmegonghakauth.status.service.dto.ResultPointDto;
import com.example.gimmegonghakauth.user.domain.UserDomain;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -23,116 +25,112 @@ public class GonghakCalculateService {
private final GonghakRepository gonghakRepository;
@Transactional(readOnly = true)
- public Optional getResultRatio(UserDomain userDomain) {
+ public Optional getResult(UserDomain userDomain) {
// findStandard -> 학번 입학년도를 기준으로 해당 년도의 abeekType(영역별 구분),minCredit(영역별 인증학점) 불러온다.
Optional standard = gonghakRepository.findStandard(
- userDomain.getMajorsDomain());
+ userDomain.getMajorsDomain());
// default user abeek 학점 상태 map
- Map userAbeekCredit = getUserAbeekCreditDefault(
- standard.get().getStandards());
+ Map userResult = getUserAbeekCreditDefault(
+ standard.get().getStandards());
// user 공학 상태 테이블
// gonghakCourse 중 이수한 과목을 불러온다.
- List userCoursesByMajorByGonghakCoursesWithCompletedCourses = gonghakRepository.findUserCompletedCourses(
- userDomain.getStudentId(), userDomain.getMajorsDomain());
+ List userCompletedCourses = gonghakRepository.findUserCompletedCourses(
+ userDomain.getStudentId(), userDomain.getMajorsDomain());
// user
// stackUserGonghakCredit -> abeekType에 맞게 이수한 총 학점을 계산한다.
- stackUserGonghakCredit(userCoursesByMajorByGonghakCoursesWithCompletedCourses,
- userAbeekCredit);
-
- // getUserGonghakResultRatio -> 인증 상태(비율)를 계산한다.
- Map userResultRatio = getUserGonghakResultRatio(
- userAbeekCredit, standard);
+ stackUserGonghakCredit(userCompletedCourses,
+ userResult);
// 인증 상태(비율) return
- return Optional.of(new GonghakResultDto(userResultRatio));
+ return Optional.of(new GonghakResultDto(userResult));
}
+
// default user abeek 학점 상태 map을 만들어 반환한다.
- private Map getUserAbeekCreditDefault(
- Map standards) {
- Map userAbeekCredit = new ConcurrentHashMap<>();
+ private Map getUserAbeekCreditDefault(
+ Map standards) {
+ Map userAbeekCredit = new ConcurrentHashMap<>();
Arrays.stream(AbeekTypeConst.values()).forEach(abeekTypeConst -> {
if (standards.containsKey(abeekTypeConst)) {
- userAbeekCredit.put(abeekTypeConst, 0.0);
+ ResultPointDto resultPoint = new ResultPointDto(0.0, standards.get(abeekTypeConst));
+ AbeekDetailsDto abeekDetailsDto = new AbeekDetailsDto(resultPoint,
+ new ArrayList<>());
+ userAbeekCredit.put(abeekTypeConst, abeekDetailsDto);
}
});
return userAbeekCredit;
}
- // 인증 상태(비율)를 계산한다.
- private Map getUserGonghakResultRatio(
- Map userAbeekCredit,
- Optional standard) {
-
- Map userResultRatio = new ConcurrentHashMap<>();
- Arrays.stream(AbeekTypeConst.values()).forEach(abeekTypeConst -> {
- if (userAbeekCredit.containsKey(abeekTypeConst)) {
- getRatio(userAbeekCredit, standard, abeekTypeConst, userResultRatio);
- }
- }
- );
- return userResultRatio;
- }
-
- private void getRatio(Map userAbeekCredit,
- Optional standard, AbeekTypeConst abeekTypeConst,
- Map userResultRatio) {
-
- userResultRatio.put(
- abeekTypeConst,
- new ResultPointDto(userAbeekCredit.get(abeekTypeConst), standard.get().getStandards()
- .get(abeekTypeConst))
- );
- }
// abeekType에 맞게 이수한 총 학점을 계산한다.
- private void stackUserGonghakCredit(
- List userCoursesByMajorByGonghakCoursesWithCompletedCourses,
- Map userAbeekCredit) {
- userCoursesByMajorByGonghakCoursesWithCompletedCourses.forEach(gonghakCoursesByMajorDto -> {
- switch (gonghakCoursesByMajorDto.getCourseCategory()) {
- case 전공:
- stackCredit(AbeekTypeConst.MAJOR, gonghakCoursesByMajorDto, userAbeekCredit);
- break;
- case 전문교양:
- stackCredit(AbeekTypeConst.PROFESSIONAL_NON_MAJOR, gonghakCoursesByMajorDto,
- userAbeekCredit);
- break;
- case 교양:
- stackCredit(AbeekTypeConst.NON_MAJOR, gonghakCoursesByMajorDto,
- userAbeekCredit);
- break;
- case MSC:
- stackCredit(AbeekTypeConst.MSC, gonghakCoursesByMajorDto, userAbeekCredit);
- break;
- case BSM:
- stackCredit(AbeekTypeConst.BSM, gonghakCoursesByMajorDto, userAbeekCredit);
- break;
+ private void stackUserGonghakCredit(List userCoursesByMajor,
+ Map userResult) {
+ userCoursesByMajor.forEach(courseDetailsDto -> {
+ AbeekTypeConst typeConst = getCourseCategoryType(
+ String.valueOf(courseDetailsDto.getCourseCategory()));
+ if (typeConst != null) {
+ stackCredit(typeConst, courseDetailsDto, userResult);
+ addCourseToDetails(typeConst, courseDetailsDto, userResult);
}
- stackCredit(AbeekTypeConst.DESIGN, gonghakCoursesByMajorDto, userAbeekCredit);
- stackCredit(AbeekTypeConst.MINIMUM_CERTI, gonghakCoursesByMajorDto, userAbeekCredit);
+ stackCredit(AbeekTypeConst.DESIGN, courseDetailsDto, userResult);
+ addCourseToDetails(AbeekTypeConst.DESIGN, courseDetailsDto, userResult);
+ stackCredit(AbeekTypeConst.MINIMUM_CERTI, courseDetailsDto, userResult);
+ addCourseToDetails(AbeekTypeConst.MINIMUM_CERTI, courseDetailsDto, userResult);
});
}
+ private AbeekTypeConst getCourseCategoryType(String courseCategory) {
+ switch (courseCategory) {
+ case "전공":
+ return AbeekTypeConst.MAJOR;
+ case "전문교양":
+ return AbeekTypeConst.PROFESSIONAL_NON_MAJOR;
+ case "교양":
+ return AbeekTypeConst.NON_MAJOR;
+ case "MSC":
+ return AbeekTypeConst.MSC;
+ case "BSM":
+ return AbeekTypeConst.BSM;
+ default:
+ return null;
+ }
+ }
+
- private void stackCredit(AbeekTypeConst abeekTypeConst,
- GonghakCoursesByMajorDto gonghakCoursesByMajorDto,
- Map userAbeekCredit) {
- double inputCredit = getInputCredit(abeekTypeConst, gonghakCoursesByMajorDto);
- userAbeekCredit.put(abeekTypeConst, userAbeekCredit.get(abeekTypeConst) + inputCredit);
+ private void stackCredit(AbeekTypeConst abeekTypeConst, CourseDetailsDto courseDetailsDto,
+ Map userResult) {
+ double inputCredit = getInputCredit(abeekTypeConst, courseDetailsDto);
+ AbeekDetailsDto currentDetails = userResult.get(abeekTypeConst);
+ if (currentDetails != null) {
+ ResultPointDto currentResultPoint = currentDetails.getResultPoint();
+ double newUserPoint = currentResultPoint.getUserPoint() + inputCredit;
+ currentResultPoint.setUserPoint(newUserPoint);
+ }
}
+
private double getInputCredit(AbeekTypeConst abeekTypeConst,
- GonghakCoursesByMajorDto gonghakCoursesByMajorDto) {
- if (abeekTypeConst == AbeekTypeConst.DESIGN) {
- return gonghakCoursesByMajorDto.getDesignCredit();
- } else {
- return (double) gonghakCoursesByMajorDto.getCredit();
+ CourseDetailsDto courseDetailsDto) {
+ return (abeekTypeConst == AbeekTypeConst.DESIGN) ? courseDetailsDto.getDesignCredit()
+ : (double) courseDetailsDto.getCredit();
+ }
+
+ private void addCourseToDetails(AbeekTypeConst abeekTypeConst,
+ CourseDetailsDto courseDetailsDto,
+ Map userAbeekCredit) {
+ if (getInputCredit(abeekTypeConst, courseDetailsDto) == 0) {
+ return;
+ }
+
+ AbeekDetailsDto currentDetails = userAbeekCredit.get(abeekTypeConst);
+ if (currentDetails != null) {
+ List updatedCourses = currentDetails.getCoursesDetails();
+ updatedCourses.add(courseDetailsDto);
}
}
From 3b1d3b928c689016766bfd009dc1cc89db75026a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=ED=9D=AC=EC=88=98?=
Date: Mon, 18 Nov 2024 05:59:15 +0900
Subject: [PATCH 16/29] feat: GonghakCalculateServiceTes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
AbeekTypeConst 별로 CourseDetailsDto가 올바르게 저장되는지 확인하는 테스트 코드
---
.../Service/GonghakCalculateServiceTest.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/test/java/com/example/gimmegonghakauth/Service/GonghakCalculateServiceTest.java b/src/test/java/com/example/gimmegonghakauth/Service/GonghakCalculateServiceTest.java
index 33c5771..e5df1c3 100644
--- a/src/test/java/com/example/gimmegonghakauth/Service/GonghakCalculateServiceTest.java
+++ b/src/test/java/com/example/gimmegonghakauth/Service/GonghakCalculateServiceTest.java
@@ -75,6 +75,20 @@ void correctGonghakCalculateServiceTestCom() {
);
}
+ @Test
+ @DisplayName("AbeekTypeConst 별로 CourseDetailsDto가 올바르게 저장되는지 확인")
+ void checkCoursesStoredByAbeekTypeConst() {
+ Map userResult = gonghakCalculateService.getResult(TEST_USERDOMAIN).get().getUserResult();
+
+ userResult.forEach((abeekTypeConst, abeekDetailsDto) -> {
+ List courses = abeekDetailsDto.getCoursesDetails();
+ assertThat(courses).isNotNull();
+ assertThat(courses).isInstanceOf(List.class);
+
+ log.info("AbeekTypeConst: {}, Courses: {}", abeekTypeConst, courses);
+ });
+ }
+
private double getExpectedCredit(int credit, Map standard,
AbeekTypeConst abeekTypeConst) {
From a68ebdee03f0cb6da698a0cf2dedca6bb8c2586b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=B4=ED=9D=AC=EC=88=98?=
Date: Mon, 18 Nov 2024 06:00:21 +0900
Subject: [PATCH 17/29] refactor: StatusController
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Service로부터 userResultRatioDto를 받아온 후 분리하여 각각 resultPoint, coursesDetail로 모델에 전달
---
.../status/controller/StatusController.java | 40 +++++++++++++++----
1 file changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/example/gimmegonghakauth/status/controller/StatusController.java b/src/main/java/com/example/gimmegonghakauth/status/controller/StatusController.java
index 934b407..83a2a84 100644
--- a/src/main/java/com/example/gimmegonghakauth/status/controller/StatusController.java
+++ b/src/main/java/com/example/gimmegonghakauth/status/controller/StatusController.java
@@ -1,15 +1,19 @@
package com.example.gimmegonghakauth.status.controller;
import com.example.gimmegonghakauth.common.constant.AbeekTypeConst;
+import com.example.gimmegonghakauth.status.service.dto.AbeekDetailsDto;
+import com.example.gimmegonghakauth.status.service.dto.CourseDetailsDto;
+import com.example.gimmegonghakauth.status.service.dto.GonghakResultDto;
+import com.example.gimmegonghakauth.status.service.dto.ResultPointDto;
import com.example.gimmegonghakauth.user.infrastructure.UserRepository;
import com.example.gimmegonghakauth.user.domain.UserDomain;
-import com.example.gimmegonghakauth.status.service.dto.GonghakResultDto.ResultPointDto;
import com.example.gimmegonghakauth.status.service.dto.IncompletedCoursesDto;
import com.example.gimmegonghakauth.status.service.GonghakCalculateService;
import com.example.gimmegonghakauth.status.service.recommend.GonghakRecommendService;
import com.example.gimmegonghakauth.status.service.recommend.RecommendServiceSelectManager;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.core.Authentication;
@@ -38,20 +42,42 @@ public String readGonghakStatusResult(Authentication authentication, Model model
// 컨트롤러가 UserDomain 객체를 가져오는 역할을 수행하고 있음.
UserDomain student = userRepository.findByStudentId(studentId).get();
- readUserResultRatio(model, student);
+ readUserResult(model, student);
readUserRecommendCourses(model, studentId, student);
return "gonghak/statusForm";
}
// 사용자의 인증 현황 데이터를 가져온다.
- private void readUserResultRatio(Model model, UserDomain student) {
- Map userResultRatio = gonghakCalculateService.getResultRatio(
+ private void readUserResult(Model model, UserDomain student) {
+ GonghakResultDto userResultRatio = gonghakCalculateService.getResult(
student)
- .get()
- .getUserResultRatio();
- model.addAttribute("userResultRatio", userResultRatio);
+ .orElseThrow(IllegalArgumentException::new);
+ addResultPoint(model, userResultRatio);
+ addCoursesDetails(model, userResultRatio);
}
+ private void addResultPoint(Model model, GonghakResultDto result){
+ Map userResult = result.getUserResult();
+ Map resultPoint = new ConcurrentHashMap<>();
+ userResult.forEach((abeekTypeConst, abeekDetailsDto) -> {
+ resultPoint.put(abeekTypeConst, abeekDetailsDto.getResultPoint());
+ });
+
+ model.addAttribute("userResultRatio", resultPoint);
+ }
+
+ private void addCoursesDetails(Model model, GonghakResultDto result){
+ Map userResult = result.getUserResult();
+
+ Map> coursesDetails = new ConcurrentHashMap<>();
+ userResult.forEach((abeekTypeConst, abeekDetailsDto) -> {
+ coursesDetails.put(abeekTypeConst, abeekDetailsDto.getCoursesDetails());
+ });
+
+ model.addAttribute("userCourseDetails", coursesDetails);
+ }
+
+
// 사용자의 공학인증 추천 과목을 가져온다.
private void readUserRecommendCourses(Model model, Long studentId, UserDomain student) {
GonghakRecommendService gonghakRecommendService = recommendServiceSelectManager.selectRecommendService(
From 7271830dfb967d20ee5632a525d98110bcac28ea Mon Sep 17 00:00:00 2001
From: Taehyeon Jo <70999462+whxogus215@users.noreply.github.com>
Date: Fri, 15 Nov 2024 19:40:57 +0900
Subject: [PATCH 18/29] =?UTF-8?q?refactor:=20tr,=20td=20=ED=83=9C=EA=B7=B8?=
=?UTF-8?q?=20=EB=93=A4=EC=97=AC=EC=93=B0=EA=B8=B0=201=20depth=20=EC=B6=94?=
=?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
tr 태그가 thead, tbody 태그와 같은 depth를 갖고 있어서 가독성 차원에서 들여쓰기를 추가하였습니다.
---
.../templates/gonghak/statusForm.html | 38 +++++++++----------
1 file changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/templates/gonghak/statusForm.html b/src/main/resources/templates/gonghak/statusForm.html
index 5b1861a..c643ce1 100644
--- a/src/main/resources/templates/gonghak/statusForm.html
+++ b/src/main/resources/templates/gonghak/statusForm.html
@@ -25,27 +25,27 @@
-
From 81e8fbcbfd0d225d53e4b1c7e16da5a7a6f5192f Mon Sep 17 00:00:00 2001
From: Taehyeon Jo <70999462+whxogus215@users.noreply.github.com>
Date: Sat, 16 Nov 2024 11:42:37 +0900
Subject: [PATCH 19/29] =?UTF-8?q?feat:=20=ED=83=80=EC=9E=84=EB=A6=AC?=
=?UTF-8?q?=ED=94=84=20=EB=84=A4=EC=9E=84=EC=8A=A4=ED=8E=98=EC=9D=B4?=
=?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/templates/layout/layout2.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/resources/templates/layout/layout2.html b/src/main/resources/templates/layout/layout2.html
index 125570e..80d07b9 100644
--- a/src/main/resources/templates/layout/layout2.html
+++ b/src/main/resources/templates/layout/layout2.html
@@ -1,5 +1,5 @@
-
+
From 1f616c468dbfb8b72d0b487e527ead374a64f12a Mon Sep 17 00:00:00 2001
From: Taehyeon Jo <70999462+whxogus215@users.noreply.github.com>
Date: Sat, 16 Nov 2024 13:53:57 +0900
Subject: [PATCH 20/29] =?UTF-8?q?feat:=20=EB=AA=A8=EB=8B=AC=EC=B0=BD=20?=
=?UTF-8?q?=EB=BC=88=EB=8C=80=20=EA=B5=AC=EC=84=B1=20=EB=B0=8F=20=EC=9E=90?=
=?UTF-8?q?=EC=84=B8=ED=9E=88=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../templates/gonghak/AbeekDetailModal.html | 38 +++++++++++++++++++
.../templates/gonghak/statusForm.html | 10 ++++-
2 files changed, 47 insertions(+), 1 deletion(-)
create mode 100644 src/main/resources/templates/gonghak/AbeekDetailModal.html
diff --git a/src/main/resources/templates/gonghak/AbeekDetailModal.html b/src/main/resources/templates/gonghak/AbeekDetailModal.html
new file mode 100644
index 0000000..ef800b6
--- /dev/null
+++ b/src/main/resources/templates/gonghak/AbeekDetailModal.html
@@ -0,0 +1,38 @@
+
+
+
+
+
+
RESULT RATIO
-
-
-
+
+
+
+
diff --git a/src/main/resources/templates/gonghak/statusForm.html b/src/main/resources/templates/gonghak/statusForm.html
index 7fd7487..e371576 100644
--- a/src/main/resources/templates/gonghak/statusForm.html
+++ b/src/main/resources/templates/gonghak/statusForm.html
@@ -18,7 +18,7 @@
From 688f00835d0a412e686346f0e659f20599962647 Mon Sep 17 00:00:00 2001
From: Taehyeon Jo <70999462+whxogus215@users.noreply.github.com>
Date: Sat, 16 Nov 2024 15:42:33 +0900
Subject: [PATCH 05/29] =?UTF-8?q?feat:=20=EB=AA=A8=EB=8B=AC=EC=B0=BD,=20?=
=?UTF-8?q?=EB=B0=B0=EA=B2=BD=20CSS=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/static/css/modalStyle.css | 21 +++++++++++++++++++
.../templates/gonghak/AbeekDetailModal.html | 4 ++--
.../resources/templates/layout/layout2.html | 1 +
3 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 src/main/resources/static/css/modalStyle.css
diff --git a/src/main/resources/static/css/modalStyle.css b/src/main/resources/static/css/modalStyle.css
new file mode 100644
index 0000000..067bf24
--- /dev/null
+++ b/src/main/resources/static/css/modalStyle.css
@@ -0,0 +1,21 @@
+#modal-background {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5); /* 반투명 검정 배경 */
+ z-index: 999; /* 모달이 표시될 때, 검정 배경이 다른 요소들보다 위에 보이도록 설정 */
+ display: none;
+}
+
+#modal-container {
+ position: fixed;
+ top: 20%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ background-color: white;
+ padding: 20px;
+ z-index: 1000; /* 모달이 배경 위에 오도록 설정 */
+ display: none;
+}
diff --git a/src/main/resources/templates/gonghak/AbeekDetailModal.html b/src/main/resources/templates/gonghak/AbeekDetailModal.html
index 15fb57c..f27b85e 100644
--- a/src/main/resources/templates/gonghak/AbeekDetailModal.html
+++ b/src/main/resources/templates/gonghak/AbeekDetailModal.html
@@ -4,8 +4,8 @@
-
-
RESULT RATIO
RESULT RATIO
| Abeek 타입 | -얻은 학점 | -기준 학점 | -진행도 | -- |
|---|---|---|---|---|
| Abeek 타입 | +얻은 학점 | +기준 학점 | +진행도 | ++ |
| - | - | - | - - | -- |
| + | + | + | + + | ++ |
+
+
diff --git a/src/main/resources/templates/gonghak/statusForm.html b/src/main/resources/templates/gonghak/statusForm.html
index c643ce1..7fd7487 100644
--- a/src/main/resources/templates/gonghak/statusForm.html
+++ b/src/main/resources/templates/gonghak/statusForm.html
@@ -17,6 +17,9 @@
+
+
+
+
+
+
+ 상세 정보
+ +
+
+
+
+
+ | 학수번호 | +과목명 | +학점 | +설계 학점 | +이수년도 | +이수학기 | +
|---|---|---|---|---|---|
| + | + | + | + | + | + |
@@ -35,7 +38,12 @@
-
+
+
+ 상세보기
+
+
From 915f92369acf78edcd5b8f99b4fd5807f547859f Mon Sep 17 00:00:00 2001
From: Taehyeon Jo <70999462+whxogus215@users.noreply.github.com>
Date: Sat, 16 Nov 2024 14:15:30 +0900
Subject: [PATCH 21/29] =?UTF-8?q?feat:=20=EB=AA=A8=EB=8B=AC=EC=B0=BD=20?=
=?UTF-8?q?=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20=EC=97=B4=EA=B8=B0/=EB=8B=AB?=
=?UTF-8?q?=EA=B8=B0=20=ED=8A=B8=EB=A6=AC=EA=B1=B0=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/static/js/modal.js | 9 +++++++++
.../resources/templates/gonghak/AbeekDetailModal.html | 7 ++++---
src/main/resources/templates/gonghak/statusForm.html | 2 +-
3 files changed, 14 insertions(+), 4 deletions(-)
create mode 100644 src/main/resources/static/js/modal.js
diff --git a/src/main/resources/static/js/modal.js b/src/main/resources/static/js/modal.js
new file mode 100644
index 0000000..bd87116
--- /dev/null
+++ b/src/main/resources/static/js/modal.js
@@ -0,0 +1,9 @@
+function openModal() {
+ document.getElementById("modal-background").style.display = "block";
+ document.getElementById("modal-container").style.display = "block";
+}
+
+function closeModal() {
+ document.getElementById("modal-background").style.display = "none";
+ document.getElementById("modal-container").style.display = "none";
+}
diff --git a/src/main/resources/templates/gonghak/AbeekDetailModal.html b/src/main/resources/templates/gonghak/AbeekDetailModal.html
index ef800b6..15fb57c 100644
--- a/src/main/resources/templates/gonghak/AbeekDetailModal.html
+++ b/src/main/resources/templates/gonghak/AbeekDetailModal.html
@@ -4,11 +4,11 @@
-
-
-
+
+
From 94308d5a36f677ba499b48f8001743d4ad2c5735 Mon Sep 17 00:00:00 2001
From: Taehyeon Jo <70999462+whxogus215@users.noreply.github.com>
Date: Sun, 17 Nov 2024 16:41:27 +0900
Subject: [PATCH 25/29] =?UTF-8?q?feat:=20=ED=8A=B9=EC=A0=95=20=ED=83=80?=
=?UTF-8?q?=EC=9E=85=EC=9D=98=20=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0?=
=?UTF-8?q?=EB=A5=BC=20=EB=88=8C=EB=A0=80=EC=9D=84=20=EB=95=8C,=20?=
=?UTF-8?q?=ED=95=B4=EB=8B=B9=20=ED=83=80=EC=9E=85=EC=9D=98=20=ED=85=8C?=
=?UTF-8?q?=EC=9D=B4=EB=B8=94=EB=A7=8C=20=ED=91=9C=EC=8B=9C=EB=90=98?=
=?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/static/js/modal.js | 15 ++++++++++++++-
.../resources/templates/gonghak/statusForm.html | 5 +++--
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/static/js/modal.js b/src/main/resources/static/js/modal.js
index bd87116..763de24 100644
--- a/src/main/resources/static/js/modal.js
+++ b/src/main/resources/static/js/modal.js
@@ -1,4 +1,17 @@
-function openModal() {
+function openModal(typeName) {
+
+ const allTbody = document.querySelectorAll(".modal-body tbody");
+ allTbody.forEach(tbody => {
+ tbody.style.display = "none";
+ });
+
+ const findTbody = document.getElementById(typeName);
+ if (findTbody) {
+ findTbody.style.display = "table-row-group";
+ } else {
+ console.error(`${typeName}에 해당하는 상세정보가 존재하지 않습니다.`);
+ }
+
document.getElementById("modal-background").style.display = "block";
document.getElementById("modal-container").style.display = "block";
}
diff --git a/src/main/resources/templates/gonghak/statusForm.html b/src/main/resources/templates/gonghak/statusForm.html
index c7a1cc2..4e4ba43 100644
--- a/src/main/resources/templates/gonghak/statusForm.html
+++ b/src/main/resources/templates/gonghak/statusForm.html
@@ -40,9 +40,10 @@
-
+
상세보기
-
+
RESULT RATIO
-
-
-
+
+
+
+
diff --git a/src/main/resources/templates/gonghak/statusForm.html b/src/main/resources/templates/gonghak/statusForm.html
index 7fd7487..e371576 100644
--- a/src/main/resources/templates/gonghak/statusForm.html
+++ b/src/main/resources/templates/gonghak/statusForm.html
@@ -18,7 +18,7 @@
From 8f05527df6ef7d54d9378d99aefeba23ff44ecb3 Mon Sep 17 00:00:00 2001
From: Taehyeon Jo <70999462+whxogus215@users.noreply.github.com>
Date: Sat, 16 Nov 2024 15:42:33 +0900
Subject: [PATCH 22/29] =?UTF-8?q?feat:=20=EB=AA=A8=EB=8B=AC=EC=B0=BD,=20?=
=?UTF-8?q?=EB=B0=B0=EA=B2=BD=20CSS=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/resources/static/css/modalStyle.css | 21 +++++++++++++++++++
.../templates/gonghak/AbeekDetailModal.html | 4 ++--
.../resources/templates/layout/layout2.html | 1 +
3 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 src/main/resources/static/css/modalStyle.css
diff --git a/src/main/resources/static/css/modalStyle.css b/src/main/resources/static/css/modalStyle.css
new file mode 100644
index 0000000..067bf24
--- /dev/null
+++ b/src/main/resources/static/css/modalStyle.css
@@ -0,0 +1,21 @@
+#modal-background {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: rgba(0, 0, 0, 0.5); /* 반투명 검정 배경 */
+ z-index: 999; /* 모달이 표시될 때, 검정 배경이 다른 요소들보다 위에 보이도록 설정 */
+ display: none;
+}
+
+#modal-container {
+ position: fixed;
+ top: 20%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ background-color: white;
+ padding: 20px;
+ z-index: 1000; /* 모달이 배경 위에 오도록 설정 */
+ display: none;
+}
diff --git a/src/main/resources/templates/gonghak/AbeekDetailModal.html b/src/main/resources/templates/gonghak/AbeekDetailModal.html
index 15fb57c..f27b85e 100644
--- a/src/main/resources/templates/gonghak/AbeekDetailModal.html
+++ b/src/main/resources/templates/gonghak/AbeekDetailModal.html
@@ -4,8 +4,8 @@
-
-
RESULT RATIO
상세 정보
-
+
| 이수학기 | ||
|---|---|---|
| From 4f1fd15a2cb53bd9b041af6e2494ca2cfc7b7e12 Mon Sep 17 00:00:00 2001 From: Taehyeon Jo <70999462+whxogus215@users.noreply.github.com> Date: Mon, 18 Nov 2024 15:17:29 +0900 Subject: [PATCH 28/29] =?UTF-8?q?fix:=20=EC=9D=B4=EC=88=98=ED=95=9C=20?= =?UTF-8?q?=EA=B3=BC=EB=AA=A9=EC=9D=98=20=EB=85=84=EB=8F=84=EB=A5=BC=20?= =?UTF-8?q?=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../status/infrastructure/GonghakCoursesDao.java | 2 +- src/main/resources/static/js/modal.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakCoursesDao.java b/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakCoursesDao.java index 37316c0..d0b55ec 100644 --- a/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakCoursesDao.java +++ b/src/main/java/com/example/gimmegonghakauth/status/infrastructure/GonghakCoursesDao.java @@ -14,7 +14,7 @@ @Repository public interface GonghakCoursesDao extends JpaRepository |
diff --git a/src/main/resources/templates/user/changePassword.html b/src/main/resources/templates/user/changePassword.html
index cff36ce..ac035cd 100644
--- a/src/main/resources/templates/user/changePassword.html
+++ b/src/main/resources/templates/user/changePassword.html
@@ -1,4 +1,4 @@
-
+