From 67957235cdcbace70ab97b33cc0450352e9ac423 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Wed, 20 Jul 2022 14:56:56 -0400 Subject: `pt.conflictsWith` should also check if pt's labs conflict with event --- src/models/PeerTeacher.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/models/PeerTeacher.ts') diff --git a/src/models/PeerTeacher.ts b/src/models/PeerTeacher.ts index 4020a00..ceb838c 100644 --- a/src/models/PeerTeacher.ts +++ b/src/models/PeerTeacher.ts @@ -41,7 +41,13 @@ export default class PeerTeacher { } conflictsWith(event: EventInfo) { - return this.events.some(item => item.conflictsWith(event)); + const all_labs = get(labStore); + const lab_events = [...this.labs.values()].flatMap((lab_id) => { + const lab = all_labs.get(lab_id); + return lab != undefined ? lab.event : []; + }) + return lab_events.some((e) => e.conflictsWith(event)) || + this.events.some(item => item.conflictsWith(event)); } get name(): string { -- cgit v1.2.3