From f23f6c0fe1fb399ca3e7d880d33f36034a6a0a0f Mon Sep 17 00:00:00 2001
From: Haris Skiadas <cskiadas@gmail.com>
Date: Mon, 30 Sep 2024 15:09:41 -0400
Subject: [PATCH] add timeslothandler stuff

---
 .../schedulevisualizer/core/TimeSlotHandler.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/edu/hanover/schedulevisualizer/core/TimeSlotHandler.java b/src/main/java/edu/hanover/schedulevisualizer/core/TimeSlotHandler.java
index 52949dd..68c16b4 100644
--- a/src/main/java/edu/hanover/schedulevisualizer/core/TimeSlotHandler.java
+++ b/src/main/java/edu/hanover/schedulevisualizer/core/TimeSlotHandler.java
@@ -19,11 +19,15 @@ protected TimeSlot combineWithFirstAssignedSecondUnassigned(List<Weekday> wkd1,
 
     @Override
     protected TimeSlot combineWithBothAssigned(List<Weekday> wkd1, Integer sn1, List<Weekday> wkd2, Integer sn2) {
-        if (wkd2.get(0).isTR() && wkd1.get(0).isTR()) {
-            return ef.makeHCTimeSlot(wkd1, sn2);
+        if (wkd2.get(0).isTR()) {
+            if (wkd1.get(0).isTR()) {
+                return ef.makeHCTimeSlot(wkd1, sn2);
+            }
         }
-        if (!wkd2.get(0).isTR() && !wkd1.get(0).isTR()) {
-            return ef.makeHCTimeSlot(wkd1, sn2);
+        if (!wkd2.get(0).isTR()) {
+            if (!wkd1.get(0).isTR()) {
+                return ef.makeHCTimeSlot(wkd1, sn2);
+            }
         }
         return ef.makeHCTimeSlot(wkd2, sn2);
     }