|
166 | 166 | } |
167 | 167 | }); |
168 | 168 |
|
169 | | - var xValues = []; |
170 | | - var rows = $('tbody:first tr', table); |
| 169 | + var xValues = []; |
| 170 | + var callablePoint = getCallable(table, 'graph-point-callback'); |
| 171 | + var isGraphDatetime = $table.data('graph-xaxis-type') == 'datetime'; |
| 172 | + |
| 173 | + var rows = $('tbody:first tr', table); |
171 | 174 | rows.each(function(indexRow, row) { |
172 | 175 | if (!!$(row).data('graph-skip')) { |
173 | 176 | return; |
174 | 177 | } |
175 | | - |
| 178 | + |
176 | 179 | var tds = $('td', row); |
177 | 180 | tds.each(function(indexTd, td) { |
178 | 181 | var cellValue; |
|
196 | 199 |
|
197 | 200 | var dataGraphX = $(td).data('graph-x'); |
198 | 201 |
|
199 | | - if ($table.data('graph-xaxis-type') == 'datetime') { |
| 202 | + if (isGraphDatetime) { |
200 | 203 | dataGraphX = $('td', $(row)).first().text(); |
201 | 204 | var dateInfos = dataGraphX.split('-'); |
202 | 205 | var date = parseDate(dateInfos); |
203 | 206 | dataGraphX = date.getTime() - date.getTimezoneOffset()*60*1000; |
204 | 207 | } |
205 | | - |
| 208 | + |
206 | 209 | var serieDataItem = { |
207 | 210 | name: typeof $(td).data('graph-name') != 'undefined' ? $(td).data('graph-name') : rawCellValue, |
208 | 211 | y: cellValue, |
209 | 212 | x: dataGraphX //undefined if no x defined in table |
210 | 213 | }; |
211 | | - |
212 | | - var callablePoint = getCallable(table, 'graph-point-callback'); |
| 214 | + |
213 | 215 | if (callablePoint) { |
214 | 216 | serieDataItem.events = { |
215 | 217 | click: function () { |
216 | 218 | return callablePoint(this); |
217 | 219 | } |
218 | 220 | }; |
219 | 221 | } |
220 | | - |
| 222 | + |
221 | 223 | if (column.graphType === 'pie') { |
222 | 224 | if ($(td).data('graph-item-highlight')) { |
223 | 225 | serieDataItem.sliced = 1; |
224 | 226 | } |
225 | 227 | } |
226 | | - |
| 228 | + |
227 | 229 | if (typeof $(td).data('graph-item-color') != 'undefined') { |
228 | 230 | serieDataItem.color = $(td).data('graph-item-color'); |
229 | 231 | } |
|
0 commit comments