Compare commits

...

6 Commits
1.1.0 ... main

Author SHA1 Message Date
a300e771ff
Changed version to 1.2.0 2025-06-02 21:16:29 +02:00
438d5d85cd
Added .getClassList(). Resolves #1 2025-06-02 21:14:59 +02:00
0c3ffa3560
Added test.js to .gitignore 2025-06-01 15:05:34 +02:00
fcaf729247
Removed forgotten console.log 2025-06-01 14:57:03 +02:00
2f7c089c0b
Added holiday detection resolves #2 2025-05-31 17:26:54 +02:00
26a05a8d8c
Changed Note on readme 2025-05-31 17:23:37 +02:00
6 changed files with 69 additions and 11 deletions

3
.gitignore vendored
View File

@ -1 +1,2 @@
node_modules
node_modules
test.js

View File

@ -12,7 +12,7 @@ npm install virtueller-stundenplan
# Note
This project in **very early developement**, expect things to break and change.
This project in (relatively) early developement, expect some things to break and change.
# Usage

View File

@ -13,7 +13,7 @@ class VirtuellerStundenplan {
this.#password = config.password;
if(config.key) this.key = config.key;
//this.teacherList = config.teachers;
this.holidays = config.holidays;
}
async fetchKey(returnKey=false) {
@ -53,6 +53,19 @@ class VirtuellerStundenplan {
};
}
/**
* Returns all classes of the school.
*
* @returns {String[]}
*/
async getClassList() {
const data = await this.request("RESTKlassenliste.php");
return {
head: new Head(data.Msg),
content: data.Klassen,
};
}
/**
* Returns all Messages.
*
@ -189,7 +202,7 @@ class VirtuellerStundenplan {
const hasContent = /[\da-zA-Z]/.test(JSON.stringify(day));
res.content[i] = hasContent ? new TimetableDay(day) : null;
res.content[i] = hasContent ? new TimetableDay(day, this.holidays) : null;
}
return res;

View File

@ -3,12 +3,11 @@ const TimetableHour = require("./TimetableHour");
class TimetableDay {
first = null;
last = null;
holiday = false;
constructor(data) {
constructor(data, holidays=defaultHolidays) {
this.hours = [];
//console.log(data)
for (let i = 0; i < data[0].length; i++) {
const hour = [
data[0][i],
@ -16,7 +15,14 @@ class TimetableDay {
data[2][i],
data[3][i],
data[4][i],
]
];
const allSame = sameHours(data);
if(holidays.includes(allSame)) {
this.holiday = allSame;
return;
}
const hasContent = /[\da-zA-Z]/.test(JSON.stringify(hour));
@ -28,6 +34,44 @@ class TimetableDay {
this.hours[i] = hasContent ? new TimetableHour(hour) : null;
}
}
get isHoliday() {
return this.holiday !== false;
}
get holidayName() {
return this.isHoliday ? this.holiday : null;
}
}
/**
* Checks if the day only has the same hours (e.g. "-", "Himmelfahrt")
*
* @param {Array} day (Nested) Day as an array.
* @returns {false|string} False if they differ. When not it returns the only existing value.
*/
const sameHours = day => {
// Only include column teacher, subject and room.
// Exam always "-", except for when there's exams.
day = [day[0], day[1], day[2]];
const flat = day.flat(); // from [["x","x"]] to ["x","x"]
const first = flat[0];
return flat.every(val => val === first) ? first : false;
};
const defaultHolidays = [
"Sommerferien",
"Tag der Deutschen Einheit",
"Herbstferien",
"Reformationstag",
"Weihnachtsferien",
"Winterferien",
"Osterferien",
"Tag der Arbeit",
"Himmelfahrt",
"Pfingsten",
];
module.exports = TimetableDay;

4
npm-shrinkwrap.json generated
View File

@ -1,12 +1,12 @@
{
"name": "virtueller-stundenplan",
"version": "1.1.0",
"version": "1.2.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "virtueller-stundenplan",
"version": "1.1.0",
"version": "1.2.0",
"license": "CC-BY-NC-4.0",
"dependencies": {
"axios": "^1.8.4",

View File

@ -1,6 +1,6 @@
{
"name": "virtueller-stundenplan",
"version": "1.1.0",
"version": "1.2.0",
"description": "A library to access the data from virtueller-stundenplan.org",
"main": "index.js",
"scripts": {