← All changes | js/render-google.js +39 -285 3.10.1 → 3.2.0 View file →

		@@ -3,9 +3,8 @@
3	3	/* global console */
4	4
5	5	// this will store the images for each chart rendered.
6	6	var __visualizer_chart_images = [];
7		-var chartWrapperError = [];
8	7
9	8	(function($) {
10	9	var gv;
11	10	var all_charts, objects;
		@@ -12,39 +11,14 @@
12	11	// so that we know which charts belong to our library.
13	12	var rendered_charts = [];
14	13
15	14	function renderChart(id) {
16		- var chart = all_charts[id];
17		- var hasAnnotation = false;
18		-
19		- // re-render the chart only if it doesn't have annotations and it is on the front-end
20		- // this is to prevent the chart from showing "All series on a given axis must be of the same data type" during resize.
21		- // remember, some charts do not support annotations so they should not be included in this.
22		- var no_annotation_charts = ['tabular', 'timeline', 'gauge', 'geo', 'bubble', 'candlestick'];
23		- if ( undefined !== chart.settings && undefined !== chart.settings.series && undefined === chart.settings.series.length ) {
24		- var chartSeries = [];
25		- var chartSeriesValue = Object.values( chart.settings.series );
26		- $.each( Object.keys( chart.settings.series ), function( index, element ) {
27		- chartSeries[element] = chartSeriesValue[index];
28		- } );
29		- chart.settings.series = chartSeries;
30		- }
31		- if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined' && ! no_annotation_charts.includes(chart.type) ) {
32		- hasAnnotation = chart.series.length - chart.settings.series.length > 1;
33		- }
34		-
35		- if(! hasAnnotation){
36		- renderSpecificChart(id, all_charts[id]);
37		- }
	15	+ renderSpecificChart(id, all_charts[id]);
38	16	}
39	17
40	18	function renderSpecificChart(id, chart) {
41	19	var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter;
42	20
43		- if ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader)' ).length > 0 ) ) {
44		- return;
45		- }
46		-
47	21	if(chart.library !== 'google'){
48	22	return;
49	23	}
50	24	rendered_charts[id] = 'yes';
		@@ -61,11 +35,8 @@
61	35
62	36	render = objects[id] || null;
63	37	if (!render) {
64	38	switch (chart.type) {
65		- case "tabular":
66		- render = "Table";
67		- break;
68	39	case "gauge":
69	40	case "table":
70	41	case "timeline":
71	42	render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1);
		@@ -74,43 +45,9 @@
74	45	render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1) + 'Chart';
75	46	break;
76	47	}
77	48
78		- var controlWrapperElement = document.getElementById( "control_wrapper_" + id ) || null;
79		- var withControlMode = ( typeof settings.controls !== 'undefined' && '' !== settings.controls.controlType ) && controlWrapperElement ? true : false;
80		-
81		- if ( $( controlWrapperElement ).hasClass( 'no-filter' ) ) {
82		- withControlMode = false;
83		- }
84		- if ( withControlMode ) {
85		- // Chart wrapper.
86		- render = new gv.ChartWrapper({
87		- 'chartType': render,
88		- 'containerId': id,
89		- });
90		- // Chart dashboard wrapper.
91		- var chartWrapperElement = document.getElementById( "chart_wrapper_" + id ) || null;
92		- var chartWrapper = new gv.Dashboard( chartWrapperElement );
93		-
94		- // Error Handler.
95		- gv.events.addListener(chartWrapper, 'error', function ( err ) {
96		- if ( chartWrapperError.length === 0 ) {
97		- chartWrapperError.push( err );
98		- gv.errors.removeError( err.id );
99		- var chartContainer = $( chartWrapperElement ).find( '.visualizer-front' );
100		- if ( chartContainer && chartContainer.is(':visible')) {
101		- if (chartContainer.parents('div').next( '#sidebar' ).length === 0) {
102		- chartContainer.addClass( 'visualizer-chart-loaded' ).addClass( 'visualizer-cw-error' );
103		- $( chartWrapperElement ).addClass( 'visualizer-cw-error' );
104		- }
105		- }
106		- } else {
107		- gv.errors.removeError( err.id );
108		- }
109		- } );
110		- } else {
111		- render = new gv[render](container);
112		- }
	49	+ render = new gv[render](container);
113	50	}
114	51
115	52	if (settings['animation'] && parseInt(settings['animation']['startup']) === 1)
116	53	{
		@@ -117,47 +54,8 @@
117	54	settings['animation']['startup'] = true;
118	55	settings['animation']['duration'] = parseInt(settings['animation']['duration']);
119	56	}
120	57
121		- // mark roles for series that have specified a role
122		- // and then remove them from future processing
123		- // and also adjust the indices of the series array so that
124		- // the ones with a role are ignored
125		- // e.g. if there are 6 columns (0-5) out of which 1, 3 and 5 are annotations
126		- // the final series will only include 0, 2, 4 (reindexed as 0, 1, 2)
127		-
128		- // this will capture all the series indexes that became annotations.
129		- var series_annotations = [];
130		- if (settings.series) {
131		- var adjusted_series = [];
132		- for (i = 0; i < settings.series.length; i++) {
133		- if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
134		- continue;
135		- }
136		- if(typeof settings.series[i].role !== 'undefined'){
137		- table.setColumnProperty(i + 1, 'role', settings.series[i].role);
138		- if(settings.series[i].role === '') {
139		- adjusted_series.push(settings.series[i]);
140		- }else{
141		- series_annotations.push(i);
142		- }
143		- }
144		- }
145		- if(adjusted_series.length > 0){
146		- settings.series = adjusted_series;
147		- }
148		- }
149		-
150		- if ( settings['explorer_enabled'] && settings['explorer_enabled'] == 'true' ) { // jshint ignore:line
151		- var $explorer = {};
152		- $explorer['keepInBounds'] = true;
153		-
154		- if ( settings['explorer_actions'] ) {
155		- $explorer['actions'] = settings['explorer_actions'];
156		- }
157		- settings['explorer'] = $explorer;
158		- }
159		-
160	58	switch (chart.type) {
161	59	case 'pie':
162	60	if (settings.slices) {
163	61	for (i in settings.slices) {
		@@ -191,9 +89,8 @@
191	89	settings['region'] = 'world';
192	90	}
193	91	break;
194	92	case 'table':
195		- case 'tabular':
196	93	if (parseInt(settings['pagination']) !== 1)
197	94	{
198	95	delete settings['pageSize'];
199	96	}
		@@ -199,13 +96,10 @@
199	96	}
200	97	break;
201	98	case 'gauge':
202	99	break;
203		- case 'bubble':
204		- settings.sortBubblesBySize = settings.sortBubblesBySize ? settings.sortBubblesBySize == 1 : false; // jshint ignore:line
205		- break;
206	100	case 'timeline':
207		- settings['timeline'] = {};
	101	+ settings['timeline'] = [];
208	102	settings['timeline']['groupByRowLabel'] = settings['groupByRowLabel'] ? true : false;
209	103	settings['timeline']['colorByRowLabel'] = settings['colorByRowLabel'] ? true : false;
210	104	settings['timeline']['showRowLabels'] = settings['showRowLabels'] ? true : false;
211	105	if(settings['singleColor'] !== '') {
		@@ -261,12 +155,8 @@
261	155
262	156	delete axis.viewWindow[property];
263	157	}
264	158	}
265		-
266		- if(settings.hAxis && settings.hAxis.format == ''){
267		- settings.hAxis.format = 'yyyy-MM-dd';
268		- }
269	159	}
270	160
271	161	if(settings.hAxis){
272	162	if(settings.hAxis.textStyle && settings.hAxis.textStyle !== ''){
		@@ -286,38 +176,16 @@
286	176
287	177	for (i = 0; i < data.length; i++) {
288	178	row = [];
289	179	for (j = 0; j < series.length; j++) {
290		- switch(series[j].type) {
291		- case 'string':
292		- if(data[i][j] === ''){
293		- data[i][j] = null;
294		- }
295		- break;
296		- case 'boolean':
297		- if (typeof data[i][j] === 'string'){
298		- data[i][j] = data[i][j] === 'true';
299		- }
300		- break;
301		- case 'date':
302		- // fall-through.
303		- case 'datetime':
304		- if (typeof data[i][j] === 'string') {
305		- var dateParse = Date.parse(data[i][j].replace(/-/g, '/'));
306		- if ( isNaN( dateParse ) ) {
307		- dateParse = Date.parse(data[i][j]);
308		- }
309		- date = new Date( dateParse );
310		- } else if(typeof data[i][j] === 'object') {
311		- date = data[i][j];
312		- }
313		- data[i][j] = null;
314		- if (Object.prototype.toString.call(date) === "[object Date]") {
315		- if (!isNaN(date.getTime())) {
316		- data[i][j] = date;
317		- }
318		- }
319		- break;
	180	+ if (series[j].type === 'date' || series[j].type === 'datetime') {
	181	+ date = new Date(data[i][j]);
	182	+ data[i][j] = null;
	183	+ if (Object.prototype.toString.call(date) === "[object Date]") {
	184	+ if (!isNaN(date.getTime())) {
	185	+ data[i][j] = date;
	186	+ }
	187	+ }
320	188	}
321	189	row.push(data[i][j]);
322	190	}
323	191	table.addRow(row);
		@@ -325,9 +193,8 @@
325	193
326	194	if (settings.series) {
327	195	switch(chart.type){
328	196	case 'table':
329		- case 'tabular':
330	197	for(i in settings.series){
331	198	i = parseInt(i);
332	199	if (!series[i + 1]) {
333	200	continue;
		@@ -336,20 +203,12 @@
336	203	}
337	204	break;
338	205	default:
339	206	for (i = 0; i < settings.series.length; i++) {
340		- if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
	207	+ if (!series[i + 1]) {
341	208	continue;
342	209	}
343		- var seriesIndexToUse = i + 1;
344		-
345		- // if an annotation "swallowed" a series, use the following one.
346		- if(series_annotations.includes(i)){
347		- seriesIndexToUse++;
348		- }
349		- if ( series[seriesIndexToUse] ) {
350		- format_data(id, table, series[seriesIndexToUse].type, settings.series[i].format, seriesIndexToUse);
351		- }
	210	+ format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1);
352	211	}
353	212	break;
354	213	}
355	214	} else if (chart.type === 'pie' && settings.format && settings.format !== '') {
		@@ -354,78 +213,23 @@
354	213	}
355	214	} else if (chart.type === 'pie' && settings.format && settings.format !== '') {
356	215	format_data(id, table, 'number', settings.format, 1);
357	216	}
358		-
359		- if(settings.hAxis && series[0]) {
360		- format_data(id, table, series[0].type, settings.hAxis.format, 0);
361		- }
362		-
363	217	override(settings);
364	218
365	219	gv.events.addListener(render, 'ready', function () {
366	220	var arr = id.split('-');
367		- render = typeof render.getChart !== 'undefined' ? render.getChart() : render;
368	221	__visualizer_chart_images[ arr[0] + '-' + arr[1] ] = '';
369		-
370		- if (render.container && $(render.container).is(':visible')) {
371		- if ($(render.container).parents('div').next( '#sidebar' ).length === 0) {
372		- $(render.container).addClass( 'visualizer-chart-loaded' );
373		- }
374		- }
375		-
376	222	try{
377		- if ( typeof render.getImageURI !== 'undefined' ) {
378		- var img = render.getImageURI();
379		- __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
380		- $('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
381		- if ( $( '#chart-img' ).length ) {
382		- $( '#chart-img' ).val( img );
383		- }
384		- }
	223	+ var img = render.getImageURI();
	224	+ __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
	225	+ $('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
385	226	}catch(error){
386		- var canvas = document.getElementById( 'canvas' );
387		- domtoimage.toPng(canvas)
388		- .then(function ( img ) {
389		- __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
390		- $('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
391		- if ( $( '#chart-img' ).length ) {
392		- $( '#chart-img' ).val( img );
393		- }
394		- })
395		- .catch(function (error) {
396		- console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]);
397		- });
	227	+ console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]);
398	228	}
399	229	});
400	230
401		- if ( withControlMode ) {
402		- // alert( chart.is_library_page );
403		- // Create a control wrapper, passing some options.
404		- var controlWrapper = new gv.ControlWrapper( {
405		- containerId: 'control_wrapper_' + id,
406		- controlType: settings.controls.controlType,
407		- 'options': settings.controls,
408		- } );
409		-
410		- $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
411		- render.setOptions(settings);
412		- chartWrapper.bind(controlWrapper, render);
413		- chartWrapper.draw(table);
414		-
415		- gv.events.addListener(controlWrapper, 'ready', function ( err ) {
416		- if ( 'vertical' === settings.controls.ui.orientation ) {
417		- if ( 'canvas' === id ) {
418		- jQuery( '#' + id ).addClass( 'vz-vertical' );
419		- }
420		- } else {
421		- jQuery( '#' + id ).removeClass( 'vz-vertical' );
422		- }
423		- });
424		- } else {
425		- $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
426		- render.draw(table, settings);
427		- }
	231	+ render.draw(table, settings);
428	232	}
429	233
430	234	function format_data(id, table, type, format, index) {
431	235	if (!format || format === '') {
		@@ -466,15 +270,20 @@
466	270	}
467	271
468	272	function render() {
469	273	for (var id in (all_charts || {})) {
470		- var chartElement = document.getElementById( id );
471		- if (chartElement && chartElement.offsetParent) {
472		- renderChart(id);
473		- }
	274	+ renderChart(id);
474	275	}
475	276	}
476	277
	278	+ if(typeof visualizer !== 'undefined'){
	279	+ // called while updating the chart.
	280	+ visualizer.update = function(){
	281	+ renderChart('canvas');
	282	+ };
	283	+ }
	284	+
	285	+
477	286	var resizeTimeout;
478	287
479	288	$(document).ready(function() {
480	289	$(window).resize(function() {
		@@ -482,22 +291,11 @@
482	291	resizeTimeout = setTimeout(render, 100);
483	292	});
484	293
485	294	resizeHiddenContainers(true);
486		-
487		- if ( $( '.visualizer-hidden-container' ).length ) {
488		- setInterval( function() {
489		- $( '.visualizer-hidden-container' ).find(".visualizer-front:not(.visualizer-chart-loaded)").resize();
490		- }, 500 );
491		- }
492		-
493		- window.addEventListener( 'orientationchange', function() {
494		- $( '.visualizer-chart-loaded' ).removeClass( 'visualizer-chart-loaded' ).resize();
495		- }, false);
496	295	});
497	296
498	297	$(window).on('load', function(){
499		- $( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize();
500	298	resizeHiddenContainers(true);
501	299	});
502	300
503	301	function resizeHiddenContainers(everytime){
		@@ -545,21 +343,14 @@
545	343	case 'combo':
546	344	case 'candlestick':
547	345	case 'histogram':
548	346	case 'scatter':
549		- case 'bubble':
550	347	$type = 'corechart';
551	348	break;
552	349	case 'geo':
553	350	$type = 'geochart';
554	351	break;
555		- case 'tabular':
556		- case 'table':
557		- $type = 'table';
558		- break;
559	352	case 'dataTable':
560		- case 'polarArea':
561		- case 'radar':
562	353	$type = null;
563	354	break;
564	355	}
565	356	if($type != null){
		@@ -568,24 +359,14 @@
568	359	});
569	360	}
570	361
571	362	objects = {};
572		- if ( 'object' === typeof google ) {
573		- $chart_types.push( 'controls' );
574		- google.load( 'visualization', '51', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language,
575		- callback: function () {
576		- gv = google.visualization;
577		- all_charts = v.charts;
578		- if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
579		- if ( document.getElementById( v.id ).offsetParent !== null ) {
580		- renderChart(v.id);
581		- }
582		- } else {
583		- render();
584		- }
585		- }
586		- });
587		- }
	363	+ google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language});
	364	+ google.charts.setOnLoadCallback(function() {
	365	+ gv = google.visualization;
	366	+ all_charts = v.charts;
	367	+ render();
	368	+ });
588	369	});
589	370
590	371	$('body').on('visualizer:render:specificchart:start', function(event, v){
591	372	objects = {};
		@@ -592,23 +373,18 @@
592	373	gv = google.visualization;
593	374	renderSpecificChart(v.id, v.chart);
594	375	});
595	376
596		- $('body').on('visualizer:render:currentchart:update', function(event, v){
597		- renderChart('canvas');
598		- });
599		-
600	377	// front end actions
601		- // 'image' is also called from the library
602	378	$('body').on('visualizer:action:specificchart', function(event, v){
603		- var id = v.id;
604		- if(typeof rendered_charts[id] === 'undefined'){
605		- return;
606		- }
607		- var arr = id.split('-');
608		- var img = __visualizer_chart_images[ arr[0] + '-' + arr[1] ];
609	379	switch(v.action){
610	380	case 'print':
	381	+ var id = v.id;
	382	+ if(typeof rendered_charts[id] === 'undefined'){
	383	+ return;
	384	+ }
	385	+ var arr = id.split('-');
	386	+ var img = __visualizer_chart_images[ arr[0] + '-' + arr[1] ];
611	387	// for charts that have no rendered image defined, we print the data instead.
612	388	var html = v.data;
613	389	if(img !== ''){
614	390	html = "<html><body><img src='" + img + "' /></body></html>";
		@@ -614,30 +390,8 @@
614	390	html = "<html><body><img src='" + img + "' /></body></html>";
615	391	}
616	392	$('body').trigger('visualizer:action:specificchart:defaultprint', {data: html});
617	393	break;
618		- case 'image':
619		- if(img !== ''){
620		- var $a = $("<a>"); // jshint ignore:line
621		- $a.attr("href", img);
622		- $("body").append($a);
623		- $a.attr("download", v.dataObj.name);
624		- $a[0].click();
625		- $a.remove();
626		- }else{
627		- console.warn("No image generated");
628		- }
629		- break;
630	394	}
631	395	});
632	396
633		- var timer = 0;
634		- $( document ).on( 'input', '.series-linewidth', function() {
635		- var seriesLineWidth = $( this );
636		- clearTimeout( timer );
637		- timer = setTimeout( function() {
638		- if ( seriesLineWidth.val() != '' && seriesLineWidth.val() <= 0 ) {
639		- seriesLineWidth.val( '0.1' );
640		- }
641		- }, 700 );
642		- } );
643	397	})(jQuery);