adding beer types, event types and venues to the agenda view event content section

diff --git a/models/front/events/list.php b/models/front/events/list.php
index 467854a..6a4e8e4 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -221,12 +221,14 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             }
             break;
         case 'event-list':
+             $this->postAddLocations   = true;
             $this->postAddRecurrences = true;
             $events = $this->getModelEventsData( $categoryId, null, $memberId, $amenityId );
             if ( !$view ) {
                 $view = 'agenda.html';
             }
             $this->postAddRecurrences = false;
+             $this->postAddLocations   = false;
             break;
         case 'nameSearch':
             // get list of names based on term
@@ -690,7 +692,6 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             'calDates'     => $calDates,
             'cal_view'     => $calendar_view
         );
-
         error_reporting(E_ALL ^ E_NOTICE);
         return array(
             'status'           => $status,

diff --git a/views/front/events/beerweek.html b/views/front/events/beerweek.html
index 74033d6..935e4b0 100644 (file)
--- a/views/front/events/beerweek.html
+++ b/views/front/events/beerweek.html
@@ -15,8 +15,10 @@
                             </div>
                         </div>
                     </div>
+                    
                     <div class="small-12 medium-10 columns">
                         {foreach $key as $events}
+                        
                             {foreach $events as $event}
                             <div class="row glm-event-day-event">
                                 <div class="small-12 columns">
@@ -40,7 +42,6 @@
                                                 <span class="agenda-event-weekday"> {$day|substr:0:3} </span>
                                              {/if}
                                              {/foreach}
-
                                         </span>
                                         {/if}
                                          )
@@ -55,6 +56,36 @@
                                         {/if}
                                     </div>
                                     <div class="event-content glm-hide clearfix">
+                                        <div class="beer-types-container">
+                                            <span class="beer-types-agenda">
+                                                {if !empty($event.amenities)}
+                                                    <span class="agenda-label"> Beer Types: </span>
+                                                   {foreach $event.amenities as $beer}
+                                                       {$beer.name}
+                                                   {/foreach}
+                                               {/if}
+                                            </span>
+                                        </div>
+                                        <div class="event-types-container">
+                                            <span class="event-types-agenda">
+                                                {if !empty($event.categories)}
+                                                    <span class="agenda-label"> Event Types: </span>
+                                                   {foreach $event.categories as $type}
+                                                       {$type.name}
+                                                   {/foreach}
+                                               {/if}
+                                            </span>
+                                        </div>
+                                        <div class="event-location-container">
+                                            <span class="event-location-agenda">
+                                                
+                                                {if $event.use_member_location.value === '1'}
+                                                <span class="agenda-label">  Event Venue: </span> {$event.ref_dest}
+                                                {else if $event.other_ref_dest}
+                                                    Event Venue: {$event.other_ref_dest}
+                                                {/if}
+                                            </span>
+                                        </div>
                                         {if $event.image}<img style="float:right;" src="{$imgUrl}{$event.image}">{/if}
                                         {$event.intro}
                                         <div>