github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 12:59:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix bug on graph tooltips where some values were incorrectly converted to dates.

Browse source 
Format the header on the history modal to human readable date.
This commit is contained in:
Tim 2015-08-09 11:46:34 +02:00
commit 9564c5ed81
2 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
data/interfaces/default/graphs.html
View file

@ -190,7 +190,7 @@
success: function(data) { success: function(data) {
var dateArray = []; var dateArray = [];
for (var i = 0; i < data.categories.length; i++) { for (var i = 0; i < data.categories.length; i++) {
dateArray.push(moment(data.categories[i]).valueOf()); dateArray.push(moment(data.categories[i], 'YYYY-MM-DD').valueOf());
} }
hc_plays_by_day_options.yAxis.min = 0; hc_plays_by_day_options.yAxis.min = 0;
hc_plays_by_day_options.xAxis.categories = dateArray; hc_plays_by_day_options.xAxis.categories = dateArray;
@ -264,7 +264,7 @@
success: function(data) { success: function(data) {
var dateArray = []; var dateArray = [];
for (var i = 0; i < data.categories.length; i++) { for (var i = 0; i < data.categories.length; i++) {
dateArray.push(moment(data.categories[i]).valueOf()); dateArray.push(moment(data.categories[i], 'YYYY-MM').valueOf());
} }
hc_plays_by_month_options.yAxis.min = 0; hc_plays_by_month_options.yAxis.min = 0;
hc_plays_by_month_options.xAxis.categories = dateArray; hc_plays_by_month_options.xAxis.categories = dateArray;
@ -311,8 +311,8 @@
hc_plays_by_month_options.yAxis.labels.formatter = yaxis_format; hc_plays_by_month_options.yAxis.labels.formatter = yaxis_format;
tooltip_format = function() { tooltip_format = function() {
if (moment(this.x).isValid()) { if (moment(this.x, 'X').isValid() && (this.x > 946684800)) {
var s = '<b>'+ moment(this.x).format("ddd MMM D") +'</b>'; var s = '<b>'+ moment(this.x, 'X').format("ddd MMM D") +'</b>';
} else { } else {
var s = '<b>'+ this.x +'</b>'; var s = '<b>'+ this.x +'</b>';
} }
@ -344,8 +344,8 @@
hc_plays_by_month_options.yAxis.labels.formatter = yaxis_format; hc_plays_by_month_options.yAxis.labels.formatter = yaxis_format;
tooltip_format = function() { tooltip_format = function() {
if (moment(this.x).isValid()) { if (moment(this.x, 'X').isValid() && (this.x > 946684800)) {
var s = '<b>'+ moment(this.x).format("ddd MMM D") +'</b>'; var s = '<b>'+ moment(this.x, 'X').format("ddd MMM D") +'</b>';
} else { } else {
var s = '<b>'+ this.x +'</b>'; var s = '<b>'+ this.x +'</b>';
} }
@ -356,12 +356,7 @@
return s; return s;
} }
stack_labels_format = function() { stack_labels_format = function() {
if (moment(this.total).isValid()) {
console.log(this);
var s = moment.duration(this.total, 'seconds').format("H [hrs] m [mins]"); var s = moment.duration(this.total, 'seconds').format("H [hrs] m [mins]");
} else {
var s = this.total;
}
return s; return s;
} }
hc_plays_by_day_options.tooltip.formatter = tooltip_format; hc_plays_by_day_options.tooltip.formatter = tooltip_format;

3
data/interfaces/default/history_table_modal.html
View file

@ -5,7 +5,7 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
<h4 class="modal-title" id="myModalLabel"> <h4 class="modal-title" id="myModalLabel">
<strong><span id="modal_header_ip_address"> <strong><span id="modal_header_ip_address">
<i class="fa fa-history"></i> History for ${data} <i class="fa fa-history"></i> History for <span id="date-header">${data}</span>
</span></strong> </span></strong>
</h4> </h4>
</div> </div>
@ -31,6 +31,7 @@
<script src="interfaces/default/js/tables/history_table_modal.js"></script> <script src="interfaces/default/js/tables/history_table_modal.js"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#date-header').html(moment('${data}','YYYY-MM-DD').format('ddd MMM Do YYYY'));
history_table_modal_options.ajax = { history_table_modal_options.ajax = {
"url": "get_history", "url": "get_history",
type: "post", type: "post",