opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Rename events to event_data

Browse source
This commit is contained in:
Oliver Davies 2017-11-01 20:04:53 +00:00
parent 764c4b7d67
commit 844befd408
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/_includes/talk/events.html.twig
View file

@ -2,7 +2,7 @@
<h2>Events</h2>
{% include "talks-table" with {
talks: { talks: [page], events: site.events }|all_talks|reverse,
talks: { talks: [page], event_data: site.events }|all_talks|reverse,
talk_page: true
} %}
</div>

2
source/talks-archive.html.twig
View file

@ -16,7 +16,7 @@ talks:
<p>Here are a list of my previous conference and user group talks:</p>
{% include "talks-table" with {
talks: { talks: data.talks|merge(page.talks), events: site.events }|past_talks
talks: { talks: data.talks|merge(page.talks), event_data: site.events }|past_talks
} %}
<p>Upcoming talks can be found on the <a href="{{ site.url }}/talks">talks page</a>.</p>

4
source/talks.html.twig
View file

@ -10,7 +10,7 @@ use: [talks]
<h2>Upcoming Talks</h2>
{% set upcoming_talks = { talks: data.talks, events: site.events }|upcoming_talks %}
{% set upcoming_talks = { talks: data.talks, event_data: site.events }|upcoming_talks %}
{% if upcoming_talks %}
{% include "talks-table" with { talks: upcoming_talks } %}
{% else %}
@ -20,7 +20,7 @@ use: [talks]
<h2>Last 5 Talks</h2>
{% include "talks-table" with {
talks: { talks: data.talks, events: site.events }|past_talks|slice(0,5)
talks: { talks: data.talks, event_data: site.events }|past_talks|slice(0,5)
} %}
<p>All previous talks can be found in the <a href="{{ site.url }}/talks/archive">talks archive</a>.</p>

8
src/FormatTalksBundle/Twig/FormatTalksExtension.php
View file

@ -86,15 +86,15 @@ class FormatTalksExtension extends Twig_Extension
*/
public function format(array $data)
{
$events = collect($data['events']);
$event_data = collect($data['event_data']);
return collect($data['talks'])->flatMap(function ($talk) use ($events) {
return collect($data['talks'])->flatMap(function ($talk) use ($event_data) {
// Build an associative array with the talk, as well as the
// specified event data (e.g. date and time) as well as the shared
// event data (e.g. event name and website).
return collect($talk['events'])->map(function ($event) use ($talk, $events) {
return collect($talk['events'])->map(function ($event) use ($talk, $event_data) {
$event = collect($event);
$event = $event->merge($events->get($event->get('event')))->all();
$event = $event->merge($event_data->get($event->get('event')))->all();
return compact('event', 'talk');
});

6
tests/FormatTalksBundle/Twig/FormatTalksTest.php
View file

@ -31,7 +31,7 @@ class FormatTalksTest extends PHPUnit_Framework_TestCase
$eventC = ['date' => (new DateTime('today'))->format('Y-m-d')];
$data = [
'events' => [],
'event_data' => [],
'talks' => [
['events' => [$eventA, $eventB]],
['events' => [$eventC]],
@ -60,7 +60,7 @@ class FormatTalksTest extends PHPUnit_Framework_TestCase
$eventE = ['date' => (new DateTime('+2 weeks'))->format('Y-m-d')];
$data = [
'events' => [],
'event_data' => [],
'talks' => [
['events' => [$eventA, $eventC]],
['events' => [$eventB, $eventE]],
@ -90,7 +90,7 @@ class FormatTalksTest extends PHPUnit_Framework_TestCase
$eventF = ['date' => (new DateTime('-2 months'))->format('Y-m-d')];
$data = [
'events' => [],
'event_data' => [],
'talks' => [
['events' => [$eventD]],
['events' => [$eventA, $eventB, $eventC]],