← All changes | js/render-google.js +151 -25 3.1.3 → 3.4.5 View file →

		@@ -11,8 +11,18 @@
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	+ var chart = all_charts[id];
	16	+ var hasAnnotation = false;
	17	+ if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined'){
	18	+ hasAnnotation = chart.series.length - chart.settings.series.length > 1;
	19	+ }
	20	+ // re-render the chart only if it doesn't have annotations and it is on the front-end
	21	+ // this is to prevent the chart from showing "All series on a given axis must be of the same data type" during resize.
	22	+ if(hasAnnotation){
	23	+ return;
	24	+ }
15	25	renderSpecificChart(id, all_charts[id]);
16	26	}
17	27
18	28	function renderSpecificChart(id, chart) {
		@@ -35,8 +45,11 @@
35	45
36	46	render = objects[id] || null;
37	47	if (!render) {
38	48	switch (chart.type) {
	49	+ case "tabular":
	50	+ render = "Table";
	51	+ break;
39	52	case "gauge":
40	53	case "table":
41	54	case "timeline":
42	55	render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1);
		@@ -54,8 +67,42 @@
54	67	settings['animation']['startup'] = true;
55	68	settings['animation']['duration'] = parseInt(settings['animation']['duration']);
56	69	}
57	70
	71	+ // mark roles for series that have specified a role
	72	+ // and then remove them from future processing
	73	+ // and also adjust the indices of the series array so that
	74	+ // the ones with a role are ignored
	75	+ // e.g. if there are 6 columns (0-5) out of which 1, 3 and 5 are annotations
	76	+ // the final series will only include 0, 2, 4 (reindexed as 0, 1, 2)
	77	+ if (settings.series) {
	78	+ var adjusted_series = [];
	79	+ for (i = 0; i < settings.series.length; i++) {
	80	+ if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
	81	+ continue;
	82	+ }
	83	+ if(typeof settings.series[i].role !== 'undefined'){
	84	+ table.setColumnProperty(i + 1, 'role', settings.series[i].role);
	85	+ if(settings.series[i].role === '') {
	86	+ adjusted_series.push(settings.series[i]);
	87	+ }
	88	+ }
	89	+ }
	90	+ if(adjusted_series.length > 0){
	91	+ settings.series = adjusted_series;
	92	+ }
	93	+ }
	94	+
	95	+ if ( settings['explorer_enabled'] && settings['explorer_enabled'] == 'true' ) { // jshint ignore:line
	96	+ var $explorer = {};
	97	+ $explorer['keepInBounds'] = true;
	98	+
	99	+ if ( settings['explorer_actions'] ) {
	100	+ $explorer['actions'] = settings['explorer_actions'];
	101	+ }
	102	+ settings['explorer'] = $explorer;
	103	+ }
	104	+
58	105	switch (chart.type) {
59	106	case 'pie':
60	107	if (settings.slices) {
61	108	for (i in settings.slices) {
		@@ -89,8 +136,9 @@
89	136	settings['region'] = 'world';
90	137	}
91	138	break;
92	139	case 'table':
	140	+ case 'tabular':
93	141	if (parseInt(settings['pagination']) !== 1)
94	142	{
95	143	delete settings['pageSize'];
96	144	}
		@@ -96,8 +144,11 @@
96	144	}
97	145	break;
98	146	case 'gauge':
99	147	break;
	148	+ case 'bubble':
	149	+ settings.sortBubblesBySize = settings.sortBubblesBySize ? settings.sortBubblesBySize == 1 : false; // jshint ignore:line
	150	+ break;
100	151	case 'timeline':
101	152	settings['timeline'] = [];
102	153	settings['timeline']['groupByRowLabel'] = settings['groupByRowLabel'] ? true : false;
103	154	settings['timeline']['colorByRowLabel'] = settings['colorByRowLabel'] ? true : false;
		@@ -176,16 +227,30 @@
176	227
177	228	for (i = 0; i < data.length; i++) {
178	229	row = [];
179	230	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		- }
	231	+ switch(series[j].type) {
	232	+ case 'string':
	233	+ if(data[i][j] === ''){
	234	+ data[i][j] = null;
	235	+ }
	236	+ break;
	237	+ case 'boolean':
	238	+ if (typeof data[i][j] === 'string'){
	239	+ data[i][j] = data[i][j] === 'true';
	240	+ }
	241	+ break;
	242	+ case 'date':
	243	+ // fall-through.
	244	+ case 'datetime':
	245	+ date = new Date(data[i][j]);
	246	+ data[i][j] = null;
	247	+ if (Object.prototype.toString.call(date) === "[object Date]") {
	248	+ if (!isNaN(date.getTime())) {
	249	+ data[i][j] = date;
	250	+ }
	251	+ }
	252	+ break;
188	253	}
189	254	row.push(data[i][j]);
190	255	}
191	256	table.addRow(row);
		@@ -203,9 +268,9 @@
203	268	}
204	269	break;
205	270	default:
206	271	for (i = 0; i < settings.series.length; i++) {
207		- if (!series[i + 1]) {
	272	+ if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
208	273	continue;
209	274	}
210	275	format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1);
211	276	}
		@@ -213,8 +278,13 @@
213	278	}
214	279	} else if (chart.type === 'pie' && settings.format && settings.format !== '') {
215	280	format_data(id, table, 'number', settings.format, 1);
216	281	}
	282	+
	283	+ if(settings.hAxis && series[0]) {
	284	+ format_data(id, table, series[0].type, settings.hAxis.format, 0);
	285	+ }
	286	+
217	287	override(settings);
218	288
219	289	gv.events.addListener(render, 'ready', function () {
220	290	var arr = id.split('-');
		@@ -227,8 +297,10 @@
227	297	console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]);
228	298	}
229	299	});
230	300
	301	+ $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
	302	+
231	303	render.draw(table, settings);
232	304	}
233	305
234	306	function format_data(id, table, type, format, index) {
		@@ -274,16 +346,8 @@
274	346	renderChart(id);
275	347	}
276	348	}
277	349
278		- if(typeof visualizer !== 'undefined'){
279		- // called while updating the chart.
280		- visualizer.update = function(){
281		- renderChart('canvas');
282		- };
283		- }
284		-
285		-
286	350	var resizeTimeout;
287	351
288	352	$(document).ready(function() {
289	353	$(window).resize(function() {
		@@ -324,14 +388,59 @@
324	388	});
325	389	}
326	390
327	391	$('body').on('visualizer:render:chart:start', function(event, v){
	392	+ var $chart_types = ['corechart', 'geochart', 'gauge', 'table', 'timeline'];
	393	+ if(v.is_front == true){ // jshint ignore:line
	394	+ // check what all chart types to load.
	395	+ $chart_types = [];
	396	+ $.each(v.charts, function(i, c){
	397	+ var $type = c.type;
	398	+ switch($type){
	399	+ case 'bar':
	400	+ case 'column':
	401	+ case 'line':
	402	+ case 'area':
	403	+ case 'stepped area':
	404	+ case 'bubble':
	405	+ case 'pie':
	406	+ case 'donut':
	407	+ case 'combo':
	408	+ case 'candlestick':
	409	+ case 'histogram':
	410	+ case 'scatter':
	411	+ case 'bubble':
	412	+ $type = 'corechart';
	413	+ break;
	414	+ case 'geo':
	415	+ $type = 'geochart';
	416	+ break;
	417	+ case 'tabular':
	418	+ case 'table':
	419	+ $type = 'table';
	420	+ break;
	421	+ case 'dataTable':
	422	+ case 'polarArea':
	423	+ case 'radar':
	424	+ $type = null;
	425	+ break;
	426	+ }
	427	+ if($type != null){
	428	+ $chart_types.push($type);
	429	+ }
	430	+ });
	431	+ }
	432	+
328	433	objects = {};
329		- google.charts.load("current", {packages: ["corechart", "geochart", "gauge", "table", "timeline"], mapsApiKey: v.map_api_key, 'language' : v.language});
	434	+ google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language});
330	435	google.charts.setOnLoadCallback(function() {
331	436	gv = google.visualization;
332	437	all_charts = v.charts;
333		- render();
	438	+ if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line
	439	+ renderChart(v.id);
	440	+ } else {
	441	+ render();
	442	+ }
334	443	});
335	444	});
336	445
337	446	$('body').on('visualizer:render:specificchart:start', function(event, v){
		@@ -339,18 +448,23 @@
339	448	gv = google.visualization;
340	449	renderSpecificChart(v.id, v.chart);
341	450	});
342	451
	452	+ $('body').on('visualizer:render:currentchart:update', function(event, v){
	453	+ renderChart('canvas');
	454	+ });
	455	+
343	456	// front end actions
	457	+ // 'image' is also called from the library
344	458	$('body').on('visualizer:action:specificchart', function(event, v){
	459	+ var id = v.id;
	460	+ if(typeof rendered_charts[id] === 'undefined'){
	461	+ return;
	462	+ }
	463	+ var arr = id.split('-');
	464	+ var img = __visualizer_chart_images[ arr[0] + '-' + arr[1] ];
345	465	switch(v.action){
346	466	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	467	// for charts that have no rendered image defined, we print the data instead.
354	468	var html = v.data;
355	469	if(img !== ''){
356	470	html = "<html><body><img src='" + img + "' /></body></html>";
		@@ -355,8 +469,20 @@
355	469	if(img !== ''){
356	470	html = "<html><body><img src='" + img + "' /></body></html>";
357	471	}
358	472	$('body').trigger('visualizer:action:specificchart:defaultprint', {data: html});
	473	+ break;
	474	+ case 'image':
	475	+ if(img !== ''){
	476	+ var $a = $("<a>"); // jshint ignore:line
	477	+ $a.attr("href", img);
	478	+ $("body").append($a);
	479	+ $a.attr("download", v.dataObj.name);
	480	+ $a[0].click();
	481	+ $a.remove();
	482	+ }else{
	483	+ console.warn("No image generated");
	484	+ }
359	485	break;
360	486	}
361	487	});
362	488