github/wulkanowy-mirror
1
0
Fork 1
mirror of https://github.com/wulkanowy/wulkanowy.git synced 2025-01-31 19:42:44 +01:00
Code

Fix lesson description from warning (#124)

Browse Source
This commit is contained in:
Mikołaj Pich 2018-05-25 20:14:16 +02:00 committed by Rafał Borcz
parent 2288ceffb8
commit 74c0dda999
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,9 @@ public class Timetable {
Elements warn = e.select(".uwaga-panel"); Elements warn = e.select(".uwaga-panel");
if (!warn.isEmpty()) { if (!warn.isEmpty()) {
e.select(".x-treelabel-rlz").last().text("(" + warn.text() + ")"); e.select("span").last()
.addClass("x-treelabel-rlz")
.text(warn.text());
e.remove(1); e.remove(1);
} }
} }

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

@ -156,6 +156,7 @@ public class TimetableTest extends StudentAndParentTestCase {
Assert.assertEquals("poprzednio: Wychowanie fizyczne", full.getWeekTable().getDay(4).getLesson(2).getDescription()); Assert.assertEquals("poprzednio: Wychowanie fizyczne", full.getWeekTable().getDay(4).getLesson(2).getDescription());
Assert.assertEquals("egzamin", full.getWeekTable().getDay(3).getLesson(0).getDescription()); Assert.assertEquals("egzamin", full.getWeekTable().getDay(3).getLesson(0).getDescription());
Assert.assertEquals("", full.getWeekTable().getDay(4).getLesson(1).getDescription()); Assert.assertEquals("", full.getWeekTable().getDay(4).getLesson(1).getDescription());
Assert.assertEquals("opis w uwadze bez klasy w spanie", full.getWeekTable().getDay(4).getLesson(4).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

@ -319,7 +319,16 @@
<span></span> <span></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="random-class">(oddział nieobecny)</span>
</div>
<button type="button" class="uwaga-btn">Uwaga</button>
<div class="uwaga-panel">opis w uwadze bez klasy w spanie</div>
</td>
</tr> </tr>
<tr> <tr>
<td>5</td> <td>5</td>