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

[API/Librus] Fix timetable with no HourFrom and HourTo.

Browse Source
This commit is contained in:
Kuba Szczodrzyński 2019-09-25 21:48:28 +02:00
parent 554097fc7d
commit 37e57d2f73
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/pl/szczodrzynski/edziennik/api/Librus.java
View File

@ -1671,11 +1671,32 @@ public class Librus implements EdziennikInterface {
continue; continue;
} }
Time startTime = null;
Time endTime = null;
try {
startTime = Time.fromH_m(lesson.get(substitution && !cancelled ? "OrgHourFrom" : "HourFrom").getAsString());
endTime = Time.fromH_m(lesson.get(substitution && !cancelled ? "OrgHourTo" : "HourTo").getAsString());
}
catch (Exception ignore) {
try {
JsonElement lessonNo;
if (!((lessonNo = lesson.get("LessonNo")) instanceof JsonNull)) {
Pair<Time, Time> timePair = lessonRanges.get(strToInt(lessonNo.getAsString()));
if (timePair != null) {
startTime = timePair.first;
endTime = timePair.second;
}
}
}
catch (Exception ignore2) { }
}
Lesson lessonObject = new Lesson( Lesson lessonObject = new Lesson(
profileId, profileId,
lesson.get("DayNo").getAsInt() - 1, lesson.get("DayNo").getAsInt() - 1,
Time.fromH_m(lesson.get(substitution && !cancelled ? "OrgHourFrom" : "HourFrom").getAsString()), startTime,
Time.fromH_m(lesson.get(substitution && !cancelled ? "OrgHourTo" : "HourTo").getAsString()) endTime
); );
JsonElement subject; JsonElement subject;
@ -1720,7 +1741,7 @@ public class Librus implements EdziennikInterface {
r("finish", "Substitutions"); r("finish", "Substitutions");
return; return;
} }
JsonArray substitutions = data.get("Substitutions").getAsJsonArray(); JsonArray substitutions = data.get("Substitutions").getAsJsonArray();
try { try {
List<Long> ignoreList = new ArrayList<>(); List<Long> ignoreList = new ArrayList<>();