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

2
server/api/index.js
View File

@ -81,6 +81,7 @@ export async function getSubstitutions(req, res) {
lesson: element.lesson, lesson: element.lesson,
date: new Date(element.date).getTime(), date: new Date(element.date).getTime(),
notes: element.notes, notes: element.notes,
teacher: element.teacher,
change: {}, change: {},
}; };
if (element.changedRoom) substitution.change.room = element.changedRoom; if (element.changedRoom) substitution.change.room = element.changedRoom;
@ -145,6 +146,7 @@ export async function getHistory(req, res) {
lesson: element.substitution.lesson, lesson: element.substitution.lesson,
updatedAt: new Date(element.createdAt).getTime(), updatedAt: new Date(element.createdAt).getTime(),
date: new Date(element.substitution.date).getTime(), date: new Date(element.substitution.date).getTime(),
teacher: element.teacher,
change: element.changes, change: element.changes,
notes: element.notes, notes: element.notes,
parseEventId: element.parseEventId, parseEventId: element.parseEventId,

6
server/parser/index.js
View File

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

2
server/prisma/schema.prisma
View File

@ -25,6 +25,7 @@ model Substitution {
date DateTime date DateTime
type String type String
lesson Int lesson Int
teacher String
changedTeacher String? changedTeacher String?
changedRoom String? changedRoom String?
changedSubject String? changedSubject String?
@ -40,6 +41,7 @@ model SubstitutionChange {
substitution Substitution @relation(fields: [substitutionId], references: [id]) substitution Substitution @relation(fields: [substitutionId], references: [id])
substitutionId Int substitutionId Int
type String type String
teacher String?
changes Json? changes Json?
parseEvent ParseEvent @relation(fields: [parseEventId], references: [id]) parseEvent ParseEvent @relation(fields: [parseEventId], references: [id])
parseEventId Int parseEventId Int