Merge branch 'master' into events/33c3

1 files changed, 19 insertions, 1 deletions

diff --git a/view/overview.php b/view/overview.php
index 3b52e8f..adc8d5f 100644
--- a/view/overview.php
+++ b/view/overview.php
@@ -1,8 +1,26 @@
 <?php
 
+$schedule = $conference->getSchedule();
+
+$talksPerRoom = $schedule->getSchedule();
+$now = time() + $schedule->getSimulationOffset();
+
+$upcomingTalksPerRoom = array_map(function($talks) use($now) {
+	return [
+		'current' => array_filter_last($talks, function($talk) use ($now) {
+			return $talk['start'] < $now && $talk['end'] > $now;
+		}),
+		'next' => array_filter_first($talks, function($talk) use ($now) {
+			return !isset($talk['special']) && $talk['start'] > $now;
+		}),
+	];
+}, $talksPerRoom);
+
 echo $tpl->render(array(
 	'page' => 'overview',
 	'title' => 'Live-Streams',
 
-	'overview' => new Overview(),
+	'overview' => $conference->getOverview(),
+
+	'upcomingTalksPerRoom' => $upcomingTalksPerRoom,
 ));