update the url for the pdf generator and work on logo more

diff --git a/js/dashboard.js b/js/dashboard.js
index 058c9b1..6b765c5 100644 (file)
--- a/js/dashboard.js
+++ b/js/dashboard.js
@@ -21,6 +21,6 @@
     }
     $('#glm-event-pdf-submit').click(function(event){
         eventForm = $('#glm-member-event-search');
-        eventForm.attr('action', eventForm.attr('action') + '?glm-event-pdf=1');
+        eventForm.attr('action', '../wp-admin/admin-ajax.php?action=glm_members_admin_ajax&glm_action=pdfOutput&glm-event-pdf=1');
     });
 }).call(this);

diff --git a/models/front/events/list.php b/models/front/events/list.php
index 1928951..e4cf5aa 100644 (file)
--- a/models/front/events/list.php
+++ b/models/front/events/list.php
@@ -22,9 +22,12 @@ require_once GLM_MEMBERS_EVENTS_PLUGIN_PATH . '/models/front/events/baseAction.p
  */
 class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
 {
-    const PDF_TOP_Y    = 750;
-    const PDF_BOTTOM_Y = 60;
-    const LINE_HEIGHT  = 12;
+    const PDF_TOP_Y      = 750;
+    const PDF_BOTTOM_Y   = 60;
+    const LINE_HEIGHT    = 12;
+    const PDF_LOGO_SCALE = 4;
+    const PDF_LOGO_X     = 20;
+    const PDF_LOGO_Y     = 760;
     /**
      * modelAction
      *
@@ -135,7 +138,13 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                 $page  = $pages->create(SetaPDF_Core_PageFormats::A4);
 
                 // add logo to top of the page
-                $xObject->draw($page->getCanvas(), 20, 770, 500, 60);
+                $xObject->draw(
+                    $page->getCanvas(),
+                    self::PDF_LOGO_X,
+                    self::PDF_LOGO_Y,
+                    $xObject->getWidth() / self::PDF_LOGO_SCALE,
+                    $xObject->getHeight() / self::PDF_LOGO_SCALE
+                );
 
                 $totalEvents = count($events);
                 $index = 0;
@@ -161,6 +170,12 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                     $pdfY -= self::LINE_HEIGHT * $lineCount  + 10;
                     //echo '<pre>title $pdfY: ' . print_r($pdfY, true) . '</pre>';
 
+                    if ( isset($event['categories']) && !empty($event['categories']) ) {
+                        foreach ( $event['categories'] as $category ) {
+                            // output the categories
+                        }
+                    }
+
                     if ( isset($event['intro']) && $event['intro'] ) {
                         // text
                         $intro = new SetaPDF_Core_Text_Block( $font, 8 );
@@ -189,7 +204,13 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
                         $pdfY = self::PDF_TOP_Y;
                         $page = $pages->create(SetaPDF_Core_PageFormats::A4);
                         // add logo to top of the page
-                        $xObject->draw($page->getCanvas(), 20, 770, 500, 60);
+                        $xObject->draw(
+                            $page->getCanvas(),
+                            self::PDF_LOGO_X,
+                            self::PDF_LOGO_Y,
+                            $xObject->getWidth() / self::PDF_LOGO_SCALE,
+                            $xObject->getHeight() / self::PDF_LOGO_SCALE
+                        );
                     }
                 }
 
@@ -263,6 +284,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction
         $text = str_replace('&ndash;', '-', $text);
         $text = str_replace('&#39;', "'", $text);
         $text = str_replace("\n", '', $text);
+        $text = str_replace("\r", '', $text);
         return $text;
     }
 }