github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-06 13:11:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix history table sorting by play duration

Browse source
This commit is contained in:
JonnyWong16 2023-04-13 15:17:22 -07:00
parent 2921c1fc30
commit b0921b5f4a
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
7 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
data/interfaces/default/history.html
View file

@ -84,7 +84,7 @@
<th align="left" id="started">Started</th> <th align="left" id="started">Started</th>
<th align="left" id="paused_counter">Paused</th> <th align="left" id="paused_counter">Paused</th>
<th align="left" id="stopped">Stopped</th> <th align="left" id="stopped">Stopped</th>
<th align="left" id="duration">Duration</th> <th align="left" id="play_duration">Duration</th>
<th align="left" id="percent_complete"></th> <th align="left" id="percent_complete"></th>
</tr> </tr>
</thead> </thead>

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

@ -32,7 +32,7 @@
<th align="left" id="started">Started</th> <th align="left" id="started">Started</th>
<th align="left" id="paused_counter">Paused</th> <th align="left" id="paused_counter">Paused</th>
<th align="left" id="stopped">Stopped</th> <th align="left" id="stopped">Stopped</th>
<th align="left" id="duration">Duration</th> <th align="left" id="play_duration">Duration</th>
<th align="left" id="percent_complete"></th> <th align="left" id="percent_complete"></th>
</tr> </tr>
</thead> </thead>

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

@ -692,7 +692,7 @@ DOCUMENTATION :: END
<th align="left" id="started">Started</th> <th align="left" id="started">Started</th>
<th align="left" id="paused_counter">Paused</th> <th align="left" id="paused_counter">Paused</th>
<th align="left" id="stopped">Stopped</th> <th align="left" id="stopped">Stopped</th>
<th align="left" id="duration">Duration</th> <th align="left" id="play_duration">Duration</th>
<th align="left" id="percent_complete"></th> <th align="left" id="percent_complete"></th>
</tr> </tr>
</thead> </thead>

4
data/interfaces/default/js/tables/history_table.js
View file

@ -247,7 +247,7 @@ history_table_options = {
}, },
{ {
"targets": [11], "targets": [11],
"data": "duration", "data": "play_duration",
"render": function (data, type, full) { "render": function (data, type, full) {
if (data !== null) { if (data !== null) {
return Math.round(moment.duration(data, 'seconds').as('minutes')) + ' mins'; return Math.round(moment.duration(data, 'seconds').as('minutes')) + ' mins';
@ -529,7 +529,7 @@ function childTableFormat(rowData) {
'<th align="left" id="started">Started</th>' + '<th align="left" id="started">Started</th>' +
'<th align="left" id="paused_counter">Paused</th>' + '<th align="left" id="paused_counter">Paused</th>' +
'<th align="left" id="stopped">Stopped</th>' + '<th align="left" id="stopped">Stopped</th>' +
'<th align="left" id="duration">Duration</th>' + '<th align="left" id="play_duration">Duration</th>' +
'<th align="left" id="percent_complete"></th>' + '<th align="left" id="percent_complete"></th>' +
'</tr>' + '</tr>' +
'</thead>' + '</thead>' +

2
data/interfaces/default/library.html
View file

@ -248,7 +248,7 @@ DOCUMENTATION :: END
<th align="left" id="started">Started</th> <th align="left" id="started">Started</th>
<th align="left" id="paused_counter">Paused</th> <th align="left" id="paused_counter">Paused</th>
<th align="left" id="stopped">Stopped</th> <th align="left" id="stopped">Stopped</th>
<th align="left" id="duration">Duration</th> <th align="left" id="play_duration">Duration</th>
<th align="left" id="percent_complete"></th> <th align="left" id="percent_complete"></th>
</tr> </tr>
</thead> </thead>

2
data/interfaces/default/user.html
View file

@ -212,7 +212,7 @@ DOCUMENTATION :: END
<th align="left" id="started">Started</th> <th align="left" id="started">Started</th>
<th align="left" id="paused_counter">Paused</th> <th align="left" id="paused_counter">Paused</th>
<th align="left" id="stopped">Stopped</th> <th align="left" id="stopped">Stopped</th>
<th align="left" id="duration">Duration</th> <th align="left" id="play_duration">Duration</th>
<th align="left" id="percent_complete"></th> <th align="left" id="percent_complete"></th>
</tr> </tr>
</thead> </thead>

3
plexpy/datafactory.py
View file

@ -308,7 +308,8 @@ class DataFactory(object):
'date': item['date'], 'date': item['date'],
'started': item['started'], 'started': item['started'],
'stopped': item['stopped'], 'stopped': item['stopped'],
'duration': item['play_duration'], 'duration': item['play_duration'], # Keep for backwards compatibility
'play_duration': item['play_duration'],
'paused_counter': item['paused_counter'], 'paused_counter': item['paused_counter'],
'user_id': item['user_id'], 'user_id': item['user_id'],
'user': item['user'], 'user': item['user'],