add tracking data #77

Author: contactashish13

classes/Visualizer/Module/Admin.php

@@ -59,6 +59,7 @@ public function __construct( Visualizer_Plugin $plugin ) {
 		$this->_addFilter( 'media_view_strings', 'setupMediaViewStrings' );
 		$this->_addFilter( 'plugin_action_links', 'getPluginActionLinks', 10, 2 );
 		$this->_addFilter( 'visualizer_logger_data', 'getLoggerData' );
+		$this->_addFilter( 'visualizer_get_chart_counts', 'getChartCountsByTypeAndMeta' );
 	}
 
 	/**
@@ -69,31 +70,44 @@ public function __construct( Visualizer_Plugin $plugin ) {
 	 * @access public
 	 */
 	public function getLoggerData( $data ) {
-		return array(
-			'chart_types'       => $this->getChartTypesAndCounts(),
-			'wordpress_filters' => '',
-		);
+		return $this->getChartCountsByTypeAndMeta();
 	}
 
 	/**
 	 * Fetches the types of charts created and their counts.
 	 *
+	 * @param array $meta_keys An array of name vs. meta keys - to return how many charts have these keys.
 	 * @access private
 	 */
-	private function getChartTypesAndCounts() {
-		$charts     = array();
+	public function getChartCountsByTypeAndMeta( $meta_keys = array() ) {
+		$charts					= array();
+		$charts['chart_types']	= array();
 		// the initial query arguments to fetch charts
 		$query_args = array(
 			'post_type'         => Visualizer_Plugin::CPT_VISUALIZER,
 			'posts_per_page'    => 300,
 			'fields'            => 'ids',
+			'no_rows_found'		=> false,
+			'update_post_meta_cache' => false,
+			'update_post_term_cache' => false,
+
 		);
 
 		$query  = new WP_Query( $query_args );
 		while ( $query->have_posts() ) {
 			$chart_id   = $query->next_post();
 			$type       = get_post_meta( $chart_id, Visualizer_Plugin::CF_CHART_TYPE, true );
-			$charts[ $type ]    = isset( $charts[ $type ] ) ? $charts[ $type ] + 1 : 1;
+			$charts['chart_types'][ $type ]    = isset( $charts['chart_types'][ $type ] ) ? $charts['chart_types'][ $type ] + 1 : 1;
+			if ( ! empty( $meta_keys ) ) {
+				foreach ( $meta_keys as $name => $key ) {
+					$data	= get_post_meta( $chart_id, $key, true );
+					if ( ! empty( $data ) ) {
+						$charts[ $name ] = isset( $charts[ $name ] ) ? $charts[ $name ] + 1 : 1;
+					} else {
+						$charts[ $name ] = 0;
+					}
+				}
+			}
 		}
 		return $charts;
 	}

classes/Visualizer/Module/Chart.php

@@ -412,6 +412,12 @@ public function uploadData() {
 		if ( ! isset( $_POST['vz-import-time'] ) ) {
 			apply_filters( 'visualizer_pro_remove_schedule', $chart_id );
 		}
+
+		if ( ! isset( $_POST['chart_data_src'] ) || Visualizer_Plugin::CF_SOURCE_FILTER !== $_POST['chart_data_src'] ) {
+			// delete the filters in case this chart is being uploaded from other data sources
+			delete_post_meta( $chart_id, 'visualizer-filter-config' );
+		}
+
 		$source = null;
 		$render = new Visualizer_Render_Page_Update();
 		if ( isset( $_POST['remote_data'] ) && filter_var( $_POST['remote_data'], FILTER_VALIDATE_URL ) ) {

classes/Visualizer/Plugin.php

@@ -40,6 +40,8 @@ class Visualizer_Plugin {
 	const CF_DEFAULT_DATA = 'visualizer-default-data';
 	const CF_SETTINGS = 'visualizer-settings';
 
+	const CF_SOURCE_FILTER = 'visualizer-source-filter';
+
 	// custom actions
 	const ACTION_GET_CHARTS = 'visualizer-get-charts';
 	const ACTION_CREATE_CHART = 'visualizer-create-chart';

classes/Visualizer/Render/Page/Data.php

@@ -222,6 +222,7 @@ class="dashicons dashicons-lock"></span></h2>
 										class="dashicons dashicons-lock"></span></h2>
 							<form id="editor-form" action="<?php echo $upload_link; ?>" method="post" target="thehole">
 								<input type="hidden" id="chart-data" name="chart_data">
+								<input type="hidden" id="chart-data-src" name="chart_data_src">
 							</form>
 
 							<div class="group-content edit-data-content">