From 888bff1972e18a7f32d55fcc23cd4900d03c7d61 Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sat, 12 May 2018 01:57:14 +0200 Subject: migrate logic to select current & upcoming talk into the Room class --- model/Room.php | 20 ++++++++++++++++++++ template/overview.phtml | 2 +- view/overview.php | 17 ++++++----------- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/model/Room.php b/model/Room.php index 7089532..3552f60 100644 --- a/model/Room.php +++ b/model/Room.php @@ -4,6 +4,7 @@ class Room { private $slug; private $conference; + private $talks; public function __construct(Conference $conference, $slug) { @@ -16,8 +17,27 @@ class Room throw new NotFoundException('Room '.$slug); $this->slug = $slug; + + $schedule = $conference->getSchedule(); + $talksPerRoom = $schedule->getSchedule(); + $scheduleName = $this->getScheduleName(); + + $this->talks = isset($talksPerRoom[$scheduleName]) ? $talksPerRoom[$scheduleName] : []; } + public function getCurrentTalk($now) + { + return array_filter_last($this->talks, function($talk) use ($now) { + return $talk['start'] < $now && $talk['end'] > $now; + }); + } + + public function getNextTalk($now) + { + return array_filter_first($this->talks, function($talk) use ($now) { + return !isset($talk['special']) && $talk['start'] > $now; + }); + } public function getConference() { return $this->conference; diff --git a/template/overview.phtml b/template/overview.phtml index 513f8e5..71414ec 100644 --- a/template/overview.phtml +++ b/template/overview.phtml @@ -65,7 +65,7 @@ endif ?> if($room->hasSchedule()): ?> - $upcoming = @$upcomingTalksPerRoom[ $room->getScheduleName() ] ?: [] ?> + $upcoming = @$upcomingTalksPerRoom[ $room->getSlug() ] ?: [] ?>