← All changes | js/render-google.js +336 -40 3.1.3 → 3.10.7 View file →

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