Merge pull request #398 from Codeinwp/3.2.0

Add support to show chart as an HTML table in AMP requests
Add support to show charts from JSON/REST endpoints
Fix loading of Google Visualization javascript files
Add simple editors for editing chart data
Tested up to WP 5.2

Author: contactashish13

CHANGELOG.md

@@ -1,4 +1,16 @@
 
+ ### v3.1.3 - 2019-02-24 
+ **Changes:** 
+ * Fix issue with changing column settings of the last column in table chart
+* Add support for query language to get subset of data from Google Spreadsheet
+* Fix conflict with jquery 3.3.x
+* Migrated PHPExcel to PhpSpreadsheet
+* Front end action 'print' should print the chart and fall back to printing the data
+* Fix issue with table chart not showing in IE
+* Fix issue with multiple instances of same chart not showing
+* Fix issue with date type column does not work with Combo charts
+* Tested with WP 5.1
+ 
  ### v3.1.2 - 2018-12-06 
  **Changes:** 
  * Fix bug "Warning: A non-numeric value encountered"

classes/Visualizer/Module.php

@@ -66,6 +66,7 @@ public function __construct( Visualizer_Plugin $plugin ) {
 
 		$this->_addFilter( Visualizer_Plugin::FILTER_UNDO_REVISIONS, 'undoRevisions', 10, 2 );
 		$this->_addFilter( Visualizer_Plugin::FILTER_HANDLE_REVISIONS, 'handleExistingRevisions', 10, 2 );
+		$this->_addFilter( Visualizer_Plugin::FILTER_GET_CHART_DATA_AS, 'getDataAs', 10, 3 );
 
 	}
 
@@ -147,6 +148,15 @@ protected function _addShortcode( $tag, $method ) {
 		return $this;
 	}
 
+	/**
+	 * A wrapper around the actual function _getDataAs. This function is invoked as a filter.
+	 *
+	 * @since 3.2.0
+	 */
+	public function getDataAs( $final, $chart_id, $type ) {
+		return $this->_getDataAs( $chart_id, $type );
+	}
+
 	/**
 	 * Extracts the data for a chart and prepares it for the given type.
 	 *
@@ -223,14 +233,16 @@ public function _getDataAs( $chart_id, $type ) {
 	private function _getCSV( $rows, $filename ) {
 		$filename .= '.csv';
 
+		$bom = chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF );
 		$fp = tmpfile();
 		// support for MS Excel
-		fprintf( $fp, $bom = ( chr( 0xEF ) . chr( 0xBB ) . chr( 0xBF ) ) );
+		fprintf( $fp, $bom );
 		foreach ( $rows as $row ) {
 			fputcsv( $fp, $row );
 		}
 		rewind( $fp );
 		$csv = '';
+		// phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
 		while ( ( $array = fgetcsv( $fp ) ) !== false ) {
 			if ( strlen( $csv ) > 0 ) {
 				$csv .= PHP_EOL;
@@ -242,6 +254,7 @@ private function _getCSV( $rows, $filename ) {
 		return array(
 			'csv'  => $csv,
 			'name' => $filename,
+			'string' => str_replace( $bom, '', $csv ),
 		);
 	}
 
@@ -280,6 +293,7 @@ private function _getExcel( $rows, $filename ) {
 		return array(
 			'csv'  => 'data:application/vnd.ms-excel;base64,' . base64_encode( $xlsData ),
 			'name' => $filename,
+			'raw' => base64_encode( $xlsData ),
 		);
 	}
 
@@ -311,6 +325,12 @@ private function _getHTML( $rows ) {
 		$table      = '<table class="visualizer-print">';
 		$index      = 0;
 		foreach ( $rows as $row ) {
+			// skip the data type row.
+			if ( 1 === $index ) {
+				$index++;
+				continue;
+			}
+
 			$table  .= '<tr>';
 			foreach ( $row as $col ) {
 				if ( $index === 0 ) {
@@ -432,6 +452,7 @@ protected function get_user_customization_js() {
 		}
 
 		if ( ! $wp_filesystem->exists( $dir ) ) {
+			// phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found
 			if ( ( $done = $wp_filesystem->mkdir( $dir ) ) === false ) {
 				do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to create directory %s', $dir ), 'error', __FILE__, __LINE__ );
 				return $default;
@@ -441,6 +462,7 @@ protected function get_user_customization_js() {
 		// if file does not exist, copy.
 		if ( ! $wp_filesystem->exists( $file ) ) {
 			$src    = str_replace( ABSPATH, $wp_filesystem->abspath(), VISUALIZER_ABSPATH . '/js/customization.js' );
+			// phpcs:ignore WordPress.CodeAnalysis.AssignmentInCondition.Found
 			if ( ( $done = $wp_filesystem->copy( $src, $file ) ) === false ) {
 				do_action( 'themeisle_log_event', Visualizer_Plugin::NAME, sprintf( 'Unable to copy file %s to %s', $src, $file ), 'error', __FILE__, __LINE__ );
 				return $default;

classes/Visualizer/Module/AMP.php

@@ -0,0 +1,78 @@
+<?php
+// +----------------------------------------------------------------------+
+// | Copyright 2013  Madpixels  (email : [email protected])        |
+// +----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify |
+// | it under the terms of the GNU General Public License, version 2, as  |
+// | published by the Free Software Foundation.                           |
+// |                                                                      |
+// | This program is distributed in the hope that it will be useful,      |
+// | but WITHOUT ANY WARRANTY; without even the implied warranty of       |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
+// | GNU General Public License for more details.                         |
+// |                                                                      |
+// | You should have received a copy of the GNU General Public License    |
+// | along with this program; if not, write to the Free Software          |
+// | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,               |
+// | MA 02110-1301 USA                                                    |
+// +----------------------------------------------------------------------+
+// | Author: Eugene Manuilov <[email protected]>                        |
+// +----------------------------------------------------------------------+
+/**
+ * The module for all AMP stuff.
+ *
+ * @category Visualizer
+ * @package Module
+ *
+ * @since 1.0.0
+ */
+class Visualizer_Module_AMP extends Visualizer_Module {
+
+	const NAME = __CLASS__;
+
+	/**
+	 * Constructor.
+	 *
+	 * @since 1.0.0
+	 *
+	 * @access public
+	 *
+	 * @param Visualizer_Plugin $plugin The instance of the plugin.
+	 */
+	public function __construct( Visualizer_Plugin $plugin ) {
+		$this->_addFilter( 'amp_post_template_data', 'addToHeader' );
+	}
+
+	/**
+	 * Add the iframe component to the header.
+	 */
+	public function addToHeader( $data ) {
+		$data['amp_component_scripts'] = array_merge(
+			$data['amp_component_scripts'],
+			array(
+				'amp-iframe' => 'https://cdn.ampproject.org/v0/amp-iframe-latest.js',
+			)
+		);
+		return $data;
+	}
+
+	/**
+	 * Is this an AMP request?
+	 */
+	public static function is_amp() {
+		return function_exists( 'is_amp_endpoint' ) && is_amp_endpoint();
+	}
+
+	/**
+	 * Loads the alterview view of the chart.
+	 */
+	public function get_chart( $chart, $data, $series, $settings ) {
+		$view = apply_filters( 'visualizer_amp_view', null, $chart, $data, $series, $settings );
+		if ( ! is_null( $view ) ) {
+			return $view;
+		}
+		$output = $this->_getDataAs( $chart->ID, 'print' );
+		return $output['csv'];
+	}
+
+}

classes/Visualizer/Module/Admin.php

@@ -706,6 +706,7 @@ public function renderLibraryPage() {
 					),
 				),
 				'page_type' => 'library',
+				'is_front'  => false,
 			)
 		);
 		// render library page