sadorowo/szkolnyplus
1
0
Fork 0
forked from github/szkolny
Code Pull Requests Activity

[Dialog/GenerateBlockTimetable] Fix not showing cancelled lessons.

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2020-01-06 17:47:57 +01:00
parent 7f1f2d0039
commit 4b08ea7a89
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/pl/szczodrzynski/edziennik/ui/dialogs/timetable/GenerateBlockTimetableDialog.kt
View File

@ -141,21 +141,21 @@ class GenerateBlockTimetableDialog(
val lessons: List<LessonFull> = allLessons.mapNotNull { lesson -> val lessons: List<LessonFull> = allLessons.mapNotNull { lesson ->
if (lesson.profileId != app.profile.id || lesson.type == Lesson.TYPE_NO_LESSONS if (lesson.profileId != app.profile.id || lesson.type == Lesson.TYPE_NO_LESSONS
|| lesson.date == null || lesson.startTime == null || lesson.endTime == null) || lesson.displayDate == null || lesson.displayStartTime == null || lesson.displayEndTime == null)
return@mapNotNull null return@mapNotNull null
if (lesson.date!!.weekDay > maxWeekDay) if (lesson.displayDate!!.weekDay > maxWeekDay)
maxWeekDay = lesson.date!!.weekDay maxWeekDay = lesson.displayDate!!.weekDay
lessonRanges[lesson.startTime!!.value] = lesson.endTime!!.value lessonRanges[lesson.displayStartTime!!.value] = lesson.displayEndTime!!.value
weekDays[lesson.date!!.weekDay].add(lesson) weekDays[lesson.displayDate!!.weekDay].add(lesson)
if (minTime == null || lesson.startTime!! < minTime!!) { if (minTime == null || lesson.displayStartTime!! < minTime!!) {
minTime = lesson.startTime!!.clone() minTime = lesson.displayStartTime!!.clone()
} }
if (maxTime == null || lesson.endTime!! > maxTime!!) { if (maxTime == null || lesson.displayEndTime!! > maxTime!!) {
maxTime = lesson.endTime!!.clone() maxTime = lesson.displayEndTime!!.clone()
} }
return@mapNotNull lesson return@mapNotNull lesson
@ -184,9 +184,9 @@ class GenerateBlockTimetableDialog(
} }
lessons.forEach { lesson -> lessons.forEach { lesson ->
val lessonLength = Time.diff(lesson.endTime, lesson.startTime) val lessonLength = Time.diff(lesson.displayEndTime, lesson.displayStartTime)
val firstOffset = Time.diff(lesson.startTime, minTime) val firstOffset = Time.diff(lesson.displayStartTime, minTime)
val lessonWeekDay = lesson.date!!.weekDay val lessonWeekDay = lesson.displayDate!!.weekDay
val left = WIDTH_CONSTANT + lessonWeekDay * (WIDTH_WEEKDAY + WIDTH_SPACING) val left = WIDTH_CONSTANT + lessonWeekDay * (WIDTH_WEEKDAY + WIDTH_SPACING)
val top = heightProfileName + HEIGHT_CONSTANT + firstOffset.inMinutes * HEIGHT_MINUTE val top = heightProfileName + HEIGHT_CONSTANT + firstOffset.inMinutes * HEIGHT_MINUTE
@ -216,17 +216,17 @@ class GenerateBlockTimetableDialog(
teamName.setTextColor(0xffaaaaaa.toInt()) teamName.setTextColor(0xffaaaaaa.toInt())
} }
subjectName.text = lesson.subjectName ?: "" subjectName.text = lesson.displaySubjectName ?: ""
classroomName.text = lesson.classroom ?: "" classroomName.text = lesson.displayClassroom ?: ""
teacherName.text = lesson.teacherName ?: "" teacherName.text = lesson.displayTeacherName ?: ""
teamName.text = lesson.teamName ?: "" teamName.text = lesson.displayTeamName ?: ""
when (lesson.type) { when (lesson.type) {
Lesson.TYPE_NORMAL -> {} Lesson.TYPE_NORMAL -> {}
Lesson.TYPE_CANCELLED, Lesson.TYPE_SHIFTED_SOURCE -> { Lesson.TYPE_CANCELLED, Lesson.TYPE_SHIFTED_SOURCE -> {
card.setCardBackgroundColor(Color.BLACK) card.setCardBackgroundColor(Color.BLACK)
subjectName.setTextColor(Color.WHITE) subjectName.setTextColor(Color.WHITE)
subjectName.text = lesson.subjectName?.asStrikethroughSpannable() ?: "" subjectName.text = lesson.displaySubjectName?.asStrikethroughSpannable() ?: ""
} }
else -> { else -> {
card.setCardBackgroundColor(0xff234158.toInt()) card.setCardBackgroundColor(0xff234158.toInt())