From 0b81c3299d4ed861c22bfdfc2a56899800b08544 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 3 Aug 2017 12:18:36 +0300
Subject: [PATCH] Report export

---
 app/Constants.php                             |  3 +++
 app/Http/Controllers/ReportController.php     |  2 +-
 config/excel.php                              |  3 ++-
 .../views/reports/chart_builder.blade.php     | 22 ++++++++++---------
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/app/Constants.php b/app/Constants.php
index b7747be192e6..08c7851b2907 100644
--- a/app/Constants.php
+++ b/app/Constants.php
@@ -570,6 +570,9 @@ if (! defined('APP_NAME')) {
     ];
     define('CACHED_TABLES', serialize($cachedTables));
 
+    // Fix for mPDF: https://github.com/kartik-v/yii2-mpdf/issues/9
+    define('_MPDF_TTFONTDATAPATH', storage_path('framework/cache/'));
+
     // TODO remove these translation functions
     function uctrans($text)
     {
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 96c26cf01a5b..f0ab3fa7ef30 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -185,7 +185,7 @@ class ReportController extends BaseController
                 $sheet->cells('A1:'.Utils::num2alpha(count($columns_labeled)-1).'1', function($cells) {
                     $cells->setBackground('#777777');
                     $cells->setFontColor('#FFFFFF');
-                    $cells->setFontSize(14);
+                    $cells->setFontSize(13);
                     $cells->setFontFamily('Calibri');
                     $cells->setFontWeight('bold');
                 });
diff --git a/config/excel.php b/config/excel.php
index 8a480ff8dd93..34f170155660 100644
--- a/config/excel.php
+++ b/config/excel.php
@@ -1,4 +1,5 @@
 <?php
+
 //https://github.com/PHPOffice/PHPExcel/issues/556#issuecomment-216722159
 switch (PHP_OS) {
     case 'WINNT':
@@ -323,7 +324,7 @@ return array(
                 |--------------------------------------------------------------------------
                 */
                 'DomPDF' => array(
-                    'path' => base_path('vendor/dompdf/dompdf/')
+                    'path' => base_path('vendor/dompdf/dompdf/'),
                 ),
 
                 /*
diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php
index 1cc1450d0826..c007a799ac30 100644
--- a/resources/views/reports/chart_builder.blade.php
+++ b/resources/views/reports/chart_builder.blade.php
@@ -78,7 +78,8 @@
     {!! Former::open()->addClass('report-form')->rules(['start_date' => 'required', 'end_date' => 'required']) !!}
 
     <div style="display:none">
-    {!! Former::text('action') !!}
+    	{!! Former::text('action') !!}
+		{!! Former::text('format') !!}
     </div>
 
     {!! Former::populateField('start_date', $startDate) !!}
@@ -157,13 +158,13 @@
 
 
 	<center>
-		{!! Former::select('format')
-				 ->label(trans('texts.format_export'))
-				 ->options(['csv' => 'CSV', 'pdf' => 'PDF', 'xlsx' => 'Excel']) !!}
-		{!! Button::primary(trans('texts.export'))
-				->withAttributes(array('onclick' => 'onExportClick()'))
-				->appendIcon(Icon::create('export'))
-				->large() !!}
+		{!! DropdownButton::primary(trans('texts.export'))
+			  ->large()
+              ->withContents([
+				  ['url' => 'javascript:onExportClick("csv")', 'label' => 'CSV'],
+				  ['url' => 'javascript:onExportClick("xlsx")', 'label' => 'XLSX'],
+				  ['url' => 'javascript:onExportClick("pdf")', 'label' => 'PDF'],
+              ]) !!}
 		{!! Button::success(trans('texts.run'))
 				->withAttributes(array('id' => 'submitButton'))
 				->submit()
@@ -256,8 +257,9 @@
 
 	<script type="text/javascript">
 
-    function onExportClick() {
+    function onExportClick(format) {
         $('#action').val('export');
+		$('#format').val(format);
         $('#submitButton').click();
         $('#action').val('');
     }
@@ -368,4 +370,4 @@
 		keyboardNavigation: false
 	});
 
-@stop
\ No newline at end of file
+@stop