← All changes | js/render-google.js +135 -19 3.1.2 → 3.4.2 View file →

		@@ -7,8 +7,10 @@
7	7
8	8	(function($) {
9	9	var gv;
10	10	var all_charts, objects;
	11	+ // so that we know which charts belong to our library.
	12	+ var rendered_charts = [];
11	13
12	14	function renderChart(id) {
13	15	renderSpecificChart(id, all_charts[id]);
14	16	}
		@@ -18,8 +20,9 @@
18	20
19	21	if(chart.library !== 'google'){
20	22	return;
21	23	}
	24	+ rendered_charts[id] = 'yes';
22	25
23	26	series = chart.series;
24	27	data = chart.data;
25	28	settings = chart.settings;
		@@ -51,8 +54,42 @@
51	54	settings['animation']['startup'] = true;
52	55	settings['animation']['duration'] = parseInt(settings['animation']['duration']);
53	56	}
54	57
	58	+ // mark roles for series that have specified a role
	59	+ // and then remove them from future processing
	60	+ // and also adjust the indices of the series array so that
	61	+ // the ones with a role are ignored
	62	+ // e.g. if there are 6 columns (0-5) out of which 1, 3 and 5 are annotations
	63	+ // the final series will only include 0, 2, 4 (reindexed as 0, 1, 2)
	64	+ if (settings.series) {
	65	+ var adjusted_series = [];
	66	+ for (i = 0; i < settings.series.length; i++) {
	67	+ if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
	68	+ continue;
	69	+ }
	70	+ if(typeof settings.series[i].role !== 'undefined'){
	71	+ table.setColumnProperty(i + 1, 'role', settings.series[i].role);
	72	+ if(settings.series[i].role === '') {
	73	+ adjusted_series.push(settings.series[i]);
	74	+ }
	75	+ }
	76	+ }
	77	+ if(adjusted_series.length > 0){
	78	+ settings.series = adjusted_series;
	79	+ }
	80	+ }
	81	+
	82	+ if ( settings['explorer_enabled'] && settings['explorer_enabled'] == 'true' ) { // jshint ignore:line
	83	+ var $explorer = {};
	84	+ $explorer['keepInBounds'] = true;
	85	+
	86	+ if ( settings['explorer_actions'] ) {
	87	+ $explorer['actions'] = settings['explorer_actions'];
	88	+ }
	89	+ settings['explorer'] = $explorer;
	90	+ }
	91	+
55	92	switch (chart.type) {
56	93	case 'pie':
57	94	if (settings.slices) {
58	95	for (i in settings.slices) {
		@@ -93,8 +130,11 @@
93	130	}
94	131	break;
95	132	case 'gauge':
96	133	break;
	134	+ case 'bubble':
	135	+ settings.sortBubblesBySize = settings.sortBubblesBySize ? settings.sortBubblesBySize == 1 : false; // jshint ignore:line
	136	+ break;
97	137	case 'timeline':
98	138	settings['timeline'] = [];
99	139	settings['timeline']['groupByRowLabel'] = settings['groupByRowLabel'] ? true : false;
100	140	settings['timeline']['colorByRowLabel'] = settings['colorByRowLabel'] ? true : false;
		@@ -131,8 +171,9 @@
131	171	case 'area':
132	172	case 'scatter':
133	173	case 'candlestick':
134	174	case 'column':
	175	+ case 'combo':
135	176	axis = settings.hAxis;
136	177	break;
137	178	case 'bar':
138	179	axis = settings.vAxis;
		@@ -172,16 +213,30 @@
172	213
173	214	for (i = 0; i < data.length; i++) {
174	215	row = [];
175	216	for (j = 0; j < series.length; j++) {
176		- if (series[j].type === 'date' || series[j].type === 'datetime') {
177		- date = new Date(data[i][j]);
178		- data[i][j] = null;
179		- if (Object.prototype.toString.call(date) === "[object Date]") {
180		- if (!isNaN(date.getTime())) {
181		- data[i][j] = date;
182		- }
183		- }
	217	+ switch(series[j].type) {
	218	+ case 'string':
	219	+ if(data[i][j] === ''){
	220	+ data[i][j] = null;
	221	+ }
	222	+ break;
	223	+ case 'boolean':
	224	+ if (typeof data[i][j] === 'string'){
	225	+ data[i][j] = data[i][j] === 'true';
	226	+ }
	227	+ break;
	228	+ case 'date':
	229	+ // fall-through.
	230	+ case 'datetime':
	231	+ date = new Date(data[i][j]);
	232	+ data[i][j] = null;
	233	+ if (Object.prototype.toString.call(date) === "[object Date]") {
	234	+ if (!isNaN(date.getTime())) {
	235	+ data[i][j] = date;
	236	+ }
	237	+ }
	238	+ break;
184	239	}
185	240	row.push(data[i][j]);
186	241	}
187	242	table.addRow(row);
		@@ -199,9 +254,9 @@
199	254	}
200	255	break;
201	256	default:
202	257	for (i = 0; i < settings.series.length; i++) {
203		- if (!series[i + 1]) {
	258	+ if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
204	259	continue;
205	260	}
206	261	format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1);
207	262	}
		@@ -209,12 +264,18 @@
209	264	}
210	265	} else if (chart.type === 'pie' && settings.format && settings.format !== '') {
211	266	format_data(id, table, 'number', settings.format, 1);
212	267	}
	268	+
	269	+ if(settings.hAxis && series[0]) {
	270	+ format_data(id, table, series[0].type, settings.hAxis.format, 0);
	271	+ }
	272	+
213	273	override(settings);
214	274
215	275	gv.events.addListener(render, 'ready', function () {
216	276	var arr = id.split('-');
	277	+ __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = '';
217	278	try{
218	279	var img = render.getImageURI();
219	280	__visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img;
220	281	$('body').trigger('visualizer:render:chart', {id: arr[1], image: img});
		@@ -222,8 +283,10 @@
222	283	console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]);
223	284	}
224	285	});
225	286
	287	+ $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table});
	288	+
226	289	render.draw(table, settings);
227	290	}
228	291
229	292	function format_data(id, table, type, format, index) {
		@@ -269,16 +332,8 @@
269	332	renderChart(id);
270	333	}
271	334	}
272	335
273		- if(typeof visualizer !== 'undefined'){
274		- // called while updating the chart.
275		- visualizer.update = function(){
276		- renderChart('canvas');
277		- };
278		- }
279		-
280		-
281	336	var resizeTimeout;
282	337
283	338	$(document).ready(function() {
284	339	$(window).resize(function() {
		@@ -288,9 +343,9 @@
288	343
289	344	resizeHiddenContainers(true);
290	345	});
291	346
292		- $(window).load(function(){
	347	+ $(window).on('load', function(){
293	348	resizeHiddenContainers(true);
294	349	});
295	350
296	351	function resizeHiddenContainers(everytime){
		@@ -319,10 +374,47 @@
319	374	});
320	375	}
321	376
322	377	$('body').on('visualizer:render:chart:start', function(event, v){
	378	+ var $chart_types = ['corechart', 'geochart', 'gauge', 'table', 'timeline'];
	379	+ if(v.is_front == true){ // jshint ignore:line
	380	+ // check what all chart types to load.
	381	+ $chart_types = [];
	382	+ $.each(v.charts, function(i, c){
	383	+ var $type = c.type;
	384	+ switch($type){
	385	+ case 'bar':
	386	+ case 'column':
	387	+ case 'line':
	388	+ case 'area':
	389	+ case 'stepped area':
	390	+ case 'bubble':
	391	+ case 'pie':
	392	+ case 'donut':
	393	+ case 'combo':
	394	+ case 'candlestick':
	395	+ case 'histogram':
	396	+ case 'scatter':
	397	+ case 'bubble':
	398	+ $type = 'corechart';
	399	+ break;
	400	+ case 'geo':
	401	+ $type = 'geochart';
	402	+ break;
	403	+ case 'dataTable':
	404	+ case 'polarArea':
	405	+ case 'radar':
	406	+ $type = null;
	407	+ break;
	408	+ }
	409	+ if($type != null){
	410	+ $chart_types.push($type);
	411	+ }
	412	+ });
	413	+ }
	414	+
323	415	objects = {};
324		- google.charts.load("current", {packages: ["corechart", "geochart", "gauge", "table", "timeline"], mapsApiKey: v.map_api_key, 'language' : v.language});
	416	+ google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language});
325	417	google.charts.setOnLoadCallback(function() {
326	418	gv = google.visualization;
327	419	all_charts = v.charts;
328	420	render();
		@@ -332,7 +424,31 @@
332	424	$('body').on('visualizer:render:specificchart:start', function(event, v){
333	425	objects = {};
334	426	gv = google.visualization;
335	427	renderSpecificChart(v.id, v.chart);
	428	+ });
	429	+
	430	+ $('body').on('visualizer:render:currentchart:update', function(event, v){
	431	+ renderChart('canvas');
	432	+ });
	433	+
	434	+ // front end actions
	435	+ $('body').on('visualizer:action:specificchart', function(event, v){
	436	+ switch(v.action){
	437	+ case 'print':
	438	+ var id = v.id;
	439	+ if(typeof rendered_charts[id] === 'undefined'){
	440	+ return;
	441	+ }
	442	+ var arr = id.split('-');
	443	+ var img = __visualizer_chart_images[ arr[0] + '-' + arr[1] ];
	444	+ // for charts that have no rendered image defined, we print the data instead.
	445	+ var html = v.data;
	446	+ if(img !== ''){
	447	+ html = "<html><body><img src='" + img + "' /></body></html>";
	448	+ }
	449	+ $('body').trigger('visualizer:action:specificchart:defaultprint', {data: html});
	450	+ break;
	451	+ }
336	452	});
337	453
338	454	})(jQuery);