| @@ -3,10 +3,8 @@ | ||
| 3 | 3 | /* global console */ |
| 4 | 4 | |
| 5 | 5 | // this will store the images for each chart rendered. |
| 6 | 6 | var __visualizer_chart_images = []; |
| 7 | -var chartWrapperError = []; | |
| 8 | -var isResizeRequest = false; | |
| 9 | 7 | |
| 10 | 8 | (function($) { |
| 11 | 9 | var gv; |
| 12 | 10 | var all_charts, objects; |
| @@ -13,52 +11,27 @@ | ||
| 13 | 11 | // so that we know which charts belong to our library. |
| 14 | 12 | var rendered_charts = []; |
| 15 | 13 | |
| 16 | 14 | function renderChart(id) { |
| 17 | - | |
| 18 | - if ( ! all_charts || 0 === Object.keys( all_charts ).length ) { | |
| 19 | - return; | |
| 20 | - } | |
| 21 | - | |
| 22 | 15 | var chart = all_charts[id]; |
| 23 | 16 | var hasAnnotation = false; |
| 24 | - | |
| 25 | - if ( ! chart ) { | |
| 26 | - return; | |
| 17 | + if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined'){ | |
| 18 | + hasAnnotation = chart.series.length - chart.settings.series.length > 1; | |
| 27 | 19 | } |
| 28 | - | |
| 29 | 20 | // re-render the chart only if it doesn't have annotations and it is on the front-end |
| 30 | 21 | // this is to prevent the chart from showing "All series on a given axis must be of the same data type" during resize. |
| 31 | - // remember, some charts do not support annotations so they should not be included in this. | |
| 32 | - var no_annotation_charts = ['tabular', 'timeline', 'gauge', 'geo', 'bubble', 'candlestick']; | |
| 33 | - if ( undefined !== chart.settings && undefined !== chart.settings.series && undefined === chart.settings.series.length ) { | |
| 34 | - var chartSeries = []; | |
| 35 | - var chartSeriesValue = Object.values( chart.settings.series ); | |
| 36 | - $.each( Object.keys( chart.settings.series ), function( index, element ) { | |
| 37 | - chartSeries[element] = chartSeriesValue[index]; | |
| 38 | - } ); | |
| 39 | - chart.settings.series = chartSeries; | |
| 22 | + if(hasAnnotation){ | |
| 23 | + return; | |
| 40 | 24 | } |
| 41 | - if(id !== 'canvas' && typeof chart.series !== 'undefined' && typeof chart.settings.series !== 'undefined' && ! no_annotation_charts.includes(chart.type) ) { | |
| 42 | - hasAnnotation = chart.series.length - chart.settings.series.length > 1; | |
| 43 | - } | |
| 44 | - | |
| 45 | - if(! hasAnnotation){ | |
| 46 | - renderSpecificChart(id, all_charts[id]); | |
| 47 | - } | |
| 25 | + renderSpecificChart(id, all_charts[id]); | |
| 48 | 26 | } |
| 49 | 27 | |
| 50 | 28 | function renderSpecificChart(id, chart) { |
| 51 | 29 | var render, container, series, data, table, settings, i, j, row, date, axis, property, format, formatter; |
| 52 | 30 | |
| 53 | - if( chart.library !== 'google' ) { | |
| 31 | + if(chart.library !== 'google'){ | |
| 54 | 32 | return; |
| 55 | 33 | } |
| 56 | - | |
| 57 | - // Bail if the chart is already rendered or is being rendered. | |
| 58 | - if ( ! window.isResizeRequest && ( $('#' + id).hasClass('visualizer-chart-loaded') || ( 'canvas' !== id && $('#' + id).children( ':not(.loader, style)' ).length > 0 ) ) ) { | |
| 59 | - return; | |
| 60 | - } | |
| 61 | 34 | rendered_charts[id] = 'yes'; |
| 62 | 35 | |
| 63 | 36 | series = chart.series; |
| 64 | 37 | data = chart.data; |
| @@ -72,11 +45,8 @@ | ||
| 72 | 45 | |
| 73 | 46 | render = objects[id] || null; |
| 74 | 47 | if (!render) { |
| 75 | 48 | switch (chart.type) { |
| 76 | - case "tabular": | |
| 77 | - render = "Table"; | |
| 78 | - break; | |
| 79 | 49 | case "gauge": |
| 80 | 50 | case "table": |
| 81 | 51 | case "timeline": |
| 82 | 52 | render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1); |
| @@ -85,43 +55,9 @@ | ||
| 85 | 55 | render = chart.type.charAt(0).toUpperCase() + chart.type.slice(1) + 'Chart'; |
| 86 | 56 | break; |
| 87 | 57 | } |
| 88 | 58 | |
| 89 | - var controlWrapperElement = document.getElementById( "control_wrapper_" + id ) || null; | |
| 90 | - var withControlMode = ( typeof settings.controls !== 'undefined' && '' !== settings.controls.controlType ) && controlWrapperElement ? true : false; | |
| 91 | - | |
| 92 | - if ( $( controlWrapperElement ).hasClass( 'no-filter' ) ) { | |
| 93 | - withControlMode = false; | |
| 94 | - } | |
| 95 | - if ( withControlMode ) { | |
| 96 | - // Chart wrapper. | |
| 97 | - render = new gv.ChartWrapper({ | |
| 98 | - 'chartType': render, | |
| 99 | - 'containerId': id, | |
| 100 | - }); | |
| 101 | - // Chart dashboard wrapper. | |
| 102 | - var chartWrapperElement = document.getElementById( "chart_wrapper_" + id ) || null; | |
| 103 | - var chartWrapper = new gv.Dashboard( chartWrapperElement ); | |
| 104 | - | |
| 105 | - // Error Handler. | |
| 106 | - gv.events.addListener(chartWrapper, 'error', function ( err ) { | |
| 107 | - if ( chartWrapperError.length === 0 ) { | |
| 108 | - chartWrapperError.push( err ); | |
| 109 | - gv.errors.removeError( err.id ); | |
| 110 | - var chartContainer = $( chartWrapperElement ).find( '.visualizer-front' ); | |
| 111 | - if ( chartContainer && chartContainer.is(':visible')) { | |
| 112 | - if (chartContainer.parents('div').next( '#sidebar' ).length === 0) { | |
| 113 | - chartContainer.addClass( 'visualizer-chart-loaded' ).addClass( 'visualizer-cw-error' ); | |
| 114 | - $( chartWrapperElement ).addClass( 'visualizer-cw-error' ); | |
| 115 | - } | |
| 116 | - } | |
| 117 | - } else { | |
| 118 | - gv.errors.removeError( err.id ); | |
| 119 | - } | |
| 120 | - } ); | |
| 121 | - } else { | |
| 122 | - render = new gv[render](container); | |
| 123 | - } | |
| 59 | + render = new gv[render](container); | |
| 124 | 60 | } |
| 125 | 61 | |
| 126 | 62 | if (settings['animation'] && parseInt(settings['animation']['startup']) === 1) |
| 127 | 63 | { |
| @@ -127,13 +63,8 @@ | ||
| 127 | 63 | { |
| 128 | 64 | settings['animation']['startup'] = true; |
| 129 | 65 | settings['animation']['duration'] = parseInt(settings['animation']['duration']); |
| 130 | 66 | } |
| 131 | - if ( settings['controls'] ) { | |
| 132 | - settings['controls']['ui']['allowMultiple'] = 'true' === settings['controls']['allowMultiple'] ? true : false; | |
| 133 | - settings['controls']['ui']['allowTyping'] = 'true' === settings['controls']['allowTyping'] ? true : false; | |
| 134 | - settings['controls']['ui']['showRangeValues'] = 'true' === settings['controls']['showRangeValues'] ? true : false; | |
| 135 | - } | |
| 136 | 67 | |
| 137 | 68 | // mark roles for series that have specified a role |
| 138 | 69 | // and then remove them from future processing |
| 139 | 70 | // and also adjust the indices of the series array so that |
| @@ -139,11 +70,8 @@ | ||
| 139 | 70 | // and also adjust the indices of the series array so that |
| 140 | 71 | // the ones with a role are ignored |
| 141 | 72 | // e.g. if there are 6 columns (0-5) out of which 1, 3 and 5 are annotations |
| 142 | 73 | // the final series will only include 0, 2, 4 (reindexed as 0, 1, 2) |
| 143 | - | |
| 144 | - // this will capture all the series indexes that became annotations. | |
| 145 | - var series_annotations = []; | |
| 146 | 74 | if (settings.series) { |
| 147 | 75 | var adjusted_series = []; |
| 148 | 76 | for (i = 0; i < settings.series.length; i++) { |
| 149 | 77 | if (!series[i + 1] || typeof settings.series[i] === 'undefined') { |
| @@ -152,10 +80,8 @@ | ||
| 152 | 80 | if(typeof settings.series[i].role !== 'undefined'){ |
| 153 | 81 | table.setColumnProperty(i + 1, 'role', settings.series[i].role); |
| 154 | 82 | if(settings.series[i].role === '') { |
| 155 | 83 | adjusted_series.push(settings.series[i]); |
| 156 | - }else{ | |
| 157 | - series_annotations.push(i); | |
| 158 | 84 | } |
| 159 | 85 | } |
| 160 | 86 | } |
| 161 | 87 | if(adjusted_series.length > 0){ |
| @@ -207,9 +133,8 @@ | ||
| 207 | 133 | settings['region'] = 'world'; |
| 208 | 134 | } |
| 209 | 135 | break; |
| 210 | 136 | case 'table': |
| 211 | - case 'tabular': | |
| 212 | 137 | if (parseInt(settings['pagination']) !== 1) |
| 213 | 138 | { |
| 214 | 139 | delete settings['pageSize']; |
| 215 | 140 | } |
| @@ -219,9 +144,9 @@ | ||
| 219 | 144 | case 'bubble': |
| 220 | 145 | settings.sortBubblesBySize = settings.sortBubblesBySize ? settings.sortBubblesBySize == 1 : false; // jshint ignore:line |
| 221 | 146 | break; |
| 222 | 147 | case 'timeline': |
| 223 | - settings['timeline'] = {}; | |
| 148 | + settings['timeline'] = []; | |
| 224 | 149 | settings['timeline']['groupByRowLabel'] = settings['groupByRowLabel'] ? true : false; |
| 225 | 150 | settings['timeline']['colorByRowLabel'] = settings['colorByRowLabel'] ? true : false; |
| 226 | 151 | settings['timeline']['showRowLabels'] = settings['showRowLabels'] ? true : false; |
| 227 | 152 | if(settings['singleColor'] !== '') { |
| @@ -277,12 +202,8 @@ | ||
| 277 | 202 | |
| 278 | 203 | delete axis.viewWindow[property]; |
| 279 | 204 | } |
| 280 | 205 | } |
| 281 | - | |
| 282 | - if(settings.hAxis && settings.hAxis.format == ''){ | |
| 283 | - settings.hAxis.format = 'yyyy-MM-dd'; | |
| 284 | - } | |
| 285 | 206 | } |
| 286 | 207 | |
| 287 | 208 | if(settings.hAxis){ |
| 288 | 209 | if(settings.hAxis.textStyle && settings.hAxis.textStyle !== ''){ |
| @@ -316,17 +237,9 @@ | ||
| 316 | 237 | break; |
| 317 | 238 | case 'date': |
| 318 | 239 | // fall-through. |
| 319 | 240 | case 'datetime': |
| 320 | - if (typeof data[i][j] === 'string') { | |
| 321 | - var dateParse = Date.parse(data[i][j].replace(/-/g, '/')); | |
| 322 | - if ( isNaN( dateParse ) ) { | |
| 323 | - dateParse = Date.parse(data[i][j]); | |
| 324 | - } | |
| 325 | - date = new Date( dateParse ); | |
| 326 | - } else if(typeof data[i][j] === 'object') { | |
| 327 | - date = data[i][j]; | |
| 328 | - } | |
| 241 | + date = new Date(data[i][j]); | |
| 329 | 242 | data[i][j] = null; |
| 330 | 243 | if (Object.prototype.toString.call(date) === "[object Date]") { |
| 331 | 244 | if (!isNaN(date.getTime())) { |
| 332 | 245 | data[i][j] = date; |
| @@ -341,9 +254,8 @@ | ||
| 341 | 254 | |
| 342 | 255 | if (settings.series) { |
| 343 | 256 | switch(chart.type){ |
| 344 | 257 | case 'table': |
| 345 | - case 'tabular': | |
| 346 | 258 | for(i in settings.series){ |
| 347 | 259 | i = parseInt(i); |
| 348 | 260 | if (!series[i + 1]) { |
| 349 | 261 | continue; |
| @@ -355,17 +267,9 @@ | ||
| 355 | 267 | for (i = 0; i < settings.series.length; i++) { |
| 356 | 268 | if (!series[i + 1] || typeof settings.series[i] === 'undefined') { |
| 357 | 269 | continue; |
| 358 | 270 | } |
| 359 | - var seriesIndexToUse = i + 1; | |
| 360 | - | |
| 361 | - // if an annotation "swallowed" a series, use the following one. | |
| 362 | - if(series_annotations.includes(i)){ | |
| 363 | - seriesIndexToUse++; | |
| 364 | - } | |
| 365 | - if ( series[seriesIndexToUse] ) { | |
| 366 | - format_data(id, table, series[seriesIndexToUse].type, settings.series[i].format, seriesIndexToUse); | |
| 367 | - } | |
| 271 | + format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1); | |
| 368 | 272 | } |
| 369 | 273 | break; |
| 370 | 274 | } |
| 371 | 275 | } else if (chart.type === 'pie' && settings.format && settings.format !== '') { |
| @@ -379,69 +283,21 @@ | ||
| 379 | 283 | override(settings); |
| 380 | 284 | |
| 381 | 285 | gv.events.addListener(render, 'ready', function () { |
| 382 | 286 | var arr = id.split('-'); |
| 383 | - render = typeof render.getChart !== 'undefined' ? render.getChart() : render; | |
| 384 | 287 | __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = ''; |
| 385 | - | |
| 386 | - if (render.container && $(render.container).is(':visible')) { | |
| 387 | - if ($(render.container).parents('div').next( '#sidebar' ).length === 0) { | |
| 388 | - $(render.container).addClass( 'visualizer-chart-loaded' ); | |
| 389 | - } | |
| 390 | - } | |
| 391 | - | |
| 392 | 288 | try{ |
| 393 | - if ( typeof render.getImageURI !== 'undefined' ) { | |
| 394 | - var img = render.getImageURI(); | |
| 395 | - __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img; | |
| 396 | - $('body').trigger('visualizer:render:chart', {id: arr[1], image: img}); | |
| 397 | - if ( $( '#chart-img' ).length ) { | |
| 398 | - $( '#chart-img' ).val( img ); | |
| 399 | - } | |
| 400 | - } | |
| 289 | + var img = render.getImageURI(); | |
| 290 | + __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img; | |
| 291 | + $('body').trigger('visualizer:render:chart', {id: arr[1], image: img}); | |
| 401 | 292 | }catch(error){ |
| 402 | - var canvas = document.getElementById( 'canvas' ); | |
| 403 | - domtoimage.toPng(canvas) | |
| 404 | - .then(function ( img ) { | |
| 405 | - __visualizer_chart_images[ arr[0] + '-' + arr[1] ] = img; | |
| 406 | - $('body').trigger('visualizer:render:chart', {id: arr[1], image: img}); | |
| 407 | - if ( $( '#chart-img' ).length ) { | |
| 408 | - $( '#chart-img' ).val( img ); | |
| 409 | - } | |
| 410 | - }) | |
| 411 | - .catch(function (error) { | |
| 412 | - console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]); | |
| 413 | - }); | |
| 293 | + console.warn('render.getImageURI not defined for ' + arr[0] + '-' + arr[1]); | |
| 414 | 294 | } |
| 415 | 295 | }); |
| 416 | 296 | |
| 417 | - if ( withControlMode ) { | |
| 418 | - // alert( chart.is_library_page ); | |
| 419 | - // Create a control wrapper, passing some options. | |
| 420 | - var controlWrapper = new gv.ControlWrapper( { | |
| 421 | - containerId: 'control_wrapper_' + id, | |
| 422 | - controlType: settings.controls.controlType, | |
| 423 | - 'options': settings.controls, | |
| 424 | - } ); | |
| 297 | + $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table}); | |
| 425 | 298 | |
| 426 | - $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table}); | |
| 427 | - render.setOptions(settings); | |
| 428 | - chartWrapper.bind(controlWrapper, render); | |
| 429 | - chartWrapper.draw(table); | |
| 430 | - | |
| 431 | - gv.events.addListener(controlWrapper, 'ready', function ( err ) { | |
| 432 | - if ( 'vertical' === settings.controls.ui.orientation ) { | |
| 433 | - if ( 'canvas' === id ) { | |
| 434 | - jQuery( '#' + id ).addClass( 'vz-vertical' ); | |
| 435 | - } | |
| 436 | - } else { | |
| 437 | - jQuery( '#' + id ).removeClass( 'vz-vertical' ); | |
| 438 | - } | |
| 439 | - }); | |
| 440 | - } else { | |
| 441 | - $('body').trigger('visualizer:chart:settings:extend', {id: id, chart: chart, settings: settings, data: table}); | |
| 442 | - render.draw(table, settings); | |
| 443 | - } | |
| 299 | + render.draw(table, settings); | |
| 444 | 300 | } |
| 445 | 301 | |
| 446 | 302 | function format_data(id, table, type, format, index) { |
| 447 | 303 | if (!format || format === '') { |
| @@ -482,12 +338,9 @@ | ||
| 482 | 338 | } |
| 483 | 339 | |
| 484 | 340 | function render() { |
| 485 | 341 | for (var id in (all_charts || {})) { |
| 486 | - var chartElement = document.getElementById( id ); | |
| 487 | - if (chartElement && chartElement.offsetParent) { | |
| 488 | - renderChart(id); | |
| 489 | - } | |
| 342 | + renderChart(id); | |
| 490 | 343 | } |
| 491 | 344 | } |
| 492 | 345 | |
| 493 | 346 | var resizeTimeout; |
| @@ -492,29 +345,17 @@ | ||
| 492 | 345 | |
| 493 | 346 | var resizeTimeout; |
| 494 | 347 | |
| 495 | 348 | $(document).ready(function() { |
| 496 | - $(window).resize(function(e) { | |
| 349 | + $(window).resize(function() { | |
| 497 | 350 | clearTimeout(resizeTimeout); |
| 498 | - window.isResizeRequest = 'undefined' !== typeof e.originalEvent ? true : false; | |
| 499 | 351 | resizeTimeout = setTimeout(render, 100); |
| 500 | 352 | }); |
| 501 | 353 | |
| 502 | 354 | resizeHiddenContainers(true); |
| 503 | - | |
| 504 | - if ( $( '.visualizer-hidden-container' ).length ) { | |
| 505 | - setInterval( function() { | |
| 506 | - $( '.visualizer-hidden-container' ).find(".visualizer-front:not(.visualizer-chart-loaded)").resize(); | |
| 507 | - }, 500 ); | |
| 508 | - } | |
| 509 | - | |
| 510 | - window.addEventListener( 'orientationchange', function() { | |
| 511 | - $( '.visualizer-chart-loaded' ).removeClass( 'visualizer-chart-loaded' ).resize(); | |
| 512 | - }, false); | |
| 513 | 355 | }); |
| 514 | 356 | |
| 515 | 357 | $(window).on('load', function(){ |
| 516 | - $( '.visualizer-front:not(.visualizer-chart-loaded)' ).resize(); | |
| 517 | 358 | resizeHiddenContainers(true); |
| 518 | 359 | }); |
| 519 | 360 | |
| 520 | 361 | function resizeHiddenContainers(everytime){ |
| @@ -568,12 +409,8 @@ | ||
| 568 | 409 | break; |
| 569 | 410 | case 'geo': |
| 570 | 411 | $type = 'geochart'; |
| 571 | 412 | break; |
| 572 | - case 'tabular': | |
| 573 | - case 'table': | |
| 574 | - $type = 'table'; | |
| 575 | - break; | |
| 576 | 413 | case 'dataTable': |
| 577 | 414 | case 'polarArea': |
| 578 | 415 | case 'radar': |
| 579 | 416 | $type = null; |
| @@ -585,24 +422,14 @@ | ||
| 585 | 422 | }); |
| 586 | 423 | } |
| 587 | 424 | |
| 588 | 425 | objects = {}; |
| 589 | - if ( 'object' === typeof google ) { | |
| 590 | - $chart_types.push( 'controls' ); | |
| 591 | - google.load( 'visualization', '51', {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language, | |
| 592 | - callback: function () { | |
| 593 | - gv = google.visualization; | |
| 594 | - all_charts = v.charts; | |
| 595 | - if(v.is_front == true && typeof v.id !== 'undefined'){ // jshint ignore:line | |
| 596 | - if ( document.getElementById( v.id ).offsetParent !== null ) { | |
| 597 | - renderChart(v.id); | |
| 598 | - } | |
| 599 | - } else { | |
| 600 | - render(); | |
| 601 | - } | |
| 602 | - } | |
| 603 | - }); | |
| 604 | - } | |
| 426 | + google.charts.load("current", {packages: $chart_types, mapsApiKey: v.map_api_key, 'language' : v.language}); | |
| 427 | + google.charts.setOnLoadCallback(function() { | |
| 428 | + gv = google.visualization; | |
| 429 | + all_charts = v.charts; | |
| 430 | + render(); | |
| 431 | + }); | |
| 605 | 432 | }); |
| 606 | 433 | |
| 607 | 434 | $('body').on('visualizer:render:specificchart:start', function(event, v){ |
| 608 | 435 | objects = {}; |
| @@ -646,15 +473,5 @@ | ||
| 646 | 473 | break; |
| 647 | 474 | } |
| 648 | 475 | }); |
| 649 | 476 | |
| 650 | - var timer = 0; | |
| 651 | - $( document ).on( 'input', '.series-linewidth', function() { | |
| 652 | - var seriesLineWidth = $( this ); | |
| 653 | - clearTimeout( timer ); | |
| 654 | - timer = setTimeout( function() { | |
| 655 | - if ( seriesLineWidth.val() != '' && seriesLineWidth.val() <= 0 ) { | |
| 656 | - seriesLineWidth.val( '0.1' ); | |
| 657 | - } | |
| 658 | - }, 700 ); | |
| 659 | - } ); | |
| 660 | 477 | })(jQuery); |
