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