diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt index b7a010c7..c24fc8d3 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt @@ -40,8 +40,8 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik, "nieobecność" -> Attendance.TYPE_ABSENT "spóźnienie" -> Attendance.TYPE_BELATED "nieobecność usprawiedliwiona" -> Attendance.TYPE_ABSENT_EXCUSED - "dzień wolny" -> Attendance.TYPE_FREE - "brak zajęć" -> Attendance.TYPE_FREE + "dzień wolny" -> Attendance.TYPE_DAY_FREE + "brak zajęć" -> Attendance.TYPE_DAY_FREE "oddelegowany" -> Attendance.TYPE_RELEASED else -> Attendance.TYPE_CUSTOM } diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java index 224be310..971fa8eb 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java @@ -35,7 +35,7 @@ public class Attendance { public static final int TYPE_BELATED = 4; public static final int TYPE_BELATED_EXCUSED = 5; public static final int TYPE_CUSTOM = 6; - public static final int TYPE_FREE = 7; + public static final int TYPE_DAY_FREE = 7; @ColumnInfo(name = "attendanceType") public int type = TYPE_PRESENT; diff --git a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java index 1746b0dd..dab8a526 100644 --- a/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java +++ b/app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java @@ -22,7 +22,7 @@ import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.T import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_ABSENT_EXCUSED; import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED; import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED_EXCUSED; -import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_FREE; +import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_DAY_FREE; import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_PRESENT; import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_RELEASED; @@ -58,7 +58,7 @@ public class AttendanceAdapter extends RecyclerView.Adapter