From 0227762ddc765cfa7b18a1eb168404150975b182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= Date: Mon, 6 Jan 2020 16:54:35 +0100 Subject: [PATCH] [API/DataRemoveModel] Make DAO not remove TYPE_NO_LESSON entries. --- .../edziennik/data/db/modules/timetable/TimetableDao.kt | 6 +++--- .../edziennik/ui/modules/timetable/TimetableDayFragment.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt index 540fdc49..8b37612a 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/timetable/TimetableDao.kt @@ -38,11 +38,11 @@ interface TimetableDao { @Query("DELETE FROM timetable WHERE profileId = :profileId") fun clear(profileId: Int) - @Query("DELETE FROM timetable WHERE profileId = :profileId AND ((type != 3 AND date >= :dateFrom) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom))") + @Query("DELETE FROM timetable WHERE profileId = :profileId AND type != -1 AND ((type != 3 AND date >= :dateFrom) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom))") fun clearFromDate(profileId: Int, dateFrom: Date) - @Query("DELETE FROM timetable WHERE profileId = :profileId AND ((type != 3 AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate <= :dateTo))") + @Query("DELETE FROM timetable WHERE profileId = :profileId AND type != -1 AND ((type != 3 AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate <= :dateTo))") fun clearToDate(profileId: Int, dateTo: Date) - @Query("DELETE FROM timetable WHERE profileId = :profileId AND ((type != 3 AND date >= :dateFrom AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom AND oldDate <= :dateTo))") + @Query("DELETE FROM timetable WHERE profileId = :profileId AND type != -1 AND ((type != 3 AND date >= :dateFrom AND date <= :dateTo) OR ((type = 3 OR type = 1) AND oldDate >= :dateFrom AND oldDate <= :dateTo))") fun clearBetweenDates(profileId: Int, dateFrom: Date, dateTo: Date) @Query(""" diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt index b6ae9f84..5c9a6d59 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/timetable/TimetableDayFragment.kt @@ -173,7 +173,7 @@ class TimetableDayFragment : Fragment(), CoroutineScope { } dayView.setHourLabelViews(hourLabelViews) - buildLessonViews(lessons, events) + buildLessonViews(lessons.filter { it.type != Lesson.TYPE_NO_LESSONS }, events) } private fun buildLessonViews(lessons: List, events: List) {