@@ -78,15 +78,16 @@
hasSchedule()): ?>
+ getScheduleName() ] ?: [] ?>
Now:
- none
+
Next Talk:
- none
+
diff --git a/view/overview.php b/view/overview.php
index 93cf007..adc8d5f 100644
--- a/view/overview.php
+++ b/view/overview.php
@@ -1,8 +1,26 @@
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' => $conference->getOverview(),
+
+ 'upcomingTalksPerRoom' => $upcomingTalksPerRoom,
));
diff --git a/view/schedule-json.php b/view/schedule-json.php
deleted file mode 100644
index 19346fd..0000000
--- a/view/schedule-json.php
+++ /dev/null
@@ -1,13 +0,0 @@
-getSchedule();
-if(!$schedule->isEnabled())
- throw new NotFoundException('Schedule is disabled');
-
-header('Content-Type: application/json');
-
-if($conference->isClosed())
- echo '{}';
-
-else
- echo json_encode($schedule->getSchedule(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
--
cgit v1.2.3
From 1e6353b9fa405d9c85833a77e329be88cac09fcc Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 18 Dec 2016 13:33:09 +0100
Subject: change default of schedule-name to display-name
---
model/Room.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/model/Room.php b/model/Room.php
index aa72630..782c91d 100644
--- a/model/Room.php
+++ b/model/Room.php
@@ -40,7 +40,7 @@ class Room
}
public function getScheduleName() {
- return $this->getConference()->get('ROOMS.'.$this->getSlug().'.SCHEDULE_NAME', $this->getSlug());
+ return $this->getConference()->get('ROOMS.'.$this->getSlug().'.SCHEDULE_NAME', $this->getDisplay());
}
public function getDisplay() {
--
cgit v1.2.3