stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

webui: standardise duration filter options between epg and autorec

Browse source
This commit is contained in:
Ian 2014-06-28 16:34:44 +01:00
parent 3fd4452a7e
commit bc9c8189d8
2 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/webui/static/app/dvr.js
View file

@ -589,7 +589,7 @@ tvheadend.autoreceditor = function() {
return tvheadend.durationLookupRange(v); return tvheadend.durationLookupRange(v);
}, },
editor: durationCombo = new Ext.form.ComboBox({ editor: durationCombo = new Ext.form.ComboBox({
store: tvheadend.DurationNamesStore, store: tvheadend.DurationStore,
mode: 'local', mode: 'local',
valueField: 'minvalue', valueField: 'minvalue',
displayField: 'label', displayField: 'label',
@ -700,10 +700,10 @@ tvheadend.autoreceditor = function() {
if (record.data.minduration == "") if (record.data.minduration == "")
record.set('maxduration',""); record.set('maxduration',"");
else { else {
var index = tvheadend.DurationNamesStore.find('minvalue', record.data.minduration); var index = tvheadend.DurationStore.find('minvalue', record.data.minduration);
if (index !== -1) if (index !== -1)
record.set('maxduration', tvheadend.DurationNamesStore.getById(index).data.maxvalue); record.set('maxduration', tvheadend.DurationStore.getById(index).data.maxvalue);
} }
} }
}); });

36
src/webui/static/app/epg.js
View file

@ -46,10 +46,10 @@ tvheadend.channelLookupName = function(key) {
tvheadend.durationLookupRange = function(value) { tvheadend.durationLookupRange = function(value) {
durationString = ""; durationString = "";
var index = tvheadend.DurationNamesStore.find('minvalue', value); var index = tvheadend.DurationStore.find('minvalue', value);
if (index !== -1) if (index !== -1)
var durationString = tvheadend.DurationNamesStore.getById(index).data.label; var durationString = tvheadend.DurationStore.getById(index).data.label;
return durationString; return durationString;
}; };
@ -58,11 +58,11 @@ tvheadend.durationLookupRange = function(value) {
// Store for autorec dialog and for autorec rules in the DVR grid // Store for autorec dialog and for autorec rules in the DVR grid
tvheadend.DurationNamesStore = new Ext.data.SimpleStore({ tvheadend.DurationStore = new Ext.data.SimpleStore({
storeId: 'durationnames', storeId: 'durationnames',
idIndex: 0, idIndex: 0,
fields: ['identifier','label','minvalue','maxvalue'], fields: ['identifier','label','minvalue','maxvalue'],
data: [['0', '(No duration filter)',"",""], data: [['0', '(Clear filter)',"",""],
['1','00:00:01 - 00:15:00',1, 900], ['1','00:00:01 - 00:15:00',1, 900],
['2','00:15:01 - 00:30:00', 901, 1800], ['2','00:15:01 - 00:30:00', 901, 1800],
['3','00:30:01 - 01:30:00', 1801, 5400], ['3','00:30:01 - 01:30:00', 1801, 5400],
@ -70,19 +70,6 @@ tvheadend.DurationNamesStore = new Ext.data.SimpleStore({
['5','03:00:01 - No maximum', 10801, 9999999]] ['5','03:00:01 - No maximum', 10801, 9999999]]
}); });
// Store for the main duration filter combobox on the EPG tab
tvheadend.DurationStore = new Ext.data.SimpleStore({
storeId: 'durationlabels',
fields: ['label','minvalue', 'maxvalue'],
data: [['Very short (up to 15 minutes)',1, 900],
['Short (from 15 up to 30 minutes)', 901, 1800],
['Medium (from 30 up to 90 minutes)', 1801, 5400],
['Long (from 90 minutes up to 3 hours)', 5401, 10800],
['Very long (more than 3 hours)', 10801, 9999999]]
});
//
tvheadend.epgDetails = function(event) { tvheadend.epgDetails = function(event) {
var content = ''; var content = '';
@ -515,9 +502,16 @@ tvheadend.epg = function() {
epgFilterDuration.on('select', function(c, r) { epgFilterDuration.on('select', function(c, r) {
if (epgStore.baseParams.minduration !== r.data.minvalue) { if (epgStore.baseParams.minduration !== r.data.minvalue) {
epgStore.baseParams.minduration = r.data.minvalue; if (r.data.identifier == 0) {
epgStore.baseParams.maxduration = r.data.maxvalue; delete epgStore.baseParams.minduration;
epgStore.reload(); delete epgStore.baseParams.maxduration;
epgFilterDuration.setValue("");
} else
{
epgStore.baseParams.minduration = r.data.minvalue;
epgStore.baseParams.maxduration = r.data.maxvalue;
}
epgStore.reload();
} }
}); });
@ -563,7 +557,7 @@ tvheadend.epg = function() {
epgFilterDuration, epgFilterDuration,
'-', '-',
{ {
text: 'Reset', text: 'Reset All',
handler: epgQueryClear handler: epgQueryClear
}, },
'->', '->',