.gitignore

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

README.md

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

classes/VirtuellerStundenplan.js

@@ -13,7 +13,7 @@ class VirtuellerStundenplan {
         this.#password = config.password;
         if(config.key) this.key = config.key;
 
-        this.holidays = config.holidays;
+        //this.teacherList = config.teachers;
     }
 
     async fetchKey(returnKey=false) {
@@ -53,19 +53,6 @@ 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.
      * 
@@ -202,7 +189,7 @@ class VirtuellerStundenplan {
 
             const hasContent = /[\da-zA-Z]/.test(JSON.stringify(day));
 
-            res.content[i] = hasContent ? new TimetableDay(day, this.holidays) : null;
+            res.content[i] = hasContent ? new TimetableDay(day) : null;
         }
 
         return res;

classes/parsers/TimetableDay.js

@@ -3,11 +3,12 @@ const TimetableHour = require("./TimetableHour");
 class TimetableDay {
     first = null;
     last = null;
-    holiday = false;
 
-    constructor(data, holidays=defaultHolidays) {
+    constructor(data) {
         this.hours = [];
 
+        //console.log(data)
+
         for (let i = 0; i < data[0].length; i++) {
             const hour = [
                 data[0][i],
@@ -15,14 +16,7 @@ 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));
 
@@ -34,44 +28,6 @@ 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;

npm-shrinkwrap.json

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

package.json

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