From b03148e2d742f178853a70a7e58e2d2b7de01122 Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Wed, 14 Sep 2016 13:45:54 -0400 Subject: [PATCH] adding date range to the agenda view for recurring events --- css/front.css | 7 +++++++ models/front/events/list.php | 1 + views/front/events/agenda.html | 15 ++++++++++++--- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/css/front.css b/css/front.css index 8566e0d..fe1389f 100644 --- a/css/front.css +++ b/css/front.css @@ -296,3 +296,10 @@ a.fc-time-grid-event.fc-v-event { float: right; } } +.event-name{ + display: inline-block; +} +.absolute-dates{ + font-size: 13px; + font-weight: bold; +} \ No newline at end of file diff --git a/models/front/events/list.php b/models/front/events/list.php index 5cc185f..05098cc 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -628,6 +628,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction } print_r($calDates); +// echo "
", print_r($eventsByDate), "
"; // Compile template data $templateData = array( 'assetsUrl' => GLM_MEMBERS_EVENTS_PLUGIN_URL . 'assets/', diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html index d3b1794..f85408e 100644 --- a/views/front/events/agenda.html +++ b/views/front/events/agenda.html @@ -20,12 +20,13 @@ {foreach $events as $event}
-

{$event.name}

+

{$event.name}

+ {$event.dates} {if !$event.all_day} {if $event.starting_date|date_format:"%l:%M %P" == $event.ending_date|date_format:"%l:%M %P"} - {$event.starting_date|date_format:"%l:%M %P"} +
{$event.starting_date|date_format:"%l:%M %P"}
{else} - {$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"} +
{$event.starting_date|date_format:"%l:%M %P"} - {$event.ending_date|date_format:"%l:%M %P"}
{/if} {/if}
@@ -197,5 +198,13 @@ $(document).on("click", "button.fc-button", function () { eventsCalMonthAJAX(month_obj); }); + + var dates = $(".absolute-dates"); + dates.each( function (){ + if( $(this).text().indexOf('-') < 0 ){ + $(this).remove(); + } + }); + }); -- 2.17.1