← All changes | classes/Visualizer/Render/Page/Data.php +152 -28 3.0.8 → 3.1.3 View file →

		@@ -43,13 +43,19 @@
43	43	$Visualizer_Pro->_addEditor( $this->chart->ID );
44	44	if ( method_exists( $Visualizer_Pro, '_addFilterWizard' ) ) {
45	45	$Visualizer_Pro->_addFilterWizard( $this->chart->ID );
46	46	}
	47	+ } else {
	48	+ Visualizer_Render_Layout::show( 'faux-editor' );
47	49	}
	50	+
	51	+ $this->add_additional_content();
	52	+
48	53	// Added by Ash/Upwork
49	54	echo '<div id="canvas">';
50	55	echo '<img src="', VISUALIZER_ABSURL, 'images/ajax-loader.gif" class="loader">';
51	56	echo '</div>';
	57	+ echo $this->custom_css;
52	58	}
53	59
54	60	/**
55	61	* Renders sidebar content.
		@@ -63,12 +69,23 @@
63	69	array(
64	70	'action' => Visualizer_Plugin::ACTION_UPLOAD_DATA,
65	71	'nonce' => wp_create_nonce(),
66	72	'chart' => $this->chart->ID,
67		- ), admin_url( 'admin-ajax.php' )
	73	+ ),
	74	+ admin_url( 'admin-ajax.php' )
68	75	);
	76	+
	77	+ // this will allow us to open the correct source tab by default.
	78	+ $source_of_chart = strtolower( get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_SOURCE, true ) );
	79	+ // both import from wp and import from db have the same source so we need to differentiate.
	80	+ $filter_config = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_FILTER_CONFIG, true );
	81	+ // if filter config is present, then its import from wp.
	82	+ if ( ! empty( $filter_config ) ) {
	83	+ $source_of_chart .= '_wp';
	84	+ }
	85	+ $type = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_CHART_TYPE, true );
69	86	?>
70		- <span id="visualizer-chart-id" data-id="<?php echo $this->chart->ID; ?>"></span>
	87	+ <span id="visualizer-chart-id" data-id="<?php echo $this->chart->ID; ?>" data-chart-source="<?php echo $source_of_chart; ?>" data-chart-type="<?php echo $type; ?>"></span>
71	88	<iframe id="thehole" name="thehole"></iframe>
72	89	<ul class="viz-group-wrapper full-height">
73	90	<li class="viz-group viz-group-category open" id="vz-chart-source">
74	91	<div class="viz-group-header">
		@@ -75,9 +92,9 @@
75	92	<h2 class="viz-group-title viz-main-group"><?php _e( 'Chart Data', 'visualizer' ); ?></h2>
76	93	</div>
77	94	<ul class="viz-group-content">
78	95	<ul class="viz-group-wrapper">
79		- <li class="viz-group">
	96	+ <li class="viz-group visualizer_source_csv">
80	97	<h2 class="viz-group-title viz-sub-group visualizer-src-tab"><?php _e( 'Import data from file', 'visualizer' ); ?></h2>
81	98	<div class="viz-group-content">
82	99	<p class="viz-group-description"><?php esc_html_e( 'Select and upload your data CSV file here. The first row of the CSV file should contain the column headings. The second one should contain series type (string, number, boolean, date, datetime, timeofday).', 'visualizer' ); ?></p>
83	100	<p class="viz-group-description"><?php echo sprintf( __( 'If you are unsure about how to format your data CSV then please take a look at this sample: %1$s %2$s%3$s', 'visualizer' ), '<a href="' . VISUALIZER_ABSURL . 'samples/' . $this->type . '.csv" target="_blank">', $this->type, '.csv</a>' ); ?></p>
		@@ -91,9 +108,9 @@
91	108	value="<?php _e( 'Import', 'visualizer' ); ?>">
92	109	</form>
93	110	</div>
94	111	</li>
95		- <li class="viz-group visualizer-import-url">
	112	+ <li class="viz-group visualizer-import-url visualizer_source_csv_remote">
96	113	<h2 class="viz-group-title viz-sub-group visualizer-src-tab"><?php _e( 'Import data from URL', 'visualizer' ); ?></h2>
97	114	<ul class="viz-group-content">
98	115	<li class="viz-subsection">
99	116	<span class="viz-section-title"><?php _e( 'One time import', 'visualizer' ); ?></span>
		@@ -100,9 +117,9 @@
100	117
101	118	<div class="viz-section-items section-items">
102	119	<p class="viz-group-description"><?php _e( 'You can use this to import data from a remote CSV file. The first row of the CSV file should contain the column headings. The second one should contain series type (string, number, boolean, date, datetime, timeofday).', 'visualizer' ); ?> </p>
103	120	<p class="viz-group-description"><?php echo sprintf( __( 'If you are unsure about how to format your data CSV then please take a look at this sample: %1$s %2$s%3$s', 'visualizer' ), '<a href="' . VISUALIZER_ABSURL . 'samples/' . $this->type . '.csv" target="_blank">', $this->type, '.csv</a>' ); ?></p>
104		- <p class="viz-group-description"> <?php _e( 'You can also import data from Google Spreadsheet, for more info check <a href="https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
	121	+ <p class="viz-group-description"> <?php _e( 'You can also import data from Google Spreadsheet, for more info check <a href="https://docs.themeisle.com/article/607-how-can-i-populate-data-from-google-spreadsheet" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
105	122	<form id="vz-one-time-import" action="<?php echo $upload_link; ?>" method="post"
106	123	target="thehole" enctype="multipart/form-data">
107	124	<div class="remote-file-section">
108	125	<input type="url" id="remote-data" name="remote_data"
		@@ -120,10 +137,10 @@
120	137	<span
121	138	class="dashicons dashicons-lock"></span></span>
122	139	<div class="viz-section-items section-items">
123	140	<p class="viz-group-description"><?php _e( 'You can choose here to synchronize your chart data with a remote CSV file.', 'visualizer' ); ?> </p>
124		- <p class="viz-group-description"> <?php _e( 'You can also synchronize with your Google Spreadsheet file, for more info check <a href="https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-from-Google-Spreadsheet%3F" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
125		- <p class="viz-group-description"> <?php _e( 'We will update the chart data based on your time interval preference by overwritting the current data with the one from the URL.', 'visualizer' ); ?></p>
	141	+ <p class="viz-group-description"> <?php _e( 'You can also synchronize with your Google Spreadsheet file, for more info check <a href="https://docs.themeisle.com/article/607-how-can-i-populate-data-from-google-spreadsheet" target="_blank" >this</a> tutorial', 'visualizer' ); ?></p>
	142	+ <p class="viz-group-description"> <?php _e( 'We will update the chart data based on your time interval preference by overwriting the current data with the one from the URL.', 'visualizer' ); ?></p>
126	143	<form id="vz-schedule-import" action="<?php echo $upload_link; ?>" method="post"
127	144	target="thehole" enctype="multipart/form-data">
128	145	<div class="remote-file-section">
129	146	<input type="url" id="vz-schedule-url" name="remote_data"
		@@ -134,13 +151,15 @@
134	151	<select name="vz-import-time" id="vz-import-time"
135	152	class="visualizer-select">
136	153	<?php
137	154	$hours = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_CHART_SCHEDULE, true );
138		- $schedules = array(
139		- '1' => __( 'Each hour', 'visualizer' ),
140		- '12' => __( 'Each 12 hours', 'visualizer' ),
141		- '24' => __( 'Each day', 'visualizer' ),
142		- '36' => __( 'Each 3 days', 'visualizer' ),
	155	+ $schedules = apply_filters(
	156	+ 'visualizer_chart_schedules', array(
	157	+ '1' => __( 'Each hour', 'visualizer' ),
	158	+ '12' => __( 'Each 12 hours', 'visualizer' ),
	159	+ '24' => __( 'Each day', 'visualizer' ),
	160	+ '72' => __( 'Each 3 days', 'visualizer' ),
	161	+ )
143	162	);
144	163	foreach ( $schedules as $num => $name ) {
145	164	$extra = $num == $hours ? 'selected' : '';
146	165	?>
		@@ -172,9 +191,10 @@
172	191	$fetch_link = add_query_arg(
173	192	array(
174	193	'action' => ( VISUALIZER_PRO ) ? Visualizer_Pro::ACTION_FETCH_DATA : '',
175	194	'nonce' => wp_create_nonce(),
176		- ), admin_url( 'admin-ajax.php' )
	195	+ ),
	196	+ admin_url( 'admin-ajax.php' )
177	197	);
178	198	$query_args_charts = array(
179	199	'post_type' => Visualizer_Plugin::CPT_VISUALIZER,
180	200	'posts_per_page' => 300,
		@@ -200,18 +220,51 @@
200	220	</div>
201	221	</div>
202	222	</li>
203	223
204		- <li class="viz-group <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'schedule-chart' ); ?> ">
	224	+ <?php
	225	+ $save_filter = add_query_arg(
	226	+ array(
	227	+ 'action' => Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY,
	228	+ 'security' => wp_create_nonce( Visualizer_Plugin::ACTION_SAVE_FILTER_QUERY . Visualizer_Plugin::VERSION ),
	229	+ 'chart' => $this->chart->ID,
	230	+ ), admin_url( 'admin-ajax.php' )
	231	+ );
	232	+ ?>
	233	+ <li class="viz-group visualizer_source_query_wp <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'schedule-chart' ); ?> ">
205	234	<h2 class="viz-group-title viz-sub-group"><?php _e( 'Import from WordPress', 'visualizer' ); ?><span
206	235	class="dashicons dashicons-lock"></span></h2>
207	236	<div class="viz-group-content edit-data-content">
208	237	<div>
209		- <p class="viz-group-description"><?php _e( 'You can import here data from WordPress', 'visualizer' ); ?></p>
210		- <input type="button" id="filter-chart-button" class="button button-primary "
211		- value="<?php _e( 'Create Filters', 'visualizer' ); ?>" data-current="chart"
212		- data-t-filter="<?php _e( 'Show Chart', 'visualizer' ); ?>"
213		- data-t-chart="<?php _e( 'Create Filters', 'visualizer' ); ?>">
	238	+ <p class="viz-group-description"><?php _e( 'You can import data from WordPress here.', 'visualizer' ); ?></p>
	239	+ <form id="vz-filter-wizard" action="<?php echo $save_filter; ?>" method="post" target="thehole">
	240	+ <p class="viz-group-description"><?php _e( 'How often do you want to refresh the data from WordPress.', 'visualizer' ); ?></p>
	241	+ <select name="refresh" id="vz-filter-import-time" class="visualizer-select">
	242	+ <?php
	243	+ $bttn_label = 'visualizer_source_query_wp' === $source_of_chart ? __( 'Modify Filter', 'visualizer' ) : __( 'Create Filter', 'visualizer' );
	244	+ $hours = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_SCHEDULE, true );
	245	+ $schedules = apply_filters(
	246	+ 'visualizer_schedules', array(
	247	+ '0' => __( 'Live', 'visualizer' ),
	248	+ '1' => __( 'Each hour', 'visualizer' ),
	249	+ '12' => __( 'Each 12 hours', 'visualizer' ),
	250	+ '24' => __( 'Each day', 'visualizer' ),
	251	+ '72' => __( 'Each 3 days', 'visualizer' ),
	252	+ )
	253	+ );
	254	+ foreach ( $schedules as $num => $name ) {
	255	+ $extra = $num == $hours ? 'selected' : '';
	256	+ ?>
	257	+ <option value="<?php echo $num; ?>" <?php echo $extra; ?>><?php echo $name; ?></option>
	258	+ <?php
	259	+ }
	260	+ ?>
	261	+ </select>
	262	+
	263	+ <input type="button" id="filter-chart-button" class="button button-secondary" value="<?php echo $bttn_label; ?>" data-current="chart" data-t-filter="<?php _e( 'Show Chart', 'visualizer' ); ?>" data-t-chart="<?php echo $bttn_label; ?>">
	264	+ <input type="button" id="db-filter-save-button" class="button button-primary" value="<?php _e( 'Save Schedule', 'visualizer' ); ?>">
	265	+ <?php echo apply_filters( 'visualizer_pro_upsell', '', 'db-query' ); ?>
	266	+ </form>
214	267	<?php echo apply_filters( 'visualizer_pro_upsell', '', 'schedule-chart' ); ?>
215	268	</div>
216	269	</div>
217	270	</li>
		@@ -216,12 +269,60 @@
216	269	</div>
217	270	</li>
218	271
219	272	<?php
220		- // we will auto-open the manual data feature but only when pro is active.
	273	+ $save_query = add_query_arg(
	274	+ array(
	275	+ 'action' => Visualizer_Plugin::ACTION_SAVE_DB_QUERY,
	276	+ 'security' => wp_create_nonce( Visualizer_Plugin::ACTION_SAVE_DB_QUERY . Visualizer_Plugin::VERSION ),
	277	+ 'chart' => $this->chart->ID,
	278	+ ), admin_url( 'admin-ajax.php' )
	279	+ );
	280	+ ?>
	281	+ <li class="viz-group visualizer_source_query <?php echo apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'db-query' ); ?>">
	282	+ <h2 class="viz-group-title viz-sub-group"><?php _e( 'Import from database', 'visualizer' ); ?><span
	283	+ class="dashicons dashicons-lock"></span></h2>
	284	+ <div class="viz-group-content edit-data-content">
	285	+ <div>
	286	+ <p class="viz-group-description"><?php _e( 'You can import data from the database here.', 'visualizer' ); ?></p>
	287	+ <form id="vz-db-wizard" action="<?php echo $save_query; ?>" method="post" target="thehole">
	288	+ <p class="viz-group-description"><?php _e( 'How often do you want to refresh the data from the database.', 'visualizer' ); ?></p>
	289	+ <select name="refresh" id="vz-db-import-time" class="visualizer-select">
	290	+ <?php
	291	+ $bttn_label = 'visualizer_source_query' === $source_of_chart ? __( 'Modify Query', 'visualizer' ) : __( 'Create Query', 'visualizer' );
	292	+ $hours = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_SCHEDULE, true );
	293	+ $schedules = apply_filters(
	294	+ 'visualizer_schedules', array(
	295	+ '0' => __( 'Live', 'visualizer' ),
	296	+ '1' => __( 'Each hour', 'visualizer' ),
	297	+ '12' => __( 'Each 12 hours', 'visualizer' ),
	298	+ '24' => __( 'Each day', 'visualizer' ),
	299	+ '72' => __( 'Each 3 days', 'visualizer' ),
	300	+ )
	301	+ );
	302	+ foreach ( $schedules as $num => $name ) {
	303	+ $extra = $num == $hours ? 'selected' : '';
	304	+ ?>
	305	+ <option value="<?php echo $num; ?>" <?php echo $extra; ?>><?php echo $name; ?></option>
	306	+ <?php
	307	+ }
	308	+ ?>
	309	+ </select>
	310	+ <input type="hidden" name="params" id="viz-db-wizard-params">
	311	+
	312	+ <input type="button" id="db-chart-button" class="button button-secondary" value="<?php echo $bttn_label; ?>" data-current="chart" data-t-filter="<?php _e( 'Show Chart', 'visualizer' ); ?>" data-t-chart="<?php echo $bttn_label; ?>">
	313	+ <input type="button" id="db-chart-save-button" class="button button-primary" value="<?php _e( 'Save Schedule', 'visualizer' ); ?>">
	314	+ <?php echo apply_filters( 'visualizer_pro_upsell', '', 'db-query' ); ?>
	315	+ </form>
	316	+ </div>
	317	+ </div>
	318	+ </li>
	319	+
	320	+ <?php
	321	+ // we will auto-open the manual data feature but only when pro is active and source is empty.
221	322	$pro_class = apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature' );
222	323	?>
223		- <li class="viz-group <?php echo $pro_class; ?> <?php echo empty( $pro_class ) ? 'open' : ''; ?> ">
	324	+ <li class="viz-group <?php echo $pro_class; ?> <?php echo empty( $source_of_chart ) && empty( $pro_class ) ? 'open' : ''; ?> ">
224	325	<h2 class="viz-group-title viz-sub-group visualizer-editor-tab"
225	326	data-current="chart"><?php _e( 'Manual Data', 'visualizer' ); ?><span
226	327	class="dashicons dashicons-lock"></span></h2>
227	328	<form id="editor-form" action="<?php echo $upload_link; ?>" method="post" target="thehole">
		@@ -261,8 +362,12 @@
261	362	</form>
262	363	</ul>
263	364	</li>
264	365
	366	+ <li class="viz-group viz-group-category bottom-fixed sidebar-footer-link" id="vz-chart-docs">
	367	+ <h2><span class="dashicons dashicons-editor-help"></span><a href="https://docs.themeisle.com/category/657-visualizer" target="_blank"><?php _e( 'Docs', 'visualizer' ); ?></a></h2>
	368	+ </li>
	369	+
265	370	<?php $this->getPermissionsLink( $this->chart->ID ); ?>
266	371
267	372	<li class="viz-group bottom-fixed" id="vz-chart-copyright">Visualizer &copy; <?php echo date( 'Y', current_time( 'timestamp' ) ); ?></li>
268	373	</ul>
		@@ -282,9 +387,9 @@
282	387	foreach ( $permissions as $k => $v ) {
283	388	$this->$k = $v;
284	389	}
285	390	}
286		-?>
	391	+ ?>
287	392	<li class="viz-group viz-group-category bottom-fixed sidebar-footer-link" id="vz-chart-permissions">
288	393	<h2><span class="dashicons dashicons-admin-users"></span><?php _e( 'Permissions', 'visualizer' ); ?></h2>
289	394	<div class="viz-group-header">
290	395	<button class="customize-section-back" tabindex="0"></button>
		@@ -296,17 +401,18 @@
296	401	echo add_query_arg(
297	402	array(
298	403	'nonce' => wp_create_nonce(),
299	404	'tab' => 'permissions',
300		- ), remove_query_arg( 'tab', $_SERVER['REQUEST_URI'] )
	405	+ ),
	406	+ remove_query_arg( 'tab', $_SERVER['REQUEST_URI'] )
301	407	);
302		-?>
	408	+ ?>
303	409	" method="post">
304	410	<?php $this->permissionsSidebar(); ?>
305	411	</form>
306	412	</ul>
307	413	</li>
308		-<?php
	414	+ <?php
309	415	}
310	416
311	417	/**
312	418	* Generates the permissions form.
		@@ -319,9 +425,11 @@
319	425	return;
320	426	}
321	427	Visualizer_Render_Sidebar::_renderGroupStart(
322	428	esc_html__( 'Who can see this chart?', 'visualizer' ) . '<span
323		- class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' )
	429	+ class="dashicons dashicons-lock"></span>',
	430	+ '',
	431	+ apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' )
324	432	);
325	433	Visualizer_Render_Sidebar::_renderSectionStart();
326	434	Visualizer_Render_Sidebar::_renderSectionDescription( esc_html__( 'Select who can view the chart on the front-end.', 'visualizer' ) );
327	435
		@@ -361,9 +469,11 @@
361	469	Visualizer_Render_Sidebar::_renderGroupEnd();
362	470
363	471	Visualizer_Render_Sidebar::_renderGroupStart(
364	472	esc_html__( 'Who can edit this chart?', 'visualizer' ) . '<span
365		- class="dashicons dashicons-lock"></span>', '', apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' )
	473	+ class="dashicons dashicons-lock"></span>',
	474	+ '',
	475	+ apply_filters( 'visualizer_pro_upsell_class', 'only-pro-feature', 'chart-permissions' )
366	476	);
367	477	Visualizer_Render_Sidebar::_renderSectionStart();
368	478	Visualizer_Render_Sidebar::_renderSectionDescription( esc_html__( 'Select who can edit the chart on the front-end.', 'visualizer' ) );
369	479
		@@ -423,9 +533,23 @@
423	533	echo '</div>';
424	534	}
425	535	echo '<input type="submit" id="settings-button" class="button button-primary button-large push-right" value="', $this->button, '">';
426	536	if ( isset( $this->cancel_button ) ) {
427		- echo '<input type="submit" id="cancel-button" class="button button-secondary button-large push-right" value="', $this->cancel_button, '">';
	537	+ echo '<input type="submit" id="cancel-button" class="button button-secondary button-large push-left" value="', $this->cancel_button, '">';
428	538	}
	539	+ }
	540	+
	541	+ /**
	542	+ * Renders the additional content.
	543	+ *
	544	+ * @access private
	545	+ */
	546	+ private function add_additional_content() {
	547	+ $source = strtolower( get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_SOURCE, true ) );
	548	+ $query = '';
	549	+ if ( 'visualizer_source_query' === $source ) {
	550	+ $query = get_post_meta( $this->chart->ID, Visualizer_Plugin::CF_DB_QUERY, true );
	551	+ }
	552	+ Visualizer_Render_Layout::show( 'db-query', $query );
429	553	}
430	554
431	555	}