| @@ -213,8 +213,14 @@ | ||
| 213 | 213 | } |
| 214 | 214 | } else if (chart.type === 'pie' && settings.format && settings.format !== '') { |
| 215 | 215 | format_data(id, table, 'number', settings.format, 1); |
| 216 | 216 | } |
| 217 | + | |
| 218 | + | |
| 219 | + if(settings.hAxis) { | |
| 220 | + format_data(id, table, series[0].type, settings.hAxis.format, 0); | |
| 221 | + } | |
| 222 | + | |
| 217 | 223 | override(settings); |
| 218 | 224 | |
| 219 | 225 | gv.events.addListener(render, 'ready', function () { |
| 220 | 226 | var arr = id.split('-'); |
| @@ -227,8 +233,10 @@ | ||
| 227 | 233 | console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]); |
| 228 | 234 | } |
| 229 | 235 | }); |
| 230 | 236 | |
| 237 | + $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table}); | |
| 238 | + | |
| 231 | 239 | render.draw(table, settings); |
| 232 | 240 | } |
| 233 | 241 | |
| 234 | 242 | function format_data(id, table, type, format, index) { |
| @@ -324,10 +332,46 @@ | ||
| 324 | 332 | }); |
| 325 | 333 | } |
| 326 | 334 | |
| 327 | 335 | $('body').on('visualizer:render:chart:start', function(event, v){ |
| 336 | + var $chart_types = ['corechart', 'geochart', 'gauge', 'table', 'timeline']; | |
| 337 | + if(v.is_front == true){ // jshint ignore:line | |
| 338 | + // check what all chart types to load. | |
| 339 | + $chart_types = []; | |
| 340 | + $.each(v.charts, function(i, c){ | |
| 341 | + var $type = c.type; | |
| 342 | + switch($type){ | |
| 343 | + case 'bar': | |
| 344 | + case 'column': | |
| 345 | + case 'line': | |
| 346 | + case 'area': | |
| 347 | + case 'stepped area': | |
| 348 | + case 'bubble': | |
| 349 | + case 'pie': | |
| 350 | + case 'donut': | |
| 351 | + case 'combo': | |
| 352 | + case 'candlestick': | |
| 353 | + case 'histogram': | |
| 354 | + case 'scatter': | |
| 355 | + $type = 'corechart'; | |
| 356 | + break; | |
| 357 | + case 'geo': | |
| 358 | + $type = 'geochart'; | |
| 359 | + break; | |
| 360 | + case 'dataTable': | |
| 361 | + case 'polarArea': | |
| 362 | + case 'radar': | |
| 363 | + $type = null; | |
| 364 | + break; | |
| 365 | + } | |
| 366 | + if($type != null){ | |
| 367 | + $chart_types.push($type); | |
| 368 | + } | |
| 369 | + }); | |
| 370 | + } | |
| 371 | + | |
| 328 | 372 | objects = {}; |
| 329 | - google.charts.load("current", {packages: ["corechart", "geochart", "gauge", "table", "timeline"], mapsApiKey: v.map_api_key, 'language' : v.language}); | |
| 373 | + google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language}); | |
| 330 | 374 | google.charts.setOnLoadCallback(function() { |
| 331 | 375 | gv = google.visualization; |
| 332 | 376 | all_charts = v.charts; |
| 333 | 377 | render(); |
