| @@ -117,9 +117,9 @@ | ||
| 117 | 117 | default: |
| 118 | 118 | return; |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - if (series[0] && (series[0].type === 'date' || series[0].type === 'datetime')) { | |
| 121 | + if (series[0] && (series[0].type === 'date' || series[0].type === 'datetime' || series[0].type === 'timeofday')) { | |
| 122 | 122 | axis = false; |
| 123 | 123 | switch (chart.type) { |
| 124 | 124 | case 'line': |
| 125 | 125 | case 'area': |
| @@ -188,9 +188,9 @@ | ||
| 188 | 188 | i = parseInt(i); |
| 189 | 189 | if (!series[i + 1]) { |
| 190 | 190 | continue; |
| 191 | 191 | } |
| 192 | - v.format_data(table, series[i + 1].type, settings.series[i].format, i + 1); | |
| 192 | + v.format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1); | |
| 193 | 193 | } |
| 194 | 194 | break; |
| 195 | 195 | default: |
| 196 | 196 | for (i = 0; i < settings.series.length; i++) { |
| @@ -196,14 +196,14 @@ | ||
| 196 | 196 | for (i = 0; i < settings.series.length; i++) { |
| 197 | 197 | if (!series[i + 1]) { |
| 198 | 198 | continue; |
| 199 | 199 | } |
| 200 | - v.format_data(table, series[i + 1].type, settings.series[i].format, i + 1); | |
| 200 | + v.format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1); | |
| 201 | 201 | } |
| 202 | 202 | break; |
| 203 | 203 | } |
| 204 | 204 | } else if (chart.type === 'pie' && settings.format && settings.format !== '') { |
| 205 | - v.format_data(table, 'number', settings.format, 1); | |
| 205 | + v.format_data(id, table, 'number', settings.format, 1); | |
| 206 | 206 | } |
| 207 | 207 | v.override(settings); |
| 208 | 208 | |
| 209 | 209 | g.visualization.events.addListener(render, 'ready', function () { |
| @@ -219,9 +219,9 @@ | ||
| 219 | 219 | |
| 220 | 220 | render.draw(table, settings); |
| 221 | 221 | }; |
| 222 | 222 | |
| 223 | - v.format_data = function(table, type, format, index) { | |
| 223 | + v.format_data = function(id, table, type, format, index) { | |
| 224 | 224 | if (!format || format === '') { |
| 225 | 225 | return; |
| 226 | 226 | } |
| 227 | 227 | |
| @@ -239,8 +239,12 @@ | ||
| 239 | 239 | |
| 240 | 240 | if (formatter) { |
| 241 | 241 | formatter.format(table, index); |
| 242 | 242 | } |
| 243 | + | |
| 244 | + var arr = id.split('-'); | |
| 245 | + jQuery('body').trigger('visualizer:format:chart', {id: parseInt(arr[1]), data: table, column: index}); | |
| 246 | + | |
| 243 | 247 | }; |
| 244 | 248 | |
| 245 | 249 | v.override = function(settings) { |
| 246 | 250 | if (settings.manual) { |
