Updates to release v1.3.6

kartik-v · Oct 13, 2018 · 53a58d0 · 53a58d0
1 parent ca14256
commit 53a58d0
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 23 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,12 @@
 Change Log: `yii2-export`
 =========================
 
+## version 1.3.6
+
+**Date:** 13-Oct-2018
+
+- Enhance `ExportWriterPdf` to allow custom formatting
+
 ## version 1.3.5
 
 **Date:** 13-Oct-2018

diff --git a/src/ExportColumnAsset.php b/src/ExportColumnAsset.php
@@ -3,7 +3,7 @@
 /**
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
  * @package yii2-export
- * @version 1.3.5
+ * @version 1.3.6
  */
 
 namespace kartik\export;

diff --git a/src/ExportMenu.php b/src/ExportMenu.php
@@ -4,7 +4,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.5
+ * @version   1.3.6
  */
 
 namespace kartik\export;
@@ -272,7 +272,7 @@ class ExportMenu extends GridView
     public $noExportColumns = [];
 
     /**
-     * @var string the view file for rendering the export form. DEPRECATED since v1.3.4 (not parsed or used anymore).
+     * @var string the view file for rendering the export form. DEPRECATED since v1.3.5 (not parsed or used anymore).
      */
     public $exportFormView = '_form';
 

diff --git a/src/ExportMenuAsset.php b/src/ExportMenuAsset.php
@@ -3,7 +3,7 @@
 /**
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
  * @package yii2-export
- * @version 1.3.5
+ * @version 1.3.6
  */
 
 namespace kartik\export;

diff --git a/src/ExportWriterPdf.php b/src/ExportWriterPdf.php
@@ -3,7 +3,7 @@
 /**
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
  * @package yii2-export
- * @version 1.3.5
+ * @version 1.3.6
  */
 
 namespace kartik\export;
@@ -48,13 +48,14 @@ protected function createExternalWriterInstance($config = [])
      *
      * @throws \PhpOffice\PhpSpreadsheet\Writer\Exception
      * @throws PhpSpreadsheetException
+     * @throws \yii\base\InvalidConfigException
      */
     public function save($pFilename)
     {
         $fileHandle = parent::prepareForSave($pFilename);
 
         //  Default PDF paper size
-        $paperSize = 'LETTER'; // Letter (8.5"x11")
+        $paperSize = Pdf::FORMAT_A4;
 
         //  Check for paper size and page orientation
         if (null === $this->getSheetIndex()) {
@@ -89,25 +90,19 @@ public function save($pFilename)
 
         //  Create PDF
         $pdf = $this->createExternalWriterInstance([
+            'format' => $paperSize,
             'orientation' => $orientation,
             'methods' => [
                 'SetTitle' => $properties->getTitle(),
                 'SetAuthor' => $properties->getCreator(),
                 'SetSubject' => $properties->getSubject(),
                 'SetKeywords' => $properties->getKeywords(),
-                'SetCreator' => $properties->getCreator(),
+                'SetCreator' => $properties->getCreator()
             ],
         ]);
-        $ortmp = $orientation;
-        $lib = $pdf->getApi();
-        /** @noinspection PhpUndefinedMethodInspection */
-        $lib->_setPageSize(strtoupper($paperSize), $ortmp);
-        $lib->DefOrientation = $orientation;
-        /** @noinspection PhpUndefinedMethodInspection */
-        $lib->AddPage($orientation);
         $content = $this->generateHTMLHeader(false) . $this->generateSheetData() . $this->generateHTMLFooter();
         //  Write to file
-        fwrite($fileHandle, $pdf->Output(static::cleanHTML($content), $this->filename, Pdf::DEST_STRING));
+        fwrite($fileHandle, $pdf->output(static::cleanHTML($content), $this->filename, Pdf::DEST_STRING));
         parent::restoreStateAfterSave($fileHandle);
     }
 

diff --git a/src/assets/css/kv-export-columns.css b/src/assets/css/kv-export-columns.css
@@ -2,7 +2,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.5
+ * @version   1.3.6
  *
  * Export Columns Selector Style Sheet
  *

diff --git a/src/assets/css/kv-export-columns.min.css b/src/assets/css/kv-export-columns.min.css
@@ -2,7 +2,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.5
+ * @version   1.3.6
  *
  * Export Columns Selector Style Sheet
  *

diff --git a/src/assets/js/kv-export-columns.js b/src/assets/js/kv-export-columns.js
@@ -2,7 +2,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.5
+ * @version   1.3.6
  *
  * Export Columns Selector Validation Module.
  *

diff --git a/src/assets/js/kv-export-columns.min.js b/src/assets/js/kv-export-columns.min.js
@@ -2,7 +2,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.5
+ * @version   1.3.6
  *
  * Export Columns Selector Validation Module.
  *

diff --git a/src/assets/js/kv-export-data.js b/src/assets/js/kv-export-data.js
@@ -2,7 +2,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.5
+ * @version   1.3.6
  *
  * Export Data Validation Module.
  *

diff --git a/src/assets/js/kv-export-data.min.js b/src/assets/js/kv-export-data.min.js
diff --git a/src/views/_columns.php b/src/views/_columns.php
@@ -3,7 +3,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.5
+ * @version   1.3.6
  * 
  * Column Selector View
  *

diff --git a/src/views/_view.php b/src/views/_view.php
@@ -3,7 +3,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.5
+ * @version   1.3.6
  *
  * Export Submission View
  *