From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 7 Apr 2016 18:37:31 +0000 (-0400)
Subject: Updating the layout
X-Git-Tag: v1.0.0^2~112
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=505b1f60fb2ad7555118a34d8b2bbb988cd1a359;p=WP-Plugins%2Fglm-member-db-events.git

Updating the layout

Update pdf layout for the title and correcting the spacing between each
event.
---

diff --git a/models/front/events/list.php b/models/front/events/list.php
index 74fe2ea..c952592 100644
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -31,7 +31,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
     const PDF_LOGO_X     = 20;
     const PDF_LOGO_Y     = 760;
     const PDF_LFT_COL_X  = 20;
-    const PDF_RGT_COL_X  = 200;
+    const PDF_RGT_COL_X  = 160;
 
     private $pages = array();
     /**
@@ -93,6 +93,8 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                     )
                 )
             );
+        } else if ( in_array($action, array( 'event-list-name', 'nameSearch' )) ) {
+            $toDate = null;
         } else {
             if ( isset($_REQUEST['t']) && $t = filter_var( $_REQUEST['t'], FILTER_SANITIZE_STRING ) ) {
                 switch ( $t ) {
@@ -113,7 +115,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                 $toDate = date('m/d/Y', strtotime( '+ 2 weeks' ));
             }
         }
-        if ( $fromDate && $toDate ) {
+        if ( $fromDate && $toDate && !$_REQUEST['event_name']) {
             $from = date('Y-m-d', strtotime($fromDate));
             $to   = date('Y-m-d', strtotime($toDate));
             $this->dateRange = "start_time BETWEEN CAST('{$from}' AS DATE) AND CAST('{$to}' as DATE)";
@@ -122,6 +124,12 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                   FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times
                  WHERE DATE(start_time) BETWEEN '{$from}' AND '{$to}'
             )";
+        } else if ( $fromDate ) {
+            $from = date('Y-m-d', strtotime($fromDate));
+            $this->dateRange = "id IN (
+                SELECT id
+                  FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times
+                 WHERE DATE(start_time) >= '{$from}')";
         }
         //echo '<pre>$this->dateRange: ' . print_r($this->dateRange, true) . '</pre>';
 
@@ -165,7 +173,8 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                         SELECT event
                           FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times AS ET
                          WHERE active
-                           AND " . $this->dateRange . ") ";
+                           AND " . $this->dateRange . "
+                    ) ";
                 $results = $this->wpdb->get_results( $sql, ARRAY_A );
                 if ( !empty( $results ) ) {
                     foreach ( $results as $result ) {
@@ -226,6 +235,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                 $index = 0;
 
                 foreach ( $events as $eventId => $event ) {
+                    $lineCount = 1;
                     $eventTopY = $pdfY;
                     // dates
                     $dates = new SetaPDF_Core_Text_Block( $boldFont, self::PDF_FONT_SIZE );
@@ -246,33 +256,17 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                     $lineCount = $dates->getLineCount();
                     $dates->draw($page->getCanvas(), self::PDF_LFT_COL_X, $pdfY);
 
-                    $pdfY -= self::LINE_HEIGHT * $lineCount;
-
                     // title
                     $title = new SetaPDF_Core_Text_Block( $boldFont, self::PDF_FONT_SIZE );
                     $title->setText($event['name']);
+                    $title->setAlign('center');
+                    $title->setWidth(self::PDF_WIDTH);
                     $lineCount = $title->getLineCount();
                     $title->draw($page->getCanvas(), self::PDF_LFT_COL_X, $pdfY);
 
-                    $pdfY -= self::LINE_HEIGHT * $lineCount;
+                    $pdfY -= self::LINE_HEIGHT;
 
-                    /*
-                    if ( isset($event['categories']) && !empty($event['categories']) ) {
-                        $categoryNames = array();
-                        $category = new SetaPDF_Core_Text_Block( $boldFont, self::PDF_FONT_SIZE );
-                        $category->setText('Categories:');
-                        $category->draw($page->getCanvas(), self::PDF_RGT_COL_X, $eventTopY );
-                        foreach ( $event['categories'] as $category ) {
-                            $categoryNames[] = $category['name'];
-                        }
-                        // output the categories
-                        $category = new SetaPDF_Core_Text_Block( $font, self::PDF_FONT_SIZE );
-                        $category->setText( implode( ',', $categoryNames ) );
-                        $category->draw($page->getCanvas(), self::PDF_RGT_COL_X + 50, $eventTopY );
-                    }
-                     */
-
-                    if ( isset($event['locations']) && !empty($event['locations']) ) {
+                    if ( isset($event['locations']) && !empty($event['locations']) && $event['hide_address']['name'] == 'No' ) {
                         $address = array();
                         $address[] = $event['locations']['name'];
                         $address[] = $event['locations']['address'];
@@ -283,7 +277,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
 
                         $location->setText(implode(', ', $address));
                         $location->draw($page->getCanvas(), self::PDF_LFT_COL_X, $pdfY);
-                        $pdfY -= self::LINE_HEIGHT * $lineCount;
+                        $pdfY -= self::LINE_HEIGHT;
                     }
                         
                     // check for phone, url or email to output
@@ -301,21 +295,21 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                         $contact = new SetaPDF_Core_Text_Block( $font, self::PDF_FONT_SIZE );
                         $contact->setText( implode( ' - ', $contactInfo ) );
                         $contact->draw( $page->getCanvas(), self::PDF_LFT_COL_X, $pdfY );
-                        $pdfY -= self::LINE_HEIGHT * $lineCount;
+                        $pdfY -= self::LINE_HEIGHT;
                     }
 
-                    if ( $event['cost'] && !$event['free'] ) {
+                    if ( $event['cost'] && !$event['free']['value'] ) {
                         $cost = new SetaPDF_Core_Text_Block( $font, self::PDF_FONT_SIZE );
                         $cost->setText( $event['cost'] );
                         $cost->draw( $page->getCanvas(), self::PDF_LFT_COL_X, $pdfY );
                         $pdfY -= self::LINE_HEIGHT;
-                    } else if ( $event['free'] ) {
+                    } else if ( $event['free']['value'] ) {
                         $cost = new SetaPDF_Core_Text_Block( $font, self::PDF_FONT_SIZE );
                         $cost->setText( 'FREE' );
                         $cost->draw( $page->getCanvas(), self::PDF_LFT_COL_X, $pdfY );
                         $pdfY -= self::LINE_HEIGHT;
                     }
-                    $pdfY -= self::LINE_HEIGHT * 2;
+                    $pdfY -= self::LINE_HEIGHT;
 
 
                     if ( isset($event['intro']) && $event['intro'] ) {
@@ -328,14 +322,15 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                         $intro->setText($introText);
                         $intro->setWidth(self::PDF_WIDTH - 30);
                         $lineCount = $intro->getLineCount();
+                        if ( $lineCount > 1 ) {
+                            $pdfY -= self::LINE_HEIGHT;
+                        }
                         $intro->draw($page->getCanvas(), self::PDF_LFT_COL_X, $pdfY);
+                        //echo '<pre>lineCount: ' . print_r($lineCount, true)  . '</pre>';
+                        $pdfY -= self::LINE_HEIGHT;// * $lineCount;
 
-                        $pdfY -= self::LINE_HEIGHT * $lineCount;
                         $page->getCanvas()->draw()->line(self::PDF_LFT_COL_X, $pdfY, self::PDF_WIDTH, $pdfY);
-                        $pdfY -= self::LINE_HEIGHT;
-                        if ( $lineCount == 1 ) {
-                             $pdfY -= self::LINE_HEIGHT;
-                        }
+                        $pdfY -= self::LINE_HEIGHT * 2;
                     }
                     // line at the bottom of the event
                     ++$index;
diff --git a/views/front/events/agenda.html b/views/front/events/agenda.html
index 2cd5dc3..705c96f 100644
--- a/views/front/events/agenda.html
+++ b/views/front/events/agenda.html
@@ -66,14 +66,6 @@
                                 <div class="event-content hide clearfix">
                                     {if $event.image}<img style="float:right;" src="{$imgUrl}{$event.image}">{/if}
                                     {$event.intro}
-                                    {if $event.categories}
-                                    <div>
-                                        <strong>Categories:</strong>
-                                        {foreach $event.categories as $cat}
-                                        {$cat.name}
-                                        {/foreach}
-                                    </div>
-                                    {/if}
                                     <div>
                                         <a class="glm-read-more" href="{$siteBaseUrl}event-detail/{$event.name_slug}/?glm_event_from={$fromDate|unescape:"html"}">Read More</a>
                                     </div>
diff --git a/views/front/events/detail.html b/views/front/events/detail.html
index e90a8bb..bfd3bd6 100644
--- a/views/front/events/detail.html
+++ b/views/front/events/detail.html
@@ -36,17 +36,19 @@
                     <div class="row">
                         <div class="small-12 column"><strong>{$event.dates}</strong></div>
                         <div class="small-12 column">
-                        {if $event.starting_date|date_format:"%l %P" == $event.ending_date|date_format:"%l %P"}
-                            {$event.starting_date|date_format:"%l %P"}
-                        {else}
-                            {$event.starting_date|date_format:"%l %P"} - {$event.ending_date|date_format:"%l %P"}
-                        {/if}
-                        </div>
-                        <div class="small-12 column">
-                            {if $event.locations.name}{$event.locations.name}<br>{/if}
-                            {$event.locations.address}<br>
-                            {$event.locations.city.name}, {$event.locations.state.value} {$event.locations.zip}
+                            {if $event.starting_date|date_format:"%l %P" == $event.ending_date|date_format:"%l %P"}
+                                {$event.starting_date|date_format:"%l %P"}
+                            {else}
+                                {$event.starting_date|date_format:"%l %P"} - {$event.ending_date|date_format:"%l %P"}
+                            {/if}
                         </div>
+                        {if $event.hide_address.name == 'No' }
+                            <div class="small-12 column">
+                                {if $event.locations.name}{$event.locations.name}<br>{/if}
+                                {$event.locations.address}<br>
+                                {$event.locations.city.name}, {$event.locations.state.value} {$event.locations.zip}
+                            </div>
+                        {/if}
                         {if $event.cost && !$event.free.value}
                         <div class="small-12 column"><strong>Cost</strong><br> {$event.cost}</div>
                         {/if}