github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2025-01-31 12:48:20 +01:00
Code

Fix timetable sync (#48)

Browse Source
This commit is contained in:
Mikołaj Pich 2018-01-11 21:24:03 +01:00 committed by GitHub
parent 5649986a20
commit 23ac726d3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/main/java/io/github/wulkanowy/api/timetable/Timetable.java
View File

@ -88,6 +88,8 @@ public class Timetable {
} }
private void addLessonDetails(Lesson lesson, Elements e) { private void addLessonDetails(Lesson lesson, Elements e) {
moveWarningToLessonNode(e);
switch (e.size()) { switch (e.size()) {
case 1: case 1:
addLessonInfoFromElement(lesson, e.first()); addLessonInfoFromElement(lesson, e.first());
@ -104,6 +106,15 @@ public class Timetable {
} }
} }
private void moveWarningToLessonNode(Elements e) {
Elements warn = e.select(".uwaga-panel");
if (!warn.isEmpty()) {
e.select(".x-treelabel-rlz").last().text("(" + warn.text() + ")");
e.remove(1);
}
}
private void addLessonInfoFromElement(Lesson lesson, Element e) { private void addLessonInfoFromElement(Lesson lesson, Element e) {
Elements spans = e.select("span"); Elements spans = e.select("span");

1
api/src/test/java/io/github/wulkanowy/api/timetable/TimetableTest.java
View File

@ -148,6 +148,7 @@ public class TimetableTest extends StudentAndParentTestCase {
Assert.assertEquals("zastępstwo (poprzednio: Religia)", full.getWeekTable().getDay(2).getLesson(0).getDescription()); Assert.assertEquals("zastępstwo (poprzednio: Religia)", full.getWeekTable().getDay(2).getLesson(0).getDescription());
Assert.assertEquals("zastępstwo (poprzednio: Wychowanie fizyczne)", full.getWeekTable().getDay(3).getLesson(1).getDescription()); Assert.assertEquals("zastępstwo (poprzednio: Wychowanie fizyczne)", full.getWeekTable().getDay(3).getLesson(1).getDescription());
Assert.assertEquals("", full.getWeekTable().getDay(4).getLesson(0).getDescription()); Assert.assertEquals("", full.getWeekTable().getDay(4).getLesson(0).getDescription());
Assert.assertEquals("egzamin", full.getWeekTable().getDay(3).getLesson(0).getDescription());
Assert.assertEquals("", holidays.getWeekTable().getDay(3).getLesson(3).getDescription()); Assert.assertEquals("", holidays.getWeekTable().getDay(3).getLesson(3).getDescription());
} }

11
api/src/test/resources/io/github/wulkanowy/api/timetable/PlanLekcji-full.html
View File

@ -52,7 +52,16 @@
<span class="x-treelabel-rlz">(zastępstwo)</span> <span class="x-treelabel-rlz">(zastępstwo)</span>
</div> </div>
</td> </td>
<td></td> <td>
<div>
<span class="x-treelabel-ppl x-treelabel-inv">Język polski</span>
<span class="x-treelabel-ppl x-treelabel-inv"> </span>
<span class="x-treelabel-ppl x-treelabel-inv">16</span>
<span class="x-treelabel-rlz">(oddział nieobecny)</span>
</div>
<button type="button" class="uwaga-btn">Uwaga</button>
<div class="uwaga-panel">egzamin</div>
</td>
<td> <td>
<div> <div>
<span class="x-treelabel-ppl">Uroczyste zakończenie roku szkolnego</span> <span class="x-treelabel-ppl">Uroczyste zakończenie roku szkolnego</span>