← All changes | js/render-google.js +174 -28 3.1.3 → 3.5.0 View file →

		@@ -11,9 +11,25 @@
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	+ chart.settings.series = Object.values( chart.settings.series );
	24	+ }
	25	+ if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined' && ! no_annotation_charts.includes(chart.type) ) {
	26	+ hasAnnotation = chart.series.length - chart.settings.series.length > 1;
	27	+ }
	28	+
	29	+ if(! hasAnnotation){
	30	+ renderSpecificChart(id, all_charts[id]);
	31	+ }
16	32	}
17	33
18	34	function renderSpecificChart(id, chart) {
19	35	var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter;
		@@ -35,8 +51,11 @@
35	51
36	52	render = objects[id] || null;
37	53	if (!render) {
38	54	switch (chart.type) {
	55	+ case "tabular":
	56	+ render = "Table";
	57	+ break;
39	58	case "gauge":
40	59	case "table":
41	60	case "timeline":
42	61	render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1);
		@@ -54,8 +73,47 @@
54	73	settings['animation']['startup'] = true;
55	74	settings['animation']['duration'] = parseInt(settings['animation']['duration']);
56	75	}
57	76
	77	+ // mark roles for series that have specified a role
	78	+ // and then remove them from future processing
	79	+ // and also adjust the indices of the series array so that
	80	+ // the ones with a role are ignored
	81	+ // e.g. if there are 6 columns (0-5) out of which 1, 3 and 5 are annotations
	82	+ // the final series will only include 0, 2, 4 (reindexed as 0, 1, 2)
	83	+
	84	+ // this will capture all the series indexes that became annotations.
	85	+ var series_annotations = [];
	86	+ if (settings.series) {
	87	+ var adjusted_series = [];
	88	+ for (i = 0; i < settings.series.length; i++) {
	89	+ if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
	90	+ continue;
	91	+ }
	92	+ if(typeof settings.series[i].role !== 'undefined'){
	93	+ table.setColumnProperty(i + 1, 'role', settings.series[i].role);
	94	+ if(settings.series[i].role === '') {
	95	+ adjusted_series.push(settings.series[i]);
	96	+ }else{
	97	+ series_annotations.push(i);
	98	+ }
	99	+ }
	100	+ }
	101	+ if(adjusted_series.length > 0){
	102	+ settings.series = adjusted_series;
	103	+ }
	104	+ }
	105	+
	106	+ if ( settings['explorer_enabled'] && settings['explorer_enabled'] == 'true' ) { // jshint ignore:line
	107	+ var $explorer = {};
	108	+ $explorer['keepInBounds'] = true;
	109	+
	110	+ if ( settings['explorer_actions'] ) {
	111	+ $explorer['actions'] = settings['explorer_actions'];
	112	+ }
	113	+ settings['explorer'] = $explorer;
	114	+ }
	115	+
58	116	switch (chart.type) {
59	117	case 'pie':
60	118	if (settings.slices) {
61	119	for (i in settings.slices) {
		@@ -89,8 +147,9 @@
89	147	settings['region'] = 'world';
90	148	}
91	149	break;
92	150	case 'table':
	151	+ case 'tabular':
93	152	if (parseInt(settings['pagination']) !== 1)
94	153	{
95	154	delete settings['pageSize'];
96	155	}
		@@ -96,10 +155,13 @@
96	155	}
97	156	break;
98	157	case 'gauge':
99	158	break;
	159	+ case 'bubble':
	160	+ settings.sortBubblesBySize = settings.sortBubblesBySize ? settings.sortBubblesBySize == 1 : false; // jshint ignore:line
	161	+ break;
100	162	case 'timeline':
101		- settings['timeline'] = [];
	163	+ settings['timeline'] = {};
102	164	settings['timeline']['groupByRowLabel'] = settings['groupByRowLabel'] ? true : false;
103	165	settings['timeline']['colorByRowLabel'] = settings['colorByRowLabel'] ? true : false;
104	166	settings['timeline']['showRowLabels'] = settings['showRowLabels'] ? true : false;
105	167	if(settings['singleColor'] !== '') {
		@@ -176,16 +238,30 @@
176	238
177	239	for (i = 0; i < data.length; i++) {
178	240	row = [];
179	241	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		- }
	242	+ switch(series[j].type) {
	243	+ case 'string':
	244	+ if(data[i][j] === ''){
	245	+ data[i][j] = null;
	246	+ }
	247	+ break;
	248	+ case 'boolean':
	249	+ if (typeof data[i][j] === 'string'){
	250	+ data[i][j] = data[i][j] === 'true';
	251	+ }
	252	+ break;
	253	+ case 'date':
	254	+ // fall-through.
	255	+ case 'datetime':
	256	+ date = new Date(data[i][j]);
	257	+ data[i][j] = null;
	258	+ if (Object.prototype.toString.call(date) === "[object Date]") {
	259	+ if (!isNaN(date.getTime())) {
	260	+ data[i][j] = date;
	261	+ }
	262	+ }
	263	+ break;
188	264	}
189	265	row.push(data[i][j]);
190	266	}
191	267	table.addRow(row);
		@@ -193,8 +269,9 @@
193	269
194	270	if (settings.series) {
195	271	switch(chart.type){
196	272	case 'table':
	273	+ case 'tabular':
197	274	for(i in settings.series){
198	275	i = parseInt(i);
199	276	if (!series[i + 1]) {
200	277	continue;
		@@ -203,12 +280,20 @@
203	280	}
204	281	break;
205	282	default:
206	283	for (i = 0; i < settings.series.length; i++) {
207		- if (!series[i + 1]) {
	284	+ if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
208	285	continue;
209	286	}
210		- format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1);
	287	+ var seriesIndexToUse = i + 1;
	288	+
	289	+ // if an annotation "swallowed" a series, use the following one.
	290	+ if(series_annotations.includes(i)){
	291	+ seriesIndexToUse++;
	292	+ }
	293	+ if ( series[seriesIndexToUse] ) {
	294	+ format_data(id, table, series[seriesIndexToUse].type, settings.series[i].format, seriesIndexToUse);
	295	+ }
211	296	}
212	297	break;
213	298	}
214	299	} else if (chart.type === 'pie' && settings.format && settings.format !== '') {
		@@ -213,8 +298,13 @@
213	298	}
214	299	} else if (chart.type === 'pie' && settings.format && settings.format !== '') {
215	300	format_data(id, table, 'number', settings.format, 1);
216	301	}
	302	+
	303	+ if(settings.hAxis && series[0]) {
	304	+ format_data(id, table, series[0].type, settings.hAxis.format, 0);
	305	+ }
	306	+
217	307	override(settings);
218	308
219	309	gv.events.addListener(render, 'ready', function () {
220	310	var arr = id.split('-');
		@@ -227,8 +317,10 @@
227	317	console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]);
228	318	}
229	319	});
230	320
	321	+ $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
	322	+
231	323	render.draw(table, settings);
232	324	}
233	325
234	326	function format_data(id, table, type, format, index) {
		@@ -274,16 +366,8 @@
274	366	renderChart(id);
275	367	}
276	368	}
277	369
278		- if(typeof visualizer !== 'undefined'){
279		- // called while updating the chart.
280		- visualizer.update = function(){
281		- renderChart('canvas');
282		- };
283		- }
284		-
285		-
286	370	var resizeTimeout;
287	371
288	372	$(document).ready(function() {
289	373	$(window).resize(function() {
		@@ -324,14 +408,59 @@
324	408	});
325	409	}
326	410
327	411	$('body').on('visualizer:render:chart:start', function(event, v){
	412	+ var $chart_types = ['corechart', 'geochart', 'gauge', 'table', 'timeline'];
	413	+ if(v.is_front == true){ // jshint ignore:line
	414	+ // check what all chart types to load.
	415	+ $chart_types = [];
	416	+ $.each(v.charts, function(i, c){
	417	+ var $type = c.type;
	418	+ switch($type){
	419	+ case 'bar':
	420	+ case 'column':
	421	+ case 'line':
	422	+ case 'area':
	423	+ case 'stepped area':
	424	+ case 'bubble':
	425	+ case 'pie':
	426	+ case 'donut':
	427	+ case 'combo':
	428	+ case 'candlestick':
	429	+ case 'histogram':
	430	+ case 'scatter':
	431	+ case 'bubble':
	432	+ $type = 'corechart';
	433	+ break;
	434	+ case 'geo':
	435	+ $type = 'geochart';
	436	+ break;
	437	+ case 'tabular':
	438	+ case 'table':
	439	+ $type = 'table';
	440	+ break;
	441	+ case 'dataTable':
	442	+ case 'polarArea':
	443	+ case 'radar':
	444	+ $type = null;
	445	+ break;
	446	+ }
	447	+ if($type != null){
	448	+ $chart_types.push($type);
	449	+ }
	450	+ });
	451	+ }
	452	+
328	453	objects = {};
329		- google.charts.load("current", {packages: ["corechart", "geochart", "gauge", "table", "timeline"], mapsApiKey: v.map_api_key, 'language' : v.language});
	454	+ google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language});
330	455	google.charts.setOnLoadCallback(function() {
331	456	gv = google.visualization;
332	457	all_charts = v.charts;
333		- render();
	458	+ if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
	459	+ renderChart(v.id);
	460	+ } else {
	461	+ render();
	462	+ }
334	463	});
335	464	});
336	465
337	466	$('body').on('visualizer:render:specificchart:start', function(event, v){
		@@ -339,18 +468,23 @@
339	468	gv = google.visualization;
340	469	renderSpecificChart(v.id, v.chart);
341	470	});
342	471
	472	+ $('body').on('visualizer:render:currentchart:update', function(event, v){
	473	+ renderChart('canvas');
	474	+ });
	475	+
343	476	// front end actions
	477	+ // 'image' is also called from the library
344	478	$('body').on('visualizer:action:specificchart', function(event, v){
	479	+ var id = v.id;
	480	+ if(typeof rendered_charts[id] === 'undefined'){
	481	+ return;
	482	+ }
	483	+ var arr = id.split('-');
	484	+ var img = __visualizer_chart_images[ arr[0] + '-' + arr[1] ];
345	485	switch(v.action){
346	486	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	487	// for charts that have no rendered image defined, we print the data instead.
354	488	var html = v.data;
355	489	if(img !== ''){
356	490	html = "<html><body><img src='" + img + "' /></body></html>";
		@@ -355,8 +489,20 @@
355	489	if(img !== ''){
356	490	html = "<html><body><img src='" + img + "' /></body></html>";
357	491	}
358	492	$('body').trigger('visualizer:action:specificchart:defaultprint', {data: html});
	493	+ break;
	494	+ case 'image':
	495	+ if(img !== ''){
	496	+ var $a = $("<a>"); // jshint ignore:line
	497	+ $a.attr("href", img);
	498	+ $("body").append($a);
	499	+ $a.attr("download", v.dataObj.name);
	500	+ $a[0].click();
	501	+ $a.remove();
	502	+ }else{
	503	+ console.warn("No image generated");
	504	+ }
359	505	break;
360	506	}
361	507	});
362	508