Filter history by local and remote plays #1961
+215
−104
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -216,6 +216,17 @@ | |||||
| </button> | ||||||
| </div> | ||||||
| % endif | ||||||
| <div class="btn-group" data-toggle="buttons" id="network_type-selection"> | ||||||
| <label class="btn btn-dark btn-filter"> | ||||||
| <input type="checkbox" name="network_type-filter" id="history-network_type-lan" value="lan" autocomplete="off"><i class="fa fa-server"></i> Local Play | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| </label> | ||||||
| <label class="btn btn-dark btn-filter"> | ||||||
| <input type="checkbox" name="network_type-filter" id="history-network_type-wan" value="wan" autocomplete="off"><i class="fa fa-globe"></i> Remote Play | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| </label> | ||||||
| <label class="btn btn-dark btn-filter"> | ||||||
| <input type="checkbox" name="network_type-filter" id="history-network_type-cellular" value="cellular" autocomplete="off"><i class="fa fa-broadcast-tower"></i> Mobile Play | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| </label> | ||||||
| </div> | ||||||
| <div class="btn-group" data-toggle="buttons" id="transcode_decision-selection"> | ||||||
| <label class="btn btn-dark btn-filter"> | ||||||
| <input type="checkbox" name="transcode_decision-filter" id="history-transcode_decision-direct_play" value="direct play" autocomplete="off"><i class="fa fa-play-circle"></i> Direct Play | ||||||
|
|
@@ -567,7 +578,7 @@ <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4> | |||||
|
|
||||||
| $(".inactive-library-tooltip").tooltip(); | ||||||
|
|
||||||
| function loadHistoryTable(network_type, transcode_decision) { | ||||||
| // Build watch history table | ||||||
| history_table_options.ajax = { | ||||||
| url: 'get_history', | ||||||
|
|
@@ -577,6 +588,7 @@ <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4> | |||||
| json_data: JSON.stringify( d ), | ||||||
| section_id: section_id, | ||||||
| user_id: "${history_user_id}", | ||||||
| network_type: network_type, | ||||||
| transcode_decision: transcode_decision | ||||||
| }; | ||||||
| } | ||||||
|
|
@@ -590,24 +602,38 @@ <h4 class="modal-title" id="myModalLabel">Confirm Delete</h4> | |||||
|
|
||||||
| $('#transcode_decision-selection').on('change', function () { | ||||||
| $('#transcode_decision-selection > label').removeClass('active'); | ||||||
| let selected_filter = $('input[name=transcode_decision-filter]:checked', '#transcode_decision-selection'); | ||||||
| $(selected_filter).closest('label').addClass('active'); | ||||||
| transcode_decision = $(selected_filter).map(function () { return $(this).val(); }).get().join(','); | ||||||
| setLocalStorage('library_' + section_id + 'history_transcode_decision', transcode_decision); | ||||||
| history_table.draw(); | ||||||
| }); | ||||||
|
|
||||||
| $('#network_type-selection').on('change', function () { | ||||||
| $('#network_type-selection > label').removeClass('active'); | ||||||
| let selected_filter = $('input[name=network_type-filter]:checked', '#network_type-selection'); | ||||||
| $(selected_filter).closest('label').addClass('active'); | ||||||
| network_type = $(selected_filter).map(function () { return $(this).val(); }).get().join(','); | ||||||
| setLocalStorage('library_' + section_id + 'history_network_type', network_type); | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| history_table.draw(); | ||||||
| }); | ||||||
| } | ||||||
|
|
||||||
| $('#nav-tabs-history').on('shown.bs.tab', function() { | ||||||
| if (typeof(history_table) === 'undefined') { | ||||||
| const transcode_decision = getLocalStorage('library_' + section_id + 'history_transcode_decision', 'all'); | ||||||
|
There was a problem hiding this comment.
Suggested change
Also fix |
||||||
| $.each(transcode_decision.split(','), function (i, item) { | ||||||
| let history_transcode_decision = $('#history-transcode_decision-' + item.replace(' ', '_')); | ||||||
| history_transcode_decision.prop('checked', true); | ||||||
| history_transcode_decision.closest('label').addClass('active'); | ||||||
| }); | ||||||
| const network_type = getLocalStorage('library_' + section_id + 'history_network_type', ''); | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| $.each(network_type.split(','), function (i, item) { | ||||||
| let history_network_type = $('#history-network_type-' + item); | ||||||
| history_network_type.prop('checked', true); | ||||||
| history_network_type.closest('label').addClass('active'); | ||||||
| }); | ||||||
| loadHistoryTable(network_type, transcode_decision); | ||||||
| } | ||||||
| }); | ||||||
|
|
||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.