n08i40k/polytechnic-android
1
0
Fork 0
mirror of https://github.com/n08i40k/polytechnic-android.git synced 2025-12-06 09:47:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Экзамен отображается не как зачёт.

Browse Source
This commit is contained in:
N08I40K
2024-12-13 06:33:24 +04:00
parent ff6d5d4dac
commit f4d3759d47
6 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/ru/n08i40k/polytechnic/next/model/LessonType.kt
View File

@@ -18,4 +18,5 @@ enum class LessonType(val value: Int) {
INDEPENDENT_WORK(4), INDEPENDENT_WORK(4),
EXAM(5), EXAM(5),
EXAM_WITH_GRADE(6), EXAM_WITH_GRADE(6),
EXAM_DEFAULT(7)
} }

2
app/src/main/java/ru/n08i40k/polytechnic/next/network/request/schedule/ScheduleGet.kt
View File

@@ -14,7 +14,7 @@ class ScheduleGet(
) : CachedRequest( ) : CachedRequest(
context, context,
Method.GET, Method.GET,
"v3/schedule/group", "v4/schedule/group",
{ listener.onResponse(Json.decodeFromString(it)) }, { listener.onResponse(Json.decodeFromString(it)) },
errorListener errorListener
) { ) {

1
app/src/main/java/ru/n08i40k/polytechnic/next/ui/main/schedule/DayCard.kt
View File

@@ -150,6 +150,7 @@ fun DayCard(
LessonType.INDEPENDENT_WORK -> customCardColors LessonType.INDEPENDENT_WORK -> customCardColors
LessonType.EXAM -> examCardColors LessonType.EXAM -> examCardColors
LessonType.EXAM_WITH_GRADE -> examCardColors LessonType.EXAM_WITH_GRADE -> examCardColors
LessonType.EXAM_DEFAULT -> examCardColors
} }
val mutableExpanded = remember { mutableStateOf(false) } val mutableExpanded = remember { mutableStateOf(false) }

1
app/src/main/java/ru/n08i40k/polytechnic/next/ui/main/schedule/LessonView.kt
View File

@@ -194,6 +194,7 @@ private fun LessonViewRow(
LessonType.INDEPENDENT_WORK -> stringResource(R.string.lesson_type_independent_work) LessonType.INDEPENDENT_WORK -> stringResource(R.string.lesson_type_independent_work)
LessonType.EXAM -> stringResource(R.string.lesson_type_exam) LessonType.EXAM -> stringResource(R.string.lesson_type_exam)
LessonType.EXAM_WITH_GRADE -> stringResource(R.string.lesson_type_exam_with_grade) LessonType.EXAM_WITH_GRADE -> stringResource(R.string.lesson_type_exam_with_grade)
LessonType.EXAM_DEFAULT -> stringResource(R.string.lesson_type_exam_default)
else -> throw Error("Unknown lesson type!") else -> throw Error("Unknown lesson type!")
}, },
fontWeight = FontWeight.Bold, fontWeight = FontWeight.Bold,

1
app/src/main/res/values-ru/strings.xml
View File

@@ -84,4 +84,5 @@
<string name="lesson_type_independent_work">Самостоятельная работа</string> <string name="lesson_type_independent_work">Самостоятельная работа</string>
<string name="lesson_type_exam">ЗАЧЁТ</string> <string name="lesson_type_exam">ЗАЧЁТ</string>
<string name="lesson_type_exam_with_grade">ЗАЧЁТ С ОЦЕНКОЙ</string> <string name="lesson_type_exam_with_grade">ЗАЧЁТ С ОЦЕНКОЙ</string>
<string name="lesson_type_exam_default">ЭКЗАМЕН</string>
</resources> </resources>

5
app/src/main/res/values/strings.xml
View File

@@ -82,6 +82,7 @@
<string name="failed_to_fetch_teacher_names">Failed to fetch teacher names!</string> <string name="failed_to_fetch_teacher_names">Failed to fetch teacher names!</string>
<string name="lesson_type_consultation">Consultation</string> <string name="lesson_type_consultation">Consultation</string>
<string name="lesson_type_independent_work">Independent work</string> <string name="lesson_type_independent_work">Independent work</string>
<string name="lesson_type_exam">EXAM</string> <string name="lesson_type_exam">EXAM*</string>
<string name="lesson_type_exam_with_grade">EXAM WITH GRADE</string> <string name="lesson_type_exam_with_grade">EXAM* WITH GRADE</string>
<string name="lesson_type_exam_default">EXAM</string>
</resources> </resources>