Skip to content

Commit 4b6bdb1

Browse files
contactashish13contactashish13
committed
new data source #59 
1 parent 1b86f67 commit 4b6bdb1

File tree

3 files changed

+80
-49
lines changed

3 files changed

+80
-49
lines changed

‎classes/Visualizer/Module/Chart.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ public function renderFlattrScript() {
375375
* @access public
376376
*/
377377
public function uploadData() {
378+
error_log( 'in uploadData ' . print_r( $_GET,true ) . print_r( $_POST,true ) );
378379
// validate nonce
379380
// do not use filter_input as it does not work for phpunit test cases, use filter_var instead
380381
if ( ! isset( $_GET['nonce'] ) || ! wp_verify_nonce( $_GET['nonce'] ) ) {

‎classes/Visualizer/Render/Page/Data.php

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ protected function _renderContent() {
4141
// Added by Ash/Upwork
4242
if ( VISUALIZER_PRO ) {
4343
global $Visualizer_Pro;
44-
$Visualizer_Pro->_addEditor();
44+
$Visualizer_Pro->_addEditor( $this->chart->ID );
45+
$Visualizer_Pro->_addFilterWizard( $this->chart->ID );
4546
}
4647
// Added by Ash/Upwork
4748
echo '<div id="canvas">';
@@ -64,6 +65,7 @@ protected function _renderSidebarContent() {
6465
), admin_url( 'admin-ajax.php' ) );
6566

6667
?>
68+
<span id="visualizer-chart-id" data-id="<?php echo $this->chart->ID;?>"></span>
6769
<iframe id="thehole" name="thehole"></iframe>
6870
<ul class="group-wrapper full-height">
6971
<li class="group group-category open" id="vz-chart-source">
@@ -192,6 +194,21 @@ class="dashicons dashicons-lock"></span></h2>
192194
</div>
193195
</div>
194196
</li>
197+
198+
<li class="group <?php echo apply_filters( 'visualizer_pro_upsell_class','only-pro-feature' ); ?> ">
199+
<h2 class="group-title sub-group"><?php _e( 'Import from Wordpress', 'visualizer' ); ?><span
200+
class="dashicons dashicons-lock"></span></h2>
201+
<div class="group-content edit-data-content">
202+
<div>
203+
<p class="group-description"><?php _e( 'You can import here data from Wordpress', 'visualizer' ); ?></p>
204+
<input type="button" id="filter-chart-button" class="button button-primary "
205+
value="<?php _e( 'Create Filters', 'visualizer' ); ?>" data-current="chart" data-t-filter="<?php _e( 'Show Chart', 'visualizer' );?>" data-t-chart="<?php _e( 'Create Filters', 'visualizer' );?>">
206+
<?php echo apply_filters( 'visualizer_pro_upsell', '' ); ?>
207+
</div>
208+
</div>
209+
</li>
210+
211+
195212
<li class="group <?php echo apply_filters( 'visualizer_pro_upsell_class','only-pro-feature' ); ?>">
196213
<h2 class="group-title sub-group visualizer-editor-tab"
197214
data-current="chart"><?php _e( 'Edit current data', 'visualizer' ); ?><span

‎languages/visualizer.pot

Lines changed: 61 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# This file is distributed under the GPL v2.0 or later.
33
msgid ""
44
msgstr ""
5-
"Project-Id-Version: Visualizer: Charts and Graphs Lite 2.0.0\n"
5+
"Project-Id-Version: Visualizer: Charts and Graphs Lite 2.0.4\n"
66
"Report-Msgid-Bugs-To: https://github.com/Codeinwp/visualizer/issues\n"
7-
"POT-Creation-Date: 2017-04-12 10:19:50+00:00\n"
7+
"POT-Creation-Date: 2017-04-22 16:20:08+00:00\n"
88
"MIME-Version: 1.0\n"
99
"Content-Type: text/plain; charset=utf-8\n"
1010
"Content-Transfer-Encoding: 8bit\n"
@@ -102,7 +102,7 @@ msgid "Pro Addon"
102102
msgstr ""
103103

104104
#: classes/Visualizer/Module/Chart.php:295
105-
#: classes/Visualizer/Module/Chart.php:573
105+
#: classes/Visualizer/Module/Chart.php:574
106106
msgid "You have entered invalid URL. Please, insert proper URL."
107107
msgstr ""
108108

@@ -118,19 +118,19 @@ msgstr ""
118118
msgid "Insert Chart"
119119
msgstr ""
120120

121-
#: classes/Visualizer/Module/Chart.php:407
121+
#: classes/Visualizer/Module/Chart.php:408
122122
msgid "CSV file with chart data was not uploaded. Please, try again."
123123
msgstr ""
124124

125-
#: classes/Visualizer/Module/Chart.php:419
125+
#: classes/Visualizer/Module/Chart.php:420
126126
msgid "CSV file is broken or invalid. Please, try again."
127127
msgstr ""
128128

129-
#: classes/Visualizer/Module/Sources.php:142
130-
msgid "Enable this feature in PRO version!"
129+
#: classes/Visualizer/Module/Sources.php:143
130+
msgid "Enable this feature in %s version!"
131131
msgstr ""
132132

133-
#: classes/Visualizer/Module/Sources.php:143
133+
#: classes/Visualizer/Module/Sources.php:144
134134
msgid "Buy now"
135135
msgstr ""
136136

@@ -148,7 +148,7 @@ msgstr ""
148148
msgid "Search"
149149
msgstr ""
150150

151-
#: classes/Visualizer/Render/Library.php:133
151+
#: classes/Visualizer/Render/Library.php:126
152152
#: classes/Visualizer/Render/Templates.php:85
153153
msgid "No charts found"
154154
msgstr ""
@@ -199,157 +199,170 @@ msgstr ""
199199
msgid "View more features"
200200
msgstr ""
201201

202-
#: classes/Visualizer/Render/Library.php:217
202+
#: classes/Visualizer/Render/Library.php:216
203203
msgid "Enable Tracking"
204204
msgstr ""
205205

206-
#: classes/Visualizer/Render/Library.php:218
206+
#: classes/Visualizer/Render/Library.php:217
207207
msgid ""
208208
"Allow Visualizer to anonymously track how this plugin is used and help us "
209209
"make the plugin better. No sensitive data is tracked."
210210
msgstr ""
211211

212-
#: classes/Visualizer/Render/Page/Data.php:71
212+
#: classes/Visualizer/Render/Page/Data.php:73
213213
msgid "Chart Data"
214214
msgstr ""
215215

216-
#: classes/Visualizer/Render/Page/Data.php:76
216+
#: classes/Visualizer/Render/Page/Data.php:78
217217
msgid "Import data from file"
218218
msgstr ""
219219

220-
#: classes/Visualizer/Render/Page/Data.php:78
220+
#: classes/Visualizer/Render/Page/Data.php:80
221221
msgid ""
222222
"Select and upload your data CSV file here. The first row of the CSV file "
223223
"should contain the column headings. The second one should contain series "
224224
"type (string, number, boolean, date, datetime, timeofday)."
225225
msgstr ""
226226

227-
#: classes/Visualizer/Render/Page/Data.php:79
228-
#: classes/Visualizer/Render/Page/Data.php:99
227+
#: classes/Visualizer/Render/Page/Data.php:81
228+
#: classes/Visualizer/Render/Page/Data.php:101
229229
msgid ""
230230
"If you are unsure about how to format your data CSV then please take a look "
231231
"at this sample: %1$s %2$s%3$s"
232232
msgstr ""
233233

234-
#: classes/Visualizer/Render/Page/Data.php:87
235-
#: classes/Visualizer/Render/Page/Data.php:110
234+
#: classes/Visualizer/Render/Page/Data.php:89
235+
#: classes/Visualizer/Render/Page/Data.php:112
236236
msgid "Import"
237237
msgstr ""
238238

239-
#: classes/Visualizer/Render/Page/Data.php:92
239+
#: classes/Visualizer/Render/Page/Data.php:94
240240
msgid "Import data from URL"
241241
msgstr ""
242242

243-
#: classes/Visualizer/Render/Page/Data.php:95
243+
#: classes/Visualizer/Render/Page/Data.php:97
244244
msgid "One time import"
245245
msgstr ""
246246

247-
#: classes/Visualizer/Render/Page/Data.php:98
247+
#: classes/Visualizer/Render/Page/Data.php:100
248248
msgid ""
249249
"You can use this to import data from a remote CSV file. The first row of "
250250
"the CSV file should contain the column headings. The second one should "
251251
"contain series type (string, number, boolean, date, datetime, timeofday)."
252252
msgstr ""
253253

254-
#: classes/Visualizer/Render/Page/Data.php:100
254+
#: classes/Visualizer/Render/Page/Data.php:102
255255
msgid ""
256256
"You can also import data from Google Spreadsheet, for more info check <a "
257257
"href=\"https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-"
258258
"from-Google-Spreadsheet%3F\" target=\"_blank\" >this</a> tutorial"
259259
msgstr ""
260260

261-
#: classes/Visualizer/Render/Page/Data.php:105
262-
#: classes/Visualizer/Render/Page/Data.php:125
261+
#: classes/Visualizer/Render/Page/Data.php:107
262+
#: classes/Visualizer/Render/Page/Data.php:127
263263
msgid "Please enter the URL of CSV file"
264264
msgstr ""
265265

266-
#: classes/Visualizer/Render/Page/Data.php:115
266+
#: classes/Visualizer/Render/Page/Data.php:117
267267
msgid "Schedule Import"
268268
msgstr ""
269269

270-
#: classes/Visualizer/Render/Page/Data.php:118
270+
#: classes/Visualizer/Render/Page/Data.php:120
271271
msgid "You can choose here to synchronize your chart data with a remote CSV file."
272272
msgstr ""
273273

274-
#: classes/Visualizer/Render/Page/Data.php:119
274+
#: classes/Visualizer/Render/Page/Data.php:121
275275
msgid ""
276276
"You can also synchronize with your Google Spreadsheet file, for more info "
277277
"check <a "
278278
"href=\"https://github.com/Codeinwp/visualizer/wiki/How-can-I-populate-data-"
279279
"from-Google-Spreadsheet%3F\" target=\"_blank\" >this</a> tutorial"
280280
msgstr ""
281281

282-
#: classes/Visualizer/Render/Page/Data.php:120
282+
#: classes/Visualizer/Render/Page/Data.php:122
283283
msgid ""
284284
"We will update the chart data based on your time interval preference by "
285285
"overwritting the current data with the one from the URL."
286286
msgstr ""
287287

288-
#: classes/Visualizer/Render/Page/Data.php:127
288+
#: classes/Visualizer/Render/Page/Data.php:129
289289
msgid "How often do you want to check the url"
290290
msgstr ""
291291

292-
#: classes/Visualizer/Render/Page/Data.php:132
292+
#: classes/Visualizer/Render/Page/Data.php:134
293293
msgid "Each hour"
294294
msgstr ""
295295

296-
#: classes/Visualizer/Render/Page/Data.php:133
296+
#: classes/Visualizer/Render/Page/Data.php:135
297297
msgid "Each 12 hours"
298298
msgstr ""
299299

300-
#: classes/Visualizer/Render/Page/Data.php:134
300+
#: classes/Visualizer/Render/Page/Data.php:136
301301
msgid "Each day"
302302
msgstr ""
303303

304-
#: classes/Visualizer/Render/Page/Data.php:135
304+
#: classes/Visualizer/Render/Page/Data.php:137
305305
msgid "Each 3 days"
306306
msgstr ""
307307

308-
#: classes/Visualizer/Render/Page/Data.php:147
308+
#: classes/Visualizer/Render/Page/Data.php:149
309309
msgid "Save schedule"
310310
msgstr ""
311311

312-
#: classes/Visualizer/Render/Page/Data.php:158
312+
#: classes/Visualizer/Render/Page/Data.php:160
313313
msgid "Import from other chart"
314314
msgstr ""
315315

316-
#: classes/Visualizer/Render/Page/Data.php:162
316+
#: classes/Visualizer/Render/Page/Data.php:164
317317
msgid "You can import here data from your previously created charts"
318318
msgstr ""
319319

320-
#: classes/Visualizer/Render/Page/Data.php:190
320+
#: classes/Visualizer/Render/Page/Data.php:192
321321
msgid "Import Chart"
322322
msgstr ""
323323

324-
#: classes/Visualizer/Render/Page/Data.php:197
325-
msgid "Edit current data"
324+
#: classes/Visualizer/Render/Page/Data.php:199
325+
msgid "Import from Wordpress"
326326
msgstr ""
327327

328-
#: classes/Visualizer/Render/Page/Data.php:205
329-
msgid "You can manually edit the chart data using the spreadsheet like editor."
328+
#: classes/Visualizer/Render/Page/Data.php:203
329+
msgid "You can import here data from Wordpress"
330330
msgstr ""
331331

332-
#: classes/Visualizer/Render/Page/Data.php:207
333-
msgid "View Editor"
332+
#: classes/Visualizer/Render/Page/Data.php:205
333+
msgid "Create Filters"
334334
msgstr ""
335335

336-
#: classes/Visualizer/Render/Page/Data.php:207
336+
#: classes/Visualizer/Render/Page/Data.php:205
337+
#: classes/Visualizer/Render/Page/Data.php:224
337338
msgid "Show Chart"
338339
msgstr ""
339340

340-
#: classes/Visualizer/Render/Page/Data.php:217
341+
#: classes/Visualizer/Render/Page/Data.php:214
342+
msgid "Edit current data"
343+
msgstr ""
344+
345+
#: classes/Visualizer/Render/Page/Data.php:222
346+
msgid "You can manually edit the chart data using the spreadsheet like editor."
347+
msgstr ""
348+
349+
#: classes/Visualizer/Render/Page/Data.php:224
350+
msgid "View Editor"
351+
msgstr ""
352+
353+
#: classes/Visualizer/Render/Page/Data.php:234
341354
msgid "Advanced Settings"
342355
msgstr ""
343356

344-
#: classes/Visualizer/Render/Page/Data.php:220
357+
#: classes/Visualizer/Render/Page/Data.php:237
345358
msgid "Chart Settings"
346359
msgstr ""
347360

348-
#: classes/Visualizer/Render/Page/Data.php:231
361+
#: classes/Visualizer/Render/Page/Data.php:248
349362
msgid "Rate our plugin"
350363
msgstr ""
351364

352-
#: classes/Visualizer/Render/Page/Data.php:250
365+
#: classes/Visualizer/Render/Page/Data.php:267
353366
#: classes/Visualizer/Render/Page/Settings.php:55
354367
msgid "Back"
355368
msgstr ""

0 commit comments

Comments
 (0)