diff --git a/DistributionPackages/Neos.NeosConIo/Configuration/NodeTypes.Schedule.yaml b/DistributionPackages/Neos.NeosConIo/Configuration/NodeTypes.Schedule.yaml index 4fe4c35c7..cd10e3103 100644 --- a/DistributionPackages/Neos.NeosConIo/Configuration/NodeTypes.Schedule.yaml +++ b/DistributionPackages/Neos.NeosConIo/Configuration/NodeTypes.Schedule.yaml @@ -12,6 +12,13 @@ icon: 'calendar-alt' position: 20 properties: + title: + type: string + placeholder: 'title' + ui: + label: 'Title' + inspector: + group: 'event' event: type: reference ui: @@ -19,3 +26,12 @@ reloadIfChanged: true inspector: group: 'event' + scheduleDate: + type: DateTime + placeholder: 'Select a date to display the schedule for' + ui: + label: 'Schedule date' + inspector: + group: 'event' + editorOptions: + format: 'd.m.Y' diff --git a/DistributionPackages/Neos.NeosConIo/Resources/Private/Fusion/NodeTypes/Schedule/Schedule.fusion b/DistributionPackages/Neos.NeosConIo/Resources/Private/Fusion/NodeTypes/Schedule/Schedule.fusion index 03efad036..dc83dbfb0 100644 --- a/DistributionPackages/Neos.NeosConIo/Resources/Private/Fusion/NodeTypes/Schedule/Schedule.fusion +++ b/DistributionPackages/Neos.NeosConIo/Resources/Private/Fusion/NodeTypes/Schedule/Schedule.fusion @@ -1,14 +1,9 @@ prototype(Neos.NeosConIo:Schedule) < prototype(Neos.Neos:ContentComponent) { - @if.eventNodeIsSet = ${q(event).is('[instanceof Neos.NeosConIo:Event]')} - @if.dateIsSet = ${q(q(event).property('eventDate')).is('[instanceof DateTime]')} + scheduleDate = ${q(node).property('scheduleDate')} + title = ${q(node).property('title')} - @context { - event = ${q(node).property('event')} - days = Neos.Fusion:DataStructure { - day1 = ${q(node).property('event') && q(q(node).property('event')).property('eventDate')} - day2 = ${q(node).property('event') && q(q(node).property('event')).property('eventDate') && Date.add(q(q(node).property('event')).property('eventDate'), 'P1D')} - } - } + // Neos.NeosConIo:Schedule.Talks needs the event set. + @context.event = ${q(node).property('event')} @cache { mode = 'cached' @@ -25,19 +20,15 @@ prototype(Neos.NeosConIo:Schedule) < prototype(Neos.Neos:ContentComponent) { } } - days = ${days} - renderer = afx`
- -

Conference Day {iterator.cycle}

-
- {Date.format(day, 'd M Y')} -
-
- -
-
+

{props.title}

+
+ {Date.format(props.scheduleDate, 'd M Y')} +
+
+ +
` }