diff --git a/app/src/main/java/io/github/wulkanowy/api/Semester.java b/app/src/main/java/io/github/wulkanowy/api/Semester.java index 90b03ff89..64a07c976 100644 --- a/app/src/main/java/io/github/wulkanowy/api/Semester.java +++ b/app/src/main/java/io/github/wulkanowy/api/Semester.java @@ -3,7 +3,9 @@ package io.github.wulkanowy.api; public class Semester { private String number = ""; + private String id = ""; + private boolean isCurrent = false; public String getNumber() { diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Day.java b/app/src/main/java/io/github/wulkanowy/api/attendance/Day.java new file mode 100644 index 000000000..4fef001f3 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/api/attendance/Day.java @@ -0,0 +1,34 @@ +package io.github.wulkanowy.api.attendance; + +import java.util.ArrayList; +import java.util.List; + +public class Day { + + private List lessons = new ArrayList<>(); + + private String date = ""; + + public Lesson getLesson(int index) { + return lessons.get(index); + } + + public List getLessons() { + return lessons; + } + + public Day setLesson(Lesson lesson) { + this.lessons.add(lesson); + return this; + } + + public String getDate() { + return date; + } + + public Day setDate(String date) { + this.date = date; + + return this; + } +} diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Lesson.java b/app/src/main/java/io/github/wulkanowy/api/attendance/Lesson.java new file mode 100644 index 000000000..e018bdcf0 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/api/attendance/Lesson.java @@ -0,0 +1,120 @@ +package io.github.wulkanowy.api.attendance; + +public class Lesson { + + protected static final String CLASS_NOT_EXIST = "x-sp-nieobecny-w-oddziale"; + + protected static final String CLASS_PRESENCE = "x-obecnosc"; + + protected static final String CLASS_ABSENCE_UNEXCUSED = "x-nieobecnosc-nieuspr"; + + protected static final String CLASS_ABSENCE_EXCUSED = "x-nieobecnosc-uspr"; + + protected static final String CLASS_ABSENCE_FOR_SCHOOL_REASONS = "x-nieobecnosc-przycz-szkol"; + + protected static final String CLASS_UNEXCUSED_LATENESS = "x-sp-nieusprawiedliwione"; + + protected static final String CLASS_EXCUSED_LATENESS = "x-sp-spr"; + + protected static final String CLASS_EXEMPTION = "x-sp-zwolnienie"; + + private String subject = ""; + + private boolean isNotExist = false; + + private boolean isPresence = false; + + private boolean isAbsenceUnexcused = false; + + private boolean isAbsenceExcused = false; + + private boolean isUnexcusedLateness = false; + + private boolean isAbsenceForSchoolReasons = false; + + private boolean isExcusedLateness = false; + + private boolean isExemption = false; + + private boolean isEmpty = false; + + public String getSubject() { + return subject; + } + + public void setSubject(String subject) { + this.subject = subject; + } + + public boolean isNotExist() { + return isNotExist; + } + + public void setNotExist(boolean notExist) { + isNotExist = notExist; + } + + public boolean isPresence() { + return isPresence; + } + + public void setPresence(boolean presence) { + isPresence = presence; + } + + public boolean isAbsenceUnexcused() { + return isAbsenceUnexcused; + } + + public void setAbsenceUnexcused(boolean absenceUnexcused) { + isAbsenceUnexcused = absenceUnexcused; + } + + public boolean isAbsenceExcused() { + return isAbsenceExcused; + } + + public void setAbsenceExcused(boolean absenceExcused) { + isAbsenceExcused = absenceExcused; + } + + public boolean isUnexcusedLateness() { + return isUnexcusedLateness; + } + + public void setUnexcusedLateness(boolean unexcusedLateness) { + isUnexcusedLateness = unexcusedLateness; + } + + public boolean isAbsenceForSchoolReasons() { + return isAbsenceForSchoolReasons; + } + + public void setAbsenceForSchoolReasons(boolean absenceForSchoolReasons) { + isAbsenceForSchoolReasons = absenceForSchoolReasons; + } + + public boolean isExcusedLateness() { + return isExcusedLateness; + } + + public void setExcusedLateness(boolean excusedLateness) { + isExcusedLateness = excusedLateness; + } + + public boolean isExemption() { + return isExemption; + } + + public void setExemption(boolean exemption) { + isExemption = exemption; + } + + public boolean isEmpty() { + return isEmpty; + } + + public void setEmpty(boolean empty) { + isEmpty = empty; + } +} diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Month.java b/app/src/main/java/io/github/wulkanowy/api/attendance/Month.java new file mode 100644 index 000000000..b7edcdbd4 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/api/attendance/Month.java @@ -0,0 +1,26 @@ +package io.github.wulkanowy.api.attendance; + +public class Month { + + private String name = ""; + + private int value = 0; + + public String getName() { + return name; + } + + public Month setName(String name) { + this.name = name; + return this; + } + + public int getValue() { + return value; + } + + public Month setValue(int value) { + this.value = value; + return this; + } +} diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Statistics.java b/app/src/main/java/io/github/wulkanowy/api/attendance/Statistics.java new file mode 100644 index 000000000..55eec175b --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/api/attendance/Statistics.java @@ -0,0 +1,86 @@ +package io.github.wulkanowy.api.attendance; + +import org.apache.commons.lang3.math.NumberUtils; +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import io.github.wulkanowy.api.StudentAndParent; + +public class Statistics { + + private StudentAndParent snp; + + private String attendancePageUrl = "Frekwencja.mvc"; + + public Statistics(StudentAndParent snp) { + this.snp = snp; + } + + public Types getTypesTable() throws IOException { + return getTypesTable(""); + } + + public Types getTypesTable(String tick) throws IOException { + return getTypesTable(tick, -1); + } + + public List getSubjectList() throws IOException { + Element mainContainer = snp.getSnPPageDocument(attendancePageUrl) + .select(".mainContainer #idPrzedmiot").first(); + + List subjectList = new ArrayList<>(); + + for (Element subject : mainContainer.select("option")) { + subjectList.add(new Subject() + .setId(Integer.parseInt(subject.attr("value"))) + .setName(subject.text()) + ); + } + + return subjectList; + } + + public Types getTypesTable(String tick, Integer subjectId) throws IOException { + Element mainContainer = snp.getSnPPageDocument((attendancePageUrl + + "?data={tick}&idPrzedmiot={subject}") + .replace("{tick}", tick) + .replace("{subject}", subjectId.toString()) + ).select(".mainContainer").first(); + + Element table = mainContainer.select("table:nth-of-type(2)").first(); + + Elements headerCells = table.select("thead th"); + List typeList = new ArrayList<>(); + + Elements typesRows = table.select("tbody tr"); + + // fill types with months + for (Element row : typesRows) { + Elements monthsCells = row.select("td"); + + List monthList = new ArrayList<>(); + + // iterate over month in type, first column is empty, last is `total`; (0, n-1) + for (int i = 1; i < monthsCells.size() - 1; i++) { + monthList.add(new Month() + .setValue(NumberUtils.toInt(monthsCells.get(i).text(), 0)) + .setName(headerCells.get(i).text())); + } + + typeList.add(new Type() + .setTotal(NumberUtils.toInt(monthsCells.last().text(), 0)) + .setName(monthsCells.get(0).text()) + .setMonthList(monthList)); + } + + String total = mainContainer.select("h2").text().split(": ")[1]; + + return new Types() + .setTotal(NumberUtils.toDouble(total.replace("%", "").replace(",", "."))) + .setTypeList(typeList); + } +} diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Subject.java b/app/src/main/java/io/github/wulkanowy/api/attendance/Subject.java new file mode 100644 index 000000000..4dac16636 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/api/attendance/Subject.java @@ -0,0 +1,26 @@ +package io.github.wulkanowy.api.attendance; + +public class Subject { + + private int id = -1; + + private String name = ""; + + public int getId() { + return id; + } + + public Subject setId(int id) { + this.id = id; + return this; + } + + public String getName() { + return name; + } + + public Subject setName(String name) { + this.name = name; + return this; + } +} diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Table.java b/app/src/main/java/io/github/wulkanowy/api/attendance/Table.java new file mode 100644 index 000000000..404f519a9 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/api/attendance/Table.java @@ -0,0 +1,98 @@ +package io.github.wulkanowy.api.attendance; + +import org.jsoup.nodes.Element; +import org.jsoup.select.Elements; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import io.github.wulkanowy.api.StudentAndParent; + +public class Table { + + private StudentAndParent snp; + + private String attendancePageUrl = "Frekwencja.mvc?data="; + + public Table(StudentAndParent snp) { + this.snp = snp; + } + + public Week getWeekTable() throws IOException { + return getWeekTable(""); + } + + public Week getWeekTable(String tick) throws IOException { + Element table = snp.getSnPPageDocument(attendancePageUrl + tick) + .select(".mainContainer .presentData").first(); + + Elements headerCells = table.select("thead th"); + List days = new ArrayList<>(); + + for (int i = 1; i < headerCells.size(); i++) { + days.add(new Day().setDate(headerCells.get(i).html().split("
")[1])); + } + + Elements hoursInDays = table.select("tbody tr"); + + // fill days in week with lessons + for (Element row : hoursInDays) { + Elements hours = row.select("td"); + + // fill hours in day + int size = hours.size(); + for (int i = 1; i < size; i++) { + days.get(i - 1).setLesson(getNewLesson(hours.get(i))); + } + } + + String[] dayDescription = headerCells.get(1).html().split("
"); + + return new Week() + .setStartDayDate(dayDescription[1]) + .setDays(days); + } + + private Lesson getNewLesson(Element cell) { + Lesson lesson = new Lesson(); + lesson.setSubject(cell.select("span").text()); + + if (Lesson.CLASS_NOT_EXIST.equals(cell.attr("class"))) { + lesson.setNotExist(true); + lesson.setEmpty(true); + + return lesson; + } + + switch (cell.select("div").attr("class")) { + case Lesson.CLASS_PRESENCE: + lesson.setPresence(true); + break; + case Lesson.CLASS_ABSENCE_UNEXCUSED: + lesson.setAbsenceUnexcused(true); + break; + case Lesson.CLASS_ABSENCE_EXCUSED: + lesson.setAbsenceExcused(true); + break; + case Lesson.CLASS_ABSENCE_FOR_SCHOOL_REASONS: + lesson.setAbsenceForSchoolReasons(true); + break; + case Lesson.CLASS_UNEXCUSED_LATENESS: + lesson.setUnexcusedLateness(true); + break; + case Lesson.CLASS_EXCUSED_LATENESS: + lesson.setExcusedLateness(true); + break; + case Lesson.CLASS_EXEMPTION: + lesson.setExemption(true); + break; + + default: + lesson.setEmpty(true); + break; + } + + return lesson; + } +} diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Type.java b/app/src/main/java/io/github/wulkanowy/api/attendance/Type.java new file mode 100644 index 000000000..25ee4c276 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/api/attendance/Type.java @@ -0,0 +1,40 @@ +package io.github.wulkanowy.api.attendance; + +import java.util.ArrayList; +import java.util.List; + +public class Type { + + private String name = ""; + + private int total = 0; + + private List monthList = new ArrayList<>(); + + public String getName() { + return name; + } + + public Type setName(String name) { + this.name = name; + return this; + } + + public int getTotal() { + return total; + } + + public Type setTotal(int total) { + this.total = total; + return this; + } + + public List getMonthList() { + return monthList; + } + + public Type setMonthList(List monthList) { + this.monthList = monthList; + return this; + } +} diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Types.java b/app/src/main/java/io/github/wulkanowy/api/attendance/Types.java new file mode 100644 index 000000000..d1b1777de --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/api/attendance/Types.java @@ -0,0 +1,29 @@ +package io.github.wulkanowy.api.attendance; + +import java.util.ArrayList; +import java.util.List; + +public class Types { + + private double total = 0; + + private List typeList = new ArrayList<>(); + + public double getTotal() { + return total; + } + + public Types setTotal(double total) { + this.total = total; + return this; + } + + public List getTypeList() { + return typeList; + } + + public Types setTypeList(List typeList) { + this.typeList = typeList; + return this; + } +} diff --git a/app/src/main/java/io/github/wulkanowy/api/attendance/Week.java b/app/src/main/java/io/github/wulkanowy/api/attendance/Week.java new file mode 100644 index 000000000..5aaed0801 --- /dev/null +++ b/app/src/main/java/io/github/wulkanowy/api/attendance/Week.java @@ -0,0 +1,33 @@ +package io.github.wulkanowy.api.attendance; + +import java.util.ArrayList; +import java.util.List; + +public class Week { + + private List days = new ArrayList<>(); + + private String startDayDate = ""; + + public Day getDay(int index) { + return days.get(index); + } + + public List getDays() { + return days; + } + + public Week setDays(List days) { + this.days = days; + return this; + } + + public String getStartDayDate() { + return startDayDate; + } + + public Week setStartDayDate(String startDayDate) { + this.startDayDate = startDayDate; + return this; + } +} diff --git a/app/src/main/java/io/github/wulkanowy/api/school/SchoolData.java b/app/src/main/java/io/github/wulkanowy/api/school/SchoolData.java index 24bb31078..f135163a2 100644 --- a/app/src/main/java/io/github/wulkanowy/api/school/SchoolData.java +++ b/app/src/main/java/io/github/wulkanowy/api/school/SchoolData.java @@ -3,9 +3,13 @@ package io.github.wulkanowy.api.school; public class SchoolData { private String name = ""; + private String address = ""; + private String phoneNumber = ""; + private String headmaster = ""; + private String[] pedagogue; public String getName() { diff --git a/app/src/main/java/io/github/wulkanowy/api/school/Subject.java b/app/src/main/java/io/github/wulkanowy/api/school/Subject.java index d8e0d417b..0a3c0957d 100644 --- a/app/src/main/java/io/github/wulkanowy/api/school/Subject.java +++ b/app/src/main/java/io/github/wulkanowy/api/school/Subject.java @@ -1,7 +1,9 @@ package io.github.wulkanowy.api.school; public class Subject { + private String name = ""; + private String[] teachers; public String getName() { diff --git a/app/src/test/java/io/github/wulkanowy/api/attendance/StatisticsTest.java b/app/src/test/java/io/github/wulkanowy/api/attendance/StatisticsTest.java new file mode 100644 index 000000000..442ff97ee --- /dev/null +++ b/app/src/test/java/io/github/wulkanowy/api/attendance/StatisticsTest.java @@ -0,0 +1,159 @@ +package io.github.wulkanowy.api.attendance; + +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; + +import java.util.List; + +import io.github.wulkanowy.api.FixtureHelper; +import io.github.wulkanowy.api.StudentAndParent; + +public class StatisticsTest { + + private Statistics excellent; + + private Statistics full; + + @Before + public void setUp() throws Exception { + this.excellent = getSetUpTable("Frekwencja-excellent.html"); + this.full = getSetUpTable("Frekwencja-full.html"); + } + + private Statistics getSetUpTable(String fixtureFileName) throws Exception { + String input = FixtureHelper.getAsString(getClass().getResourceAsStream(fixtureFileName)); + + Document tablePageDocument = Jsoup.parse(input); + + StudentAndParent timetable = Mockito.mock(StudentAndParent.class); + Mockito.when(timetable.getSnPPageDocument(Mockito.anyString())) + .thenReturn(tablePageDocument); + + return new Statistics(timetable); + } + + @Test + public void getSubjectList() throws Exception { + Assert.assertEquals(26, excellent.getSubjectList().size()); + Assert.assertEquals(23, full.getSubjectList().size()); + } + + @Test + public void getSubjectListId() throws Exception { + Assert.assertEquals(-1, excellent.getSubjectList().get(0).getId()); + Assert.assertEquals(63, excellent.getSubjectList().get(10).getId()); + Assert.assertEquals(0, excellent.getSubjectList().get(25).getId()); + + Assert.assertEquals(-1, full.getSubjectList().get(0).getId()); + Assert.assertEquals(108, full.getSubjectList().get(14).getId()); + Assert.assertEquals(492, full.getSubjectList().get(21).getId()); + } + + @Test + public void getSubjectListName() throws Exception { + Assert.assertEquals("Wszystkie", excellent.getSubjectList().get(0).getName()); + Assert.assertEquals("Fizyka", excellent.getSubjectList().get(8).getName()); + Assert.assertEquals("Sieci komputerowe i administrowanie sieciami", + excellent.getSubjectList().get(21).getName()); + + Assert.assertEquals("Praktyka zawodowa", full.getSubjectList().get(11).getName()); + Assert.assertEquals("Użytkowanie urządzeń peryferyjnych komputera", + full.getSubjectList().get(16).getName()); + Assert.assertEquals("Brak opisu lekcji", full.getSubjectList().get(22).getName()); + } + + @Test + public void getTypesTotal() throws Exception { + Assert.assertEquals(100.0, excellent.getTypesTable().getTotal(), 0); + Assert.assertEquals(80.94, full.getTypesTable().getTotal(), 0); + } + + @Test + public void getTypeName() throws Exception { + List typeList1 = excellent.getTypesTable().getTypeList(); + Assert.assertEquals("Obecność", typeList1.get(0).getName()); + Assert.assertEquals("Nieobecność nieusprawiedliwiona", typeList1.get(1).getName()); + Assert.assertEquals("Nieobecność usprawiedliwiona", typeList1.get(2).getName()); + Assert.assertEquals("Nieobecność z przyczyn szkolnych", typeList1.get(3).getName()); + + List typeList2 = full.getTypesTable().getTypeList(); + Assert.assertEquals("Spóźnienie nieusprawiedliwione", typeList2.get(4).getName()); + Assert.assertEquals("Spóźnienie usprawiedliwione", typeList2.get(5).getName()); + Assert.assertEquals("Zwolnienie", typeList2.get(6).getName()); + } + + @Test + public void getTypeTotal() throws Exception { + List typeList1 = excellent.getTypesTable().getTypeList(); + Assert.assertEquals(1211, typeList1.get(0).getTotal()); + Assert.assertEquals(0, typeList1.get(1).getTotal()); + Assert.assertEquals(0, typeList1.get(2).getTotal()); + Assert.assertEquals(0, typeList1.get(3).getTotal()); + Assert.assertEquals(0, typeList1.get(4).getTotal()); + Assert.assertEquals(0, typeList1.get(5).getTotal()); + Assert.assertEquals(0, typeList1.get(6).getTotal()); + + List typeList2 = full.getTypesTable().getTypeList(); + Assert.assertEquals(822, typeList2.get(0).getTotal()); + Assert.assertEquals(6, typeList2.get(1).getTotal()); + Assert.assertEquals(192, typeList2.get(2).getTotal()); + Assert.assertEquals(7, typeList2.get(3).getTotal()); + Assert.assertEquals(12, typeList2.get(4).getTotal()); + Assert.assertEquals(1, typeList2.get(5).getTotal()); + Assert.assertEquals(2, typeList2.get(6).getTotal()); + } + + @Test + public void getTypeList() throws Exception { + List typesList1 = excellent.getTypesTable().getTypeList(); + Assert.assertEquals(12, typesList1.get(0).getMonthList().size()); + Assert.assertEquals(12, typesList1.get(5).getMonthList().size()); + + List typesList2 = full.getTypesTable().getTypeList(); + Assert.assertEquals(12, typesList2.get(0).getMonthList().size()); + Assert.assertEquals(12, typesList2.get(5).getMonthList().size()); + } + + @Test + public void getMonthList() throws Exception { + List typeList1 = excellent.getTypesTable().getTypeList(); + Assert.assertEquals(12, typeList1.get(0).getMonthList().size()); + + List typeList2 = full.getTypesTable().getTypeList(); + Assert.assertEquals(12, typeList2.get(0).getMonthList().size()); + } + + @Test + public void getMonthName() throws Exception { + List monthsList1 = excellent.getTypesTable().getTypeList().get(0).getMonthList(); + Assert.assertEquals("IX", monthsList1.get(0).getName()); + Assert.assertEquals("III", monthsList1.get(6).getName()); + Assert.assertEquals("VIII", monthsList1.get(11).getName()); + + List monthsList2 = full.getTypesTable().getTypeList().get(0).getMonthList(); + Assert.assertEquals("XI", monthsList2.get(2).getName()); + Assert.assertEquals("II", monthsList2.get(5).getName()); + Assert.assertEquals("VI", monthsList2.get(9).getName()); + } + + @Test + public void getMonthValue() throws Exception { + List monthsList1 = excellent.getTypesTable().getTypeList().get(0).getMonthList(); + Assert.assertEquals(142, monthsList1.get(0).getValue()); + Assert.assertEquals(131, monthsList1.get(4).getValue()); + Assert.assertEquals(139, monthsList1.get(7).getValue()); + Assert.assertEquals(114, monthsList1.get(9).getValue()); + Assert.assertEquals(0, monthsList1.get(11).getValue()); + + List typeList1 = full.getTypesTable().getTypeList(); + Assert.assertEquals(135, typeList1.get(0).getMonthList().get(0).getValue()); + Assert.assertEquals(7, typeList1.get(3).getMonthList().get(5).getValue()); + Assert.assertEquals(1, typeList1.get(5).getMonthList().get(0).getValue()); + Assert.assertEquals(27, typeList1.get(2).getMonthList().get(9).getValue()); + Assert.assertEquals(0, typeList1.get(0).getMonthList().get(11).getValue()); + } +} diff --git a/app/src/test/java/io/github/wulkanowy/api/attendance/TableTest.java b/app/src/test/java/io/github/wulkanowy/api/attendance/TableTest.java new file mode 100644 index 000000000..0282bae11 --- /dev/null +++ b/app/src/test/java/io/github/wulkanowy/api/attendance/TableTest.java @@ -0,0 +1,181 @@ +package io.github.wulkanowy.api.attendance; + +import org.jsoup.Jsoup; +import org.jsoup.nodes.Document; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; + +import io.github.wulkanowy.api.FixtureHelper; +import io.github.wulkanowy.api.StudentAndParent; + +public class TableTest { + + private Table excellent; + + private Table full; + + @Before + public void setUp() throws Exception { + excellent = getSetUpTable("Frekwencja-excellent.html"); + full = getSetUpTable("Frekwencja-full.html"); + } + + public Table getSetUpTable(String fixtureFileName) throws Exception { + String input = FixtureHelper.getAsString(getClass().getResourceAsStream(fixtureFileName)); + + Document tablePageDocument = Jsoup.parse(input); + + StudentAndParent timetable = Mockito.mock(StudentAndParent.class); + Mockito.when(timetable.getSnPPageDocument(Mockito.anyString())) + .thenReturn(tablePageDocument); + + return new Table(timetable); + } + + @Test + public void getWeekStartByDate() throws Exception { + Assert.assertEquals("31.08.2015", excellent.getWeekTable().getStartDayDate()); + Assert.assertEquals("05.09.2016", full.getWeekTable().getStartDayDate()); + } + + @Test + public void getWeekDaysNumber() throws Exception { + Assert.assertEquals(5, excellent.getWeekTable().getDays().size()); + Assert.assertEquals(5, full.getWeekTable().getDays().size()); + } + + @Test + public void getDayLessonsNumber() throws Exception { + Assert.assertEquals(14, excellent.getWeekTable().getDay(0).getLessons().size()); + Assert.assertEquals(14, full.getWeekTable().getDay(0).getLessons().size()); + } + + @Test + public void getDayDate() throws Exception { + Assert.assertEquals("31.08.2015", excellent.getWeekTable().getDay(0).getDate()); + Assert.assertEquals("02.09.2015", excellent.getWeekTable().getDay(2).getDate()); + Assert.assertEquals("04.09.2015", excellent.getWeekTable().getDay(4).getDate()); + + Assert.assertEquals("05.09.2016", full.getWeekTable().getDay(0).getDate()); + Assert.assertEquals("07.09.2016", full.getWeekTable().getDay(2).getDate()); + Assert.assertEquals("09.09.2016", full.getWeekTable().getDay(4).getDate()); + } + + @Test + public void getLessonSubject() throws Exception { + Assert.assertEquals("", + excellent.getWeekTable().getDay(0).getLesson(7).getSubject()); + Assert.assertEquals("Uroczyste rozpoczęcie roku szkolnego 2015/2016", + excellent.getWeekTable().getDay(1).getLesson(1).getSubject()); + Assert.assertEquals("Geografia", + excellent.getWeekTable().getDay(3).getLesson(4).getSubject()); + + Assert.assertEquals("Naprawa komputera", + full.getWeekTable().getDay(1).getLesson(8).getSubject()); + Assert.assertEquals("Religia", + full.getWeekTable().getDay(3).getLesson(1).getSubject()); + Assert.assertEquals("Metodologia programowania", + full.getWeekTable().getDay(4).getLesson(5).getSubject()); + } + + @Test + public void getLessonIsNotExist() throws Exception { + Assert.assertTrue(excellent.getWeekTable().getDay(0).getLesson(5).isNotExist()); + Assert.assertFalse(excellent.getWeekTable().getDay(2).getLesson(1).isNotExist()); + Assert.assertFalse(excellent.getWeekTable().getDay(4).getLesson(12).isNotExist()); + + Assert.assertFalse(full.getWeekTable().getDay(1).getLesson(12).isAbsenceUnexcused()); + Assert.assertFalse(full.getWeekTable().getDay(3).getLesson(1).isAbsenceUnexcused()); + Assert.assertFalse(full.getWeekTable().getDay(4).getLesson(5).isAbsenceUnexcused()); + } + + @Test + public void getLessonIsEmpty() throws Exception { + Assert.assertTrue(excellent.getWeekTable().getDay(0).getLesson(0).isEmpty()); + Assert.assertFalse(excellent.getWeekTable().getDay(2).getLesson(6).isEmpty()); + Assert.assertTrue(excellent.getWeekTable().getDay(4).getLesson(12).isEmpty()); + + Assert.assertTrue(full.getWeekTable().getDay(1).getLesson(9).isEmpty()); + Assert.assertFalse(full.getWeekTable().getDay(2).getLesson(5).isEmpty()); + Assert.assertFalse(full.getWeekTable().getDay(4).getLesson(2).isEmpty()); + } + + @Test + public void getLessonIsPresence() throws Exception { + Assert.assertFalse(excellent.getWeekTable().getDay(0).getLesson(7).isPresence()); + Assert.assertTrue(excellent.getWeekTable().getDay(1).getLesson(1).isPresence()); + Assert.assertTrue(excellent.getWeekTable().getDay(3).getLesson(7).isPresence()); + + Assert.assertTrue(full.getWeekTable().getDay(0).getLesson(1).isPresence()); + Assert.assertTrue(full.getWeekTable().getDay(2).getLesson(6).isPresence()); + Assert.assertFalse(full.getWeekTable().getDay(4).getLesson(7).isPresence()); + } + + @Test + public void getLessonIsAbsenceUnexcused() throws Exception { + Assert.assertFalse(excellent.getWeekTable().getDay(0).getLesson(7).isAbsenceUnexcused()); + Assert.assertFalse(excellent.getWeekTable().getDay(2).getLesson(0).isAbsenceUnexcused()); + Assert.assertFalse(excellent.getWeekTable().getDay(4).getLesson(4).isAbsenceUnexcused()); + + Assert.assertTrue(full.getWeekTable().getDay(1).getLesson(8).isAbsenceUnexcused()); + Assert.assertFalse(full.getWeekTable().getDay(3).getLesson(1).isAbsenceUnexcused()); + Assert.assertFalse(full.getWeekTable().getDay(4).getLesson(8).isAbsenceUnexcused()); + } + + @Test + public void getLessonIsAbsenceExcused() throws Exception { + Assert.assertFalse(excellent.getWeekTable().getDay(0).getLesson(7).isAbsenceExcused()); + Assert.assertFalse(excellent.getWeekTable().getDay(2).getLesson(0).isAbsenceExcused()); + Assert.assertFalse(excellent.getWeekTable().getDay(4).getLesson(4).isAbsenceExcused()); + + Assert.assertFalse(full.getWeekTable().getDay(2).getLesson(5).isAbsenceExcused()); + Assert.assertFalse(full.getWeekTable().getDay(3).getLesson(1).isAbsenceExcused()); + Assert.assertTrue(full.getWeekTable().getDay(4).getLesson(3).isAbsenceExcused()); + } + + @Test + public void getLessonIsAbsenceForSchoolReasons() throws Exception { + Assert.assertFalse(excellent.getWeekTable().getDay(0).getLesson(4).isAbsenceForSchoolReasons()); + Assert.assertFalse(excellent.getWeekTable().getDay(2).getLesson(8).isAbsenceForSchoolReasons()); + Assert.assertFalse(excellent.getWeekTable().getDay(4).getLesson(12).isAbsenceForSchoolReasons()); + + Assert.assertTrue(full.getWeekTable().getDay(2).getLesson(5).isAbsenceForSchoolReasons()); + Assert.assertFalse(full.getWeekTable().getDay(3).getLesson(1).isAbsenceForSchoolReasons()); + Assert.assertFalse(full.getWeekTable().getDay(4).getLesson(8).isAbsenceForSchoolReasons()); + } + + @Test + public void getLessonIsUnexcusedLateness() throws Exception { + Assert.assertFalse(excellent.getWeekTable().getDay(0).getLesson(4).isUnexcusedLateness()); + Assert.assertFalse(excellent.getWeekTable().getDay(2).getLesson(8).isUnexcusedLateness()); + Assert.assertFalse(excellent.getWeekTable().getDay(4).getLesson(12).isUnexcusedLateness()); + + Assert.assertTrue(full.getWeekTable().getDay(1).getLesson(6).isUnexcusedLateness()); + Assert.assertFalse(full.getWeekTable().getDay(3).getLesson(1).isUnexcusedLateness()); + Assert.assertFalse(full.getWeekTable().getDay(4).getLesson(8).isUnexcusedLateness()); + } + + @Test + public void getLessonIsExcusedLateness() throws Exception { + Assert.assertFalse(excellent.getWeekTable().getDay(0).getLesson(4).isExcusedLateness()); + Assert.assertFalse(excellent.getWeekTable().getDay(2).getLesson(8).isExcusedLateness()); + Assert.assertFalse(excellent.getWeekTable().getDay(4).getLesson(12).isExcusedLateness()); + + Assert.assertTrue(full.getWeekTable().getDay(1).getLesson(7).isExcusedLateness()); + Assert.assertFalse(full.getWeekTable().getDay(3).getLesson(1).isExcusedLateness()); + Assert.assertFalse(full.getWeekTable().getDay(4).getLesson(8).isExcusedLateness()); + } + + @Test + public void getLessonIsExemption() throws Exception { + Assert.assertFalse(excellent.getWeekTable().getDay(0).getLesson(4).isExemption()); + Assert.assertFalse(excellent.getWeekTable().getDay(2).getLesson(8).isExemption()); + Assert.assertFalse(excellent.getWeekTable().getDay(4).getLesson(12).isExemption()); + + Assert.assertFalse(full.getWeekTable().getDay(2).getLesson(5).isExemption()); + Assert.assertFalse(full.getWeekTable().getDay(3).getLesson(1).isExemption()); + Assert.assertTrue(full.getWeekTable().getDay(4).getLesson(8).isExemption()); + } +} diff --git a/app/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-excellent.html b/app/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-excellent.html new file mode 100644 index 000000000..5eaf50dfe --- /dev/null +++ b/app/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-excellent.html @@ -0,0 +1,408 @@ + + + + + Witryna ucznia i rodzica – Frekwencja + + + +
+

Frekwencja

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Lekcjaponiedziałek
31.08.2015		wtorek
01.09.2015		środa
02.09.2015		czwartek
03.09.2015		piątek
04.09.2015
0
1 +
+ Uroczyste rozpoczęcie roku szkolnego 2015/2016 +
+ 		+
+ Wychowanie do życia w rodzinie +
+ 		+
+ Urządzenia techniki komputerowej +
+
2 +
+ Język angielski +
+ 		+
+ Język niemiecki +
+ 		+
+ Urządzenia techniki komputerowej +
+
3 +
+ Systemy operacyjne +
+ 		+
+ Chemia +
+ 		+
+ Urządzenia techniki komputerowej +
+
4 +
+ Systemy operacyjne +
+ 		+
+ Geografia +
+ 		+
+ Urządzenia techniki komputerowej +
+
5 +
+ Tworzenie stron internetowych +
+ 		+
+ Matematyka +
+ 		+
+ Język polski +
+
6 +
+ Tworzenie stron internetowych +
+ 		+
+ Fizyka +
+ 		+
+ Matematyka +
+
7 +
+ Wychowanie fizyczne +
+ 		+
+ Język polski +
+ 		+
+ Historia +
+
8 +
+ Wychowanie fizyczne +
+
9
10
11
12
13
+

Statystyki

+
+ + +
+

Frekwencja od początku roku szkolnego: 100,00%

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IXXXIXIIIIIIIIIVVVIVIIVIIIRazem
Obecność14214313911013175126139921141211
Nieobecność nieusprawiedliwiona
Nieobecność usprawiedliwiona
Nieobecność z przyczyn szkolnych
Spóźnienie nieusprawiedliwione
Spóźnienie usprawiedliwione
Zwolnienie
+
+
wersja: 17.07.0002.24480
+ + diff --git a/app/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-full.html b/app/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-full.html new file mode 100644 index 000000000..aa9953053 --- /dev/null +++ b/app/src/test/resources/io/github/wulkanowy/api/attendance/Frekwencja-full.html @@ -0,0 +1,498 @@ + + + + + Witryna ucznia i rodzica – Frekwencja + + + +
+

Frekwencja

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Lekcjaponiedziałek
05.09.2016		wtorek
06.09.2016		środa
07.09.2016		czwartek
08.09.2016		piątek
09.09.2016
0
1 +
+ Urządzenia techniki komputerowej +
+ 		+
+ Multimedia i grafika komputerowa +
+ 		+
+ Użytkowanie urządzeń peryferyjnych komputera +
+ 		+
+ Religia +
+
2 +
+ Urządzenia techniki komputerowej +
+ 		+
+ Język niemiecki +
+ 		+
+ Użytkowanie urządzeń peryferyjnych komputera +
+ 		+
+ Język niemiecki +
+ 		+
+ Sieci komputerowe i administrowanie sieciami +
+
3 +
+ Urządzenia techniki komputerowej +
+ 		+
+ Fizyka +
+ 		+
+ Historia +
+ 		+
+ Wychowanie fizyczne +
+ 		+
+ Wiedza o kulturze +
+
4 +
+ Naprawa komputera +
+ 		+
+ Wychowanie fizyczne +
+ 		+
+ Język angielski +
+ 		+
+ Wychowanie fizyczne +
+ 		+
+ Język polski +
+
5 +
+ Sieci komputerowe i administrowanie sieciami +
+ 		+
+ Metodologia programowania +
+ 		+
+ Urządzenia techniki komputerowej +
+ 		+
+ Matematyka +
+ 		+
+ Metodologia programowania +
+
6 +
+ Język niemiecki +
+ 		+
+ Sieci komputerowe i administrowanie sieciami +
+ 		+
+ Język polski +
+ 		+
+ Podstawy przedsiębiorczości +
+ 		+
+ Matematyka +
+
7 +
+ Fizyka +
+ 		+
+ Język polski +
+ 		+
+ Systemy operacyjne +
+ 		+
+ Zajęcia z wychowawcą +
+ 		+
+ Religia +
+
8 +
+ Naprawa komputera +
+ 		+
+ Systemy operacyjne +
+ 		+
+ Urządzenia techniki komputerowej +
+ 		+
+ Zajęcia z wychowawcą +
+
9
10
11
12
13
+

Statystyki

+
+ + +
+

Frekwencja od początku roku szkolnego: 80,94%

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IXXXIXIIIIIIIIIVVVIVIIVIIIRazem
Obecność1351031085437100339010359822
Nieobecność nieusprawiedliwiona246
Nieobecność usprawiedliwiona627293044161327192
Nieobecność z przyczyn szkolnych77
Spóźnienie nieusprawiedliwione41222112
Spóźnienie usprawiedliwione11
Zwolnienie112
+
+ + +