Skip to content

Rename EnrollmentStatus field #385

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
volodymyr-chekyrta merged 1 commit into from
Oct 17, 2024
Merged

Rename EnrollmentStatus field #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions core/src/main/java/org/openedx/core/data/model/EnrollmentStatus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ data class EnrollmentStatus(
val courseId: String?,
@SerializedName("course_name")
val courseName: String?,
@SerializedName("is_active")
val isActive: Boolean?
@SerializedName("recently_active")
val recentlyActive: Boolean?
) {
fun mapToDomain() = EnrollmentStatus(
courseId = courseId ?: "",
courseName = courseName ?: "",
isActive = isActive ?: false
recentlyActive = recentlyActive ?: false
)
}
2 changes: 1 addition & 1 deletion core/src/main/java/org/openedx/core/domain/model/EnrollmentStatus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ package org.openedx.core.domain.model
data class EnrollmentStatus(
val courseId: String,
val courseName: String,
val isActive: Boolean
val recentlyActive: Boolean
)
4 changes: 2 additions & 2 deletions core/src/main/java/org/openedx/core/worker/CalendarSyncWorker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class CalendarSyncWorker(
val courseId = enrollmentStatus.courseId
try {
createCalendarState(enrollmentStatus)
if (enrollmentStatus.isActive && isCourseSyncEnabled(courseId)) {
if (enrollmentStatus.recentlyActive && isCourseSyncEnabled(courseId)) {
val courseDates = calendarInteractor.getCourseDates(courseId)
val isCourseCalendarUpToDate = isCourseCalendarUpToDate(courseId, courseDates)
if (!isCourseCalendarUpToDate) {
Expand Down Expand Up @@ -191,7 +191,7 @@ class CalendarSyncWorker(
if (courseCalendarStateChecksum == null) {
val courseCalendarStateEntity = CourseCalendarStateEntity(
courseId = enrollmentStatus.courseId,
isCourseSyncEnabled = enrollmentStatus.isActive
isCourseSyncEnabled = enrollmentStatus.recentlyActive
)
calendarInteractor.insertCourseCalendarStateEntityToCache(courseCalendarStateEntity)
}
Expand Down
6 changes: 3 additions & 3 deletions profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ private fun CourseCheckboxList(
.filter { it.courseId in courseIds }
.let { enrollments ->
if (uiState.isHideInactiveCourses) {
enrollments.filter { it.isActive }
enrollments.filter { it.recentlyActive }
} else {
enrollments
}
Expand All @@ -299,7 +299,7 @@ private fun CourseCheckboxList(
?: false
val annotatedString = buildAnnotatedString {
append(course.courseName)
if (!course.isActive) {
if (!course.recentlyActive) {
append(" ")
withStyle(
style = SpanStyle(
Expand Down Expand Up @@ -327,7 +327,7 @@ private fun CourseCheckboxList(
uncheckedColor = MaterialTheme.appColors.textFieldText
),
checked = isCourseSyncEnabled,
enabled = course.isActive,
enabled = course.recentlyActive,
onCheckedChange = { isEnabled ->
onCourseSyncCheckChange(isEnabled, course.courseId)
}
Expand Down