PDF updates

fixing the sorting for the events

diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php
index 6e36e18..ea28a64 100644 (file)
--- a/classes/data/dataEvents.php
+++ b/classes/data/dataEvents.php
@@ -461,8 +461,10 @@ class GlmDataEvents extends GlmDataAbstract
             // get the first element of times array
             if ( !empty( $times ) ) {
                  $r['starting_date'] = $times[key($times)]['start_time']['datetime'];
+                 $r['starting_timestamp'] = strtotime($times[key($times)]['start_time']['datetime']);
                  end($times); // goto the last element of the array
                  $r['ending_date'] = $times[key($times)]['end_time']['datetime'];
+                 $r['ending_timestamp'] = strtotime($times[key($times)]['end_time']['datetime']);
             }
         }
         if ($this->postAddLocations) {

diff --git a/models/front/events/list.php b/models/front/events/list.php
index a3cb568..1402a44 100644 (file)
--- 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  = 160;
+    const PDF_RGT_COL_X  = 190;
 
     private $pages = array();
     /**
@@ -198,6 +198,14 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
             $events = $this->getModelEventsData($categoryId);
             $this->postAddLocations   = false;
             $this->postAddRecurrences = false;
+
+            usort( $events, function($event1, $event2){
+                if ( $event1['starting_timestamp'] == $event2['starting_timestamp']) {
+                    return 0;
+                } 
+                return ($event1['starting_timestamp'] < $event2['starting_timestamp'] ) ? -1 : 1;
+            });
+
             //echo '<pre>$events: ' . print_r($events, true) . '</pre>';
             //exit;
             try {
@@ -259,10 +267,10 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                     // title
                     $title = new SetaPDF_Core_Text_Block( $boldFont, self::PDF_FONT_SIZE );
                     $title->setText($event['name']);
-                    $title->setAlign('center');
+                    //$title->setAlign('center');
                     $title->setWidth(self::PDF_WIDTH);
                     $lineCount = $title->getLineCount();
-                    $title->draw($page->getCanvas(), self::PDF_LFT_COL_X, $pdfY);
+                    $title->draw($page->getCanvas(), self::PDF_RGT_COL_X, $pdfY);
 
                     $pdfY -= self::LINE_HEIGHT;