github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-14 02:26:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Change default sig of human duration function

Browse source
This commit is contained in:
JonnyWong16 2020-10-08 19:53:32 -07:00
commit 881f37f731
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
5 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
data/interfaces/default/info.html
View file

@ -373,8 +373,7 @@ DOCUMENTATION :: END
</div>
<div class="summary-content-details-tag">
% if data['duration']:
<% sig = 'dhms' if cast_to_int(data['duration']) < 300000 else 'dhm' %>
Runtime <strong> <span id="runtime" data-sig="${sig}">${data['duration']}</span></strong>
Runtime <strong> <span id="runtime">${data['duration']}</span></strong>
% endif
</div>
<div class="summary-content-details-tag">
@ -933,7 +932,7 @@ DOCUMENTATION :: END
var airdate = $("#airdate")
var runtime = $("#runtime")
airdate.html(moment(airdate.text()).format('MMM DD, YYYY'));
runtime.html(humanDuration(runtime.text(), runtime.data('sig')));
runtime.html(humanDuration(runtime.text()));
$('div.art-face').animate({ opacity: 0.2 }, { duration: 1000 });
$('#channel-icon').popover({

6
data/interfaces/default/js/script.js
View file

@ -354,7 +354,7 @@ function millisecondsToMinutes(ms, roundToMinute) {
}
}
function humanDuration(ms, sig='dhms', units='ms') {
function humanDuration(ms, sig='dhm', units='ms', return_seconds=300000) {
var factors = {
d: 86400000,
h: 3600000,
@ -367,6 +367,10 @@ function humanDuration(ms, sig='dhms', units='ms') {
var d, h, m, s;
if (ms > 0) {
if (return_seconds && ms < return_seconds) {
sig = 'dhms'
}
ms = ms * factors[units];
h = ms % factors['d'];