github/szkolny
1
0
Fork 1
mirror of https://github.com/szkolny-eu/szkolny-android.git synced 2025-01-18 21:06:44 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Attendance] Change TYPE_FREE to TYPE_DAY_FREE.

Browse Source
This commit is contained in:
Kacper Ziubryniewicz 2019-12-26 00:10:14 +01:00
parent e607577407
commit 5dd6519d27
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/pl/szczodrzynski/edziennik/data/api/edziennik/edudziennik/data/web/EdudziennikWebAttendance.kt
View File

@ -40,8 +40,8 @@ class EdudziennikWebAttendance(override val data: DataEdudziennik,
"nieobecność" -> Attendance.TYPE_ABSENT "nieobecność" -> Attendance.TYPE_ABSENT
"spóźnienie" -> Attendance.TYPE_BELATED "spóźnienie" -> Attendance.TYPE_BELATED
"nieobecność usprawiedliwiona" -> Attendance.TYPE_ABSENT_EXCUSED "nieobecność usprawiedliwiona" -> Attendance.TYPE_ABSENT_EXCUSED
"dzień wolny" -> Attendance.TYPE_FREE "dzień wolny" -> Attendance.TYPE_DAY_FREE
"brak zajęć" -> Attendance.TYPE_FREE "brak zajęć" -> Attendance.TYPE_DAY_FREE
"oddelegowany" -> Attendance.TYPE_RELEASED "oddelegowany" -> Attendance.TYPE_RELEASED
else -> Attendance.TYPE_CUSTOM else -> Attendance.TYPE_CUSTOM
} }

2
app/src/main/java/pl/szczodrzynski/edziennik/data/db/modules/attendance/Attendance.java
View File

@ -35,7 +35,7 @@ public class Attendance {
public static final int TYPE_BELATED = 4; public static final int TYPE_BELATED = 4;
public static final int TYPE_BELATED_EXCUSED = 5; public static final int TYPE_BELATED_EXCUSED = 5;
public static final int TYPE_CUSTOM = 6; 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") @ColumnInfo(name = "attendanceType")
public int type = TYPE_PRESENT; public int type = TYPE_PRESENT;

4
app/src/main/java/pl/szczodrzynski/edziennik/ui/modules/attendance/AttendanceAdapter.java
View File

@ -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_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;
import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_BELATED_EXCUSED; 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_PRESENT;
import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_RELEASED; import static pl.szczodrzynski.edziennik.data.db.modules.attendance.Attendance.TYPE_RELEASED;
@ -58,7 +58,7 @@ public class AttendanceAdapter extends RecyclerView.Adapter<AttendanceAdapter.Vi
holder.attendanceTime.setText(attendance.startTime.getStringHM()); holder.attendanceTime.setText(attendance.startTime.getStringHM());
switch (attendance.type) { switch (attendance.type) {
case TYPE_FREE: case TYPE_DAY_FREE:
holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xff166ee0, PorterDuff.Mode.MULTIPLY)); holder.attendanceType.getBackground().setColorFilter(new PorterDuffColorFilter(0xff166ee0, PorterDuff.Mode.MULTIPLY));
holder.attendanceType.setText(R.string.attendance_free_day); holder.attendanceType.setText(R.string.attendance_free_day);
break; break;