← All changes | js/render-google.js +250 -36 3.1.3 → 3.7.1 View file →

		@@ -11,14 +11,39 @@
11	11	// so that we know which charts belong to our library.
12	12	var rendered_charts = [];
13	13
14	14	function renderChart(id) {
15		- renderSpecificChart(id, all_charts[id]);
	15	+ var chart = all_charts[id];
	16	+ var hasAnnotation = false;
	17	+
	18	+ // re-render the chart only if it doesn't have annotations and it is on the front-end
	19	+ // this is to prevent the chart from showing "All series on a given axis must be of the same data type" during resize.
	20	+ // remember, some charts do not support annotations so they should not be included in this.
	21	+ var no_annotation_charts = ['tabular', 'timeline', 'gauge', 'geo', 'bubble', 'candlestick'];
	22	+ if ( undefined !== chart.settings && undefined !== chart.settings.series && undefined === chart.settings.series.length ) {
	23	+ var chartSeries = [];
	24	+ var chartSeriesValue = Object.values( chart.settings.series );
	25	+ $.each( Object.keys( chart.settings.series ), function( index, element ) {
	26	+ chartSeries[element] = chartSeriesValue[index];
	27	+ } );
	28	+ chart.settings.series = chartSeries;
	29	+ }
	30	+ if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined' && ! no_annotation_charts.includes(chart.type) ) {
	31	+ hasAnnotation = chart.series.length - chart.settings.series.length > 1;
	32	+ }
	33	+
	34	+ if(! hasAnnotation){
	35	+ renderSpecificChart(id, all_charts[id]);
	36	+ }
16	37	}
17	38
18	39	function renderSpecificChart(id, chart) {
19	40	var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter;
20	41
	42	+ if ( $('#' + id).hasClass('visualizer-chart-loaded') ) {
	43	+ return;
	44	+ }
	45	+
21	46	if(chart.library !== 'google'){
22	47	return;
23	48	}
24	49	rendered_charts[id] = 'yes';
		@@ -35,8 +60,11 @@
35	60
36	61	render = objects[id] || null;
37	62	if (!render) {
38	63	switch (chart.type) {
	64	+ case "tabular":
	65	+ render = "Table";
	66	+ break;
39	67	case "gauge":
40	68	case "table":
41	69	case "timeline":
42	70	render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1);
		@@ -54,8 +82,47 @@
54	82	settings['animation']['startup'] = true;
55	83	settings['animation']['duration'] = parseInt(settings['animation']['duration']);
56	84	}
57	85
	86	+ // mark roles for series that have specified a role
	87	+ // and then remove them from future processing
	88	+ // and also adjust the indices of the series array so that
	89	+ // the ones with a role are ignored
	90	+ // e.g. if there are 6 columns (0-5) out of which 1, 3 and 5 are annotations
	91	+ // the final series will only include 0, 2, 4 (reindexed as 0, 1, 2)
	92	+
	93	+ // this will capture all the series indexes that became annotations.
	94	+ var series_annotations = [];
	95	+ if (settings.series) {
	96	+ var adjusted_series = [];
	97	+ for (i = 0; i < settings.series.length; i++) {
	98	+ if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
	99	+ continue;
	100	+ }
	101	+ if(typeof settings.series[i].role !== 'undefined'){
	102	+ table.setColumnProperty(i + 1, 'role', settings.series[i].role);
	103	+ if(settings.series[i].role === '') {
	104	+ adjusted_series.push(settings.series[i]);
	105	+ }else{
	106	+ series_annotations.push(i);
	107	+ }
	108	+ }
	109	+ }
	110	+ if(adjusted_series.length > 0){
	111	+ settings.series = adjusted_series;
	112	+ }
	113	+ }
	114	+
	115	+ if ( settings['explorer_enabled'] && settings['explorer_enabled'] == 'true' ) { // jshint ignore:line
	116	+ var $explorer = {};
	117	+ $explorer['keepInBounds'] = true;
	118	+
	119	+ if ( settings['explorer_actions'] ) {
	120	+ $explorer['actions'] = settings['explorer_actions'];
	121	+ }
	122	+ settings['explorer'] = $explorer;
	123	+ }
	124	+
58	125	switch (chart.type) {
59	126	case 'pie':
60	127	if (settings.slices) {
61	128	for (i in settings.slices) {
		@@ -89,8 +156,9 @@
89	156	settings['region'] = 'world';
90	157	}
91	158	break;
92	159	case 'table':
	160	+ case 'tabular':
93	161	if (parseInt(settings['pagination']) !== 1)
94	162	{
95	163	delete settings['pageSize'];
96	164	}
		@@ -96,10 +164,13 @@
96	164	}
97	165	break;
98	166	case 'gauge':
99	167	break;
	168	+ case 'bubble':
	169	+ settings.sortBubblesBySize = settings.sortBubblesBySize ? settings.sortBubblesBySize == 1 : false; // jshint ignore:line
	170	+ break;
100	171	case 'timeline':
101		- settings['timeline'] = [];
	172	+ settings['timeline'] = {};
102	173	settings['timeline']['groupByRowLabel'] = settings['groupByRowLabel'] ? true : false;
103	174	settings['timeline']['colorByRowLabel'] = settings['colorByRowLabel'] ? true : false;
104	175	settings['timeline']['showRowLabels'] = settings['showRowLabels'] ? true : false;
105	176	if(settings['singleColor'] !== '') {
		@@ -163,8 +234,11 @@
163	234	if(typeof(settings.hAxis.textStyle) === "string") {
164	235	settings.hAxis.textStyle = {color: settings.hAxis.textStyle};
165	236	}
166	237	}
	238	+ if(settings.hAxis.format == ''){
	239	+ settings.hAxis.format = 'YYYY-MM-dd';
	240	+ }
167	241	}
168	242
169	243	if(settings.vAxis){
170	244	if(settings.vAxis.textStyle && settings.vAxis.textStyle !== ''){
		@@ -176,16 +250,38 @@
176	250
177	251	for (i = 0; i < data.length; i++) {
178	252	row = [];
179	253	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		- }
	254	+ switch(series[j].type) {
	255	+ case 'string':
	256	+ if(data[i][j] === ''){
	257	+ data[i][j] = null;
	258	+ }
	259	+ break;
	260	+ case 'boolean':
	261	+ if (typeof data[i][j] === 'string'){
	262	+ data[i][j] = data[i][j] === 'true';
	263	+ }
	264	+ break;
	265	+ case 'date':
	266	+ // fall-through.
	267	+ case 'datetime':
	268	+ if (typeof data[i][j] === 'string') {
	269	+ var dateParse = Date.parse(data[i][j].replace(/-/g, '/'));
	270	+ if ( isNaN( dateParse ) ) {
	271	+ dateParse = Date.parse(data[i][j]);
	272	+ }
	273	+ date = new Date( dateParse );
	274	+ } else if(typeof data[i][j] === 'object') {
	275	+ date = data[i][j];
	276	+ }
	277	+ data[i][j] = null;
	278	+ if (Object.prototype.toString.call(date) === "[object Date]") {
	279	+ if (!isNaN(date.getTime())) {
	280	+ data[i][j] = date;
	281	+ }
	282	+ }
	283	+ break;
188	284	}
189	285	row.push(data[i][j]);
190	286	}
191	287	table.addRow(row);
		@@ -193,8 +289,9 @@
193	289
194	290	if (settings.series) {
195	291	switch(chart.type){
196	292	case 'table':
	293	+ case 'tabular':
197	294	for(i in settings.series){
198	295	i = parseInt(i);
199	296	if (!series[i + 1]) {
200	297	continue;
		@@ -203,12 +300,20 @@
203	300	}
204	301	break;
205	302	default:
206	303	for (i = 0; i < settings.series.length; i++) {
207		- if (!series[i + 1]) {
	304	+ if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
208	305	continue;
209	306	}
210		- format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1);
	307	+ var seriesIndexToUse = i + 1;
	308	+
	309	+ // if an annotation "swallowed" a series, use the following one.
	310	+ if(series_annotations.includes(i)){
	311	+ seriesIndexToUse++;
	312	+ }
	313	+ if ( series[seriesIndexToUse] ) {
	314	+ format_data(id, table, series[seriesIndexToUse].type, settings.series[i].format, seriesIndexToUse);
	315	+ }
211	316	}
212	317	break;
213	318	}
214	319	} else if (chart.type === 'pie' && settings.format && settings.format !== '') {
		@@ -213,22 +318,51 @@
213	318	}
214	319	} else if (chart.type === 'pie' && settings.format && settings.format !== '') {
215	320	format_data(id, table, 'number', settings.format, 1);
216	321	}
	322	+
	323	+ if(settings.hAxis && series[0]) {
	324	+ format_data(id, table, series[0].type, settings.hAxis.format, 0);
	325	+ }
	326	+
217	327	override(settings);
218	328
219	329	gv.events.addListener(render, 'ready', function () {
220	330	var arr = id.split('-');
221	331	__visualizer_chart_images[ arr[0] + '-' + arr[1] ] = '';
	332	+
	333	+ if (render.container && $(render.container).is(':visible')) {
	334	+ if ($(render.container).parents('div').next( '#sidebar' ).length === 0) {
	335	+ $(render.container).addClass( 'visualizer-chart-loaded' );
	336	+ }
	337	+ }
	338	+
222	339	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});
	340	+ if ( typeof render.getImageURI !== 'undefined' ) {
	341	+ var img = render.getImageURI();
	342	+ __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
	343	+ $('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
	344	+ if ( $( '#chart-img' ).length ) {
	345	+ $( '#chart-img' ).val( img );
	346	+ }
	347	+ }
226	348	}catch(error){
227		- console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]);
	349	+ var canvas = document.getElementById( 'canvas' );
	350	+ domtoimage.toPng(canvas)
	351	+ .then(function ( img ) {
	352	+ __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
	353	+ $('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
	354	+ if ( $( '#chart-img' ).length ) {
	355	+ $( '#chart-img' ).val( img );
	356	+ }
	357	+ })
	358	+ .catch(function (error) {
	359	+ console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]);
	360	+ });
228	361	}
229	362	});
230	363
	364	+ $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
231	365	render.draw(table, settings);
232	366	}
233	367
234	368	function format_data(id, table, type, format, index) {
		@@ -270,20 +404,15 @@
270	404	}
271	405
272	406	function render() {
273	407	for (var id in (all_charts || {})) {
274		- renderChart(id);
	408	+ var chartElement = document.getElementById( id );
	409	+ if (chartElement && chartElement.offsetParent) {
	410	+ renderChart(id);
	411	+ }
275	412	}
276	413	}
277	414
278		- if(typeof visualizer !== 'undefined'){
279		- // called while updating the chart.
280		- visualizer.update = function(){
281		- renderChart('canvas');
282		- };
283		- }
284		-
285		-
286	415	var resizeTimeout;
287	416
288	417	$(document).ready(function() {
289	418	$(window).resize(function() {
		@@ -291,8 +420,18 @@
291	420	resizeTimeout = setTimeout(render, 100);
292	421	});
293	422
294	423	resizeHiddenContainers(true);
	424	+
	425	+ if ( $( '.visualizer-hidden-container' ).length ) {
	426	+ setInterval( function() {
	427	+ $( '.visualizer-hidden-container' ).find(".visualizer-front:not(.visualizer-chart-loaded)").resize();
	428	+ }, 500 );
	429	+ }
	430	+
	431	+ $( window ).on( 'orientationchange', function( event ) {
	432	+ $( '.visualizer-chart-loaded' ).removeClass( 'visualizer-chart-loaded' );
	433	+ } );
295	434	});
296	435
297	436	$(window).on('load', function(){
298	437	resizeHiddenContainers(true);
		@@ -324,14 +463,62 @@
324	463	});
325	464	}
326	465
327	466	$('body').on('visualizer:render:chart:start', function(event, v){
	467	+ var $chart_types = ['corechart', 'geochart', 'gauge', 'table', 'timeline'];
	468	+ if(v.is_front == true){ // jshint ignore:line
	469	+ // check what all chart types to load.
	470	+ $chart_types = [];
	471	+ $.each(v.charts, function(i, c){
	472	+ var $type = c.type;
	473	+ switch($type){
	474	+ case 'bar':
	475	+ case 'column':
	476	+ case 'line':
	477	+ case 'area':
	478	+ case 'stepped area':
	479	+ case 'bubble':
	480	+ case 'pie':
	481	+ case 'donut':
	482	+ case 'combo':
	483	+ case 'candlestick':
	484	+ case 'histogram':
	485	+ case 'scatter':
	486	+ case 'bubble':
	487	+ $type = 'corechart';
	488	+ break;
	489	+ case 'geo':
	490	+ $type = 'geochart';
	491	+ break;
	492	+ case 'tabular':
	493	+ case 'table':
	494	+ $type = 'table';
	495	+ break;
	496	+ case 'dataTable':
	497	+ case 'polarArea':
	498	+ case 'radar':
	499	+ $type = null;
	500	+ break;
	501	+ }
	502	+ if($type != null){
	503	+ $chart_types.push($type);
	504	+ }
	505	+ });
	506	+ }
	507	+
328	508	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();
	509	+ google.load( 'visualization', 'current', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language,
	510	+ callback: function () {
	511	+ gv = google.visualization;
	512	+ all_charts = v.charts;
	513	+ if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
	514	+ if ( document.getElementById( v.id ).offsetParent !== null ) {
	515	+ renderChart(v.id);
	516	+ }
	517	+ } else {
	518	+ render();
	519	+ }
	520	+ }
334	521	});
335	522	});
336	523
337	524	$('body').on('visualizer:render:specificchart:start', function(event, v){
		@@ -339,18 +526,23 @@
339	526	gv = google.visualization;
340	527	renderSpecificChart(v.id, v.chart);
341	528	});
342	529
	530	+ $('body').on('visualizer:render:currentchart:update', function(event, v){
	531	+ renderChart('canvas');
	532	+ });
	533	+
343	534	// front end actions
	535	+ // 'image' is also called from the library
344	536	$('body').on('visualizer:action:specificchart', function(event, v){
	537	+ var id = v.id;
	538	+ if(typeof rendered_charts[id] === 'undefined'){
	539	+ return;
	540	+ }
	541	+ var arr = id.split('-');
	542	+ var img = __visualizer_chart_images[ arr[0] + '-' + arr[1] ];
345	543	switch(v.action){
346	544	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	545	// for charts that have no rendered image defined, we print the data instead.
354	546	var html = v.data;
355	547	if(img !== ''){
356	548	html = "<html><body><img src='" + img + "' /></body></html>";
		@@ -356,8 +548,30 @@
356	548	html = "<html><body><img src='" + img + "' /></body></html>";
357	549	}
358	550	$('body').trigger('visualizer:action:specificchart:defaultprint', {data: html});
359	551	break;
	552	+ case 'image':
	553	+ if(img !== ''){
	554	+ var $a = $("<a>"); // jshint ignore:line
	555	+ $a.attr("href", img);
	556	+ $("body").append($a);
	557	+ $a.attr("download", v.dataObj.name);
	558	+ $a[0].click();
	559	+ $a.remove();
	560	+ }else{
	561	+ console.warn("No image generated");
	562	+ }
	563	+ break;
360	564	}
361	565	});
362	566
	567	+ var timer = 0;
	568	+ $( document ).on( 'input', '.series-linewidth', function() {
	569	+ var seriesLineWidth = $( this );
	570	+ clearTimeout( timer );
	571	+ timer = setTimeout( function() {
	572	+ if ( seriesLineWidth.val() != '' && seriesLineWidth.val() <= 0 ) {
	573	+ seriesLineWidth.val( '0.1' );
	574	+ }
	575	+ }, 700 );
	576	+ } );
363	577	})(jQuery);