Skip to content

merge develop into main #653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ByunDohwi merged 2 commits into from
Mar 13, 2026
Merged

merge develop into main #653

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ae49ab
feat :: 교시 시간 수정
ByunDohwi Mar 13, 2026
c629363
Merge pull request #652 from DSM-PICK/651-attendanceservice-periods-시…
ByunDohwi Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/kotlin/dsm/pick2024/domain/attendance/domain/service/AttendanceService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ class AttendanceService {
LocalTime.of(13, 30) to LocalTime.of(14, 40), // 5교시
LocalTime.of(14, 30) to LocalTime.of(15, 30), // 6교시
LocalTime.of(15, 30) to LocalTime.of(16, 30), // 7교시
LocalTime.of(16, 40) to LocalTime.of(18, 40), // 8교시
LocalTime.of(16, 30) to LocalTime.of(18, 40), // 8교시
LocalTime.of(18, 40) to LocalTime.of(19, 40), // 9교시
LocalTime.of(19, 40) to LocalTime.of(20, 30) // 10교시
LocalTime.of(19, 40) to LocalTime.of(20, 31) // 10교시
)
val periodNames = listOf(
"1교시", "2교시", "3교시", "4교시", "5교시",
Expand Down
Loading