minie4/Timetable-V2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ Save original teacher in substitution entries

Browse Source
This commit is contained in:
minie4
2022-06-02 16:30:33 +02:00
parent 50baefabfe
commit 5c4bf21a77
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/parser/index.js
View File

@ -123,7 +123,8 @@ export class Parser {
substitution.lesson == change.lesson &&
classes.sort().join(",") ==
substitution.class.sort().join(",") &&
substitution.changedSubject == change.subject;
substitution.changedSubject == change.subject &&
substitution.teacher == (change.teacher || "");
}
);
const matchingSubstitution = knownSubstitutions[matchingSubstitutionId];
@ -136,6 +137,7 @@ export class Parser {
date: new Date(date),
type: change.type == "Entfall" ? "cancellation" : "change",
lesson: parseInt(change.lesson),
teacher: change.teacher || "",
changedTeacher: change.changedTeacher,
changedRoom: change.room || undefined,
changedSubject: change.subject,
@ -154,6 +156,7 @@ export class Parser {
lesson: parseInt(change.lesson),
date: new Date(date),
notes: change.notes,
teacher: change.teacher || "",
change: {
teacher: change.changedTeacher,
room: change.room || undefined,
@ -224,6 +227,7 @@ export class Parser {
lesson: remainingSubstitution.lesson,
date: remainingSubstitution.date.getTime(),
notes: remainingSubstitution.notes,
teacher: remainingSubstitution.teacher,
change: {
teacher: remainingSubstitution.changedTeacher,
room: remainingSubstitution.changedRoom,