Makes tutorials display within their timeslots

chrisjrn · Jan 28, 2016 · 90ef6cd · 90ef6cd
1 parent ccab2ab
commit 90ef6cd
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/android/app/src/main/java/org/s31/oscon2012/Schedule.java b/android/app/src/main/java/org/s31/oscon2012/Schedule.java
@@ -69,10 +69,18 @@ public static List<Event> eventsInDateRange(Calendar start, Calendar end) {
 						"" + start + "\n" + end + "\n" + "\n" + e.startDate()
 								+ "\n" + e.endDate());
 			}
+
+			// If the talk starts in this timeslot, add it
 			if (start.compareTo(e.startDate()) <= 0
 					&& end.compareTo(e.endDate()) >= 0) {
+				// This talk fits within this timeslot
+				ev.add(e);
+			} else if (e.startDate().compareTo(start) <= 0 &&
+					e.endDate().compareTo(end) >= 0) {
+				// This timeslot fits within this talk
 				ev.add(e);
 			}
+
 		}
 
 		return ev;