Commit de02ae98669759c0da26a5b059730976faca9197
1 parent
f6e8207e44
Exists in
master
minor
Showing
1 changed file
with
9 additions
and
9 deletions
Show diff stats
app/partials/analytics/analytics.controller.js
| ... | ... | @@ -153,7 +153,7 @@ angular.module('acufuel') |
| 153 | 153 | return d[0]; |
| 154 | 154 | }, |
| 155 | 155 | y: function(d) { |
| 156 | - return d[1] ; | |
| 156 | + return d[1] / 100 ; | |
| 157 | 157 | }, |
| 158 | 158 | average: function(d) { |
| 159 | 159 | return d.mean / 100; |
| ... | ... | @@ -168,8 +168,8 @@ angular.module('acufuel') |
| 168 | 168 | axisLabel: '', |
| 169 | 169 | |
| 170 | 170 | tickFormat: function(d) { |
| 171 | - // return d3.time.format('%m - %y')(new Date(d)) | |
| 172 | - return d3.time.format('%b \-%y')(new Date(d)) | |
| 171 | + return d3.time.format('%m/%d/%y')(new Date(d)) | |
| 172 | + //return d3.time.format('%b \-%y')(new Date(d)) | |
| 173 | 173 | }, |
| 174 | 174 | showMaxMin: false, |
| 175 | 175 | staggerLabels: true |
| ... | ... | @@ -288,7 +288,7 @@ angular.module('acufuel') |
| 288 | 288 | return d[0]; |
| 289 | 289 | }, |
| 290 | 290 | y: function(d) { |
| 291 | - return d[1] ; | |
| 291 | + return d[1] / 100; | |
| 292 | 292 | }, |
| 293 | 293 | average: function(d) { |
| 294 | 294 | return d.mean / 100; |
| ... | ... | @@ -303,8 +303,8 @@ angular.module('acufuel') |
| 303 | 303 | axisLabel: '', |
| 304 | 304 | |
| 305 | 305 | tickFormat: function(d) { |
| 306 | - // return d3.time.format('%m - %y')(new Date(d)) | |
| 307 | - return d3.time.format('%b \-%y')(new Date(d)) | |
| 306 | + return d3.time.format('%d / %m / %y')(new Date(d)) | |
| 307 | + // return d3.time.format('%b \-%y')(new Date(d)) | |
| 308 | 308 | }, |
| 309 | 309 | showMaxMin: false, |
| 310 | 310 | staggerLabels: true |
| ... | ... | @@ -362,7 +362,7 @@ angular.module('acufuel') |
| 362 | 362 | return d[0]; |
| 363 | 363 | }, |
| 364 | 364 | y: function(d) { |
| 365 | - return d[1] ; | |
| 365 | + return d[1] / 100 ; | |
| 366 | 366 | }, |
| 367 | 367 | average: function(d) { |
| 368 | 368 | return d.mean / 100; |
| ... | ... | @@ -377,8 +377,8 @@ angular.module('acufuel') |
| 377 | 377 | axisLabel: '', |
| 378 | 378 | |
| 379 | 379 | tickFormat: function(d) { |
| 380 | - // return d3.time.format('%m - %y')(new Date(d)) | |
| 381 | - return d3.time.format('%b \-%y')(new Date(d)) | |
| 380 | + return d3.time.format('%d / %m / %y')(new Date(d)) | |
| 381 | + //return d3.time.format('%b \-%y')(new Date(d)) | |
| 382 | 382 | }, |
| 383 | 383 | showMaxMin: false, |
| 384 | 384 | staggerLabels: true | ... | ... |