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

webui: implement filter-specific clear options into autorec grid plus combo cosmetics

Browse source
This commit is contained in:
Ian 2014-06-29 18:08:40 +01:00
parent a7c304a443
commit 88279741c9
3 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/webui/static/app/chconf.js
View file

@ -2,10 +2,8 @@
* Channel tags
*/
insertChannelTagsClearOption = function( scope, records, options ){
var placeholder = scope.getAt(1); //create a 'template' copy of an existing record
placeholder.set('identifier',-1);
placeholder.set('name',"(Clear filter)");
scope.insert(0, placeholder);
var placeholder = Ext.data.Record.create(['identifier', 'name']);
scope.insert(0,new placeholder({identifier: '-1', name: '(Clear filter)'}));
};
tvheadend.channelTags = new Ext.data.JsonStore({
@ -37,10 +35,8 @@ tvheadend.channelrec = new Ext.data.Record.create(
'epg_post_end', 'number']);
insertChannelClearOption = function( scope, records, options ){
var placeholder = scope.getAt(1); //create a 'template' copy of an existing record
placeholder.set('key',-1);
placeholder.set('val',"(Clear filter)");
scope.insert(0, placeholder);
var placeholder = Ext.data.Record.create(['key', 'val']);
scope.insert(0,new placeholder({key: '-1', val: '(Clear filter)'}));
};
tvheadend.channels = new Ext.data.JsonStore({

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

@ -539,7 +539,9 @@ tvheadend.autoreceditor = function() {
valueField: 'key',
store: tvheadend.channels,
mode: 'local',
editable: false,
editable: true,
forceSelection: true,
typeAhead: true,
triggerAction: 'all',
emptyText: 'Only include channel...'
}),
@ -561,7 +563,9 @@ tvheadend.autoreceditor = function() {
displayField: 'name',
store: tvheadend.channelTags,
mode: 'local',
editable: false,
editable: true,
forceSelection: true,
typeAhead: true,
triggerAction: 'all',
emptyText: 'Only include tag...'
})
@ -577,7 +581,9 @@ tvheadend.autoreceditor = function() {
displayField: 'name',
store: tvheadend.ContentGroupStore,
mode: 'local',
editable: false,
editable: true,
forceSelection: true,
typeAhead: true,
triggerAction: 'all',
emptyText: 'Only include content...'
})
@ -593,7 +599,9 @@ tvheadend.autoreceditor = function() {
mode: 'local',
valueField: 'minvalue',
displayField: 'label',
editable: false,
editable: true,
forceSelection: true,
typeAhead: true,
triggerAction: 'all',
id: 'minfield'
})
@ -695,16 +703,26 @@ tvheadend.autoreceditor = function() {
}]});
tvheadend.autorecStore.on('update', function (store, record, operation) {
if (operation == 'edit' && record.isModified('minduration')) {
if (operation == 'edit') {
if (record.isModified('minduration')) {
if (record.data.minduration == "")
record.set('maxduration',"");
else {
var index = tvheadend.DurationStore.find('minvalue', record.data.minduration);
if (record.data.minduration == "")
record.set('maxduration',"");
else {
var index = tvheadend.DurationStore.find('minvalue', record.data.minduration);
if (index !== -1)
record.set('maxduration', tvheadend.DurationStore.getById(index).data.maxvalue);
if (index !== -1)
record.set('maxduration', tvheadend.DurationStore.getById(index).data.maxvalue);
}
}
if (record.isModified('channel') && record.data.channel == -1)
record.set('channel',"");
if (record.isModified('tag') && record.data.tag == '(Clear filter)')
record.set('tag',"");
if (record.isModified('contenttype') && record.data.contenttype == -1)
record.set('contenttype',"");
}
});

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

@ -9,10 +9,8 @@ tvheadend.brands = new Ext.data.JsonStore({
});
insertContentGroupClearOption = function( scope, records, options ){
var placeholder = scope.getAt(1); //create a 'template' copy of an existing record
placeholder.set('code',-1);
placeholder.set('name',"(Clear filter)");
scope.insert(0, placeholder);
var placeholder = Ext.data.Record.create(['code', 'name']);
scope.insert(0,new placeholder({code: '-1', name: '(Clear filter)'}));
};
//WIBNI: might want this store to periodically update
@ -55,8 +53,8 @@ tvheadend.channelLookupName = function(key) {
// NB: 'no max' is defined as 9999999s, or about 3 months...
tvheadend.DurationStore = new Ext.data.SimpleStore({
storeId: 'durationnames',
idIndex: 0,
storeId: 'durationnames',
idIndex: 0,
fields: ['identifier','label','minvalue','maxvalue'],
data: [['-1', '(Clear filter)',"",""],
['1','00:00:01 - 00:15:00',1, 900],
@ -72,11 +70,9 @@ tvheadend.DurationStore = new Ext.data.SimpleStore({
tvheadend.durationLookupRange = function(value) {
durationString = "";
var index = tvheadend.DurationStore.find('minvalue', value);
if (index !== -1)
var durationString = tvheadend.DurationStore.getById(index).data.label;
var durationString = tvheadend.DurationStore.getAt(index).data.label;
return durationString;
};
@ -430,7 +426,6 @@ tvheadend.epg = function() {
editable: true,
forceSelection: true,
triggerAction: 'all',
forceSelection: true,
typeAhead: true,
emptyText: 'Filter channel...',
listeners: {
@ -453,7 +448,6 @@ tvheadend.epg = function() {
editable: true,
forceSelection: true,
triggerAction: 'all',
forceSelection: true,
typeAhead: true,
emptyText: 'Filter tag...',
listeners: {
@ -478,7 +472,6 @@ tvheadend.epg = function() {
editable: true,
forceSelection: true,
triggerAction: 'all',
forceSelection: true,
typeAhead: true,
emptyText: 'Filter content type...',
listeners: {
@ -500,7 +493,6 @@ tvheadend.epg = function() {
editable: true,
forceSelection: true,
triggerAction: 'all',
forceSelection: true,
typeAhead: true,
emptyText: 'Filter duration...',
listeners: {
@ -534,12 +526,12 @@ tvheadend.epg = function() {
};
clearContentGroupFilter = function() {
delete epgStore.baseParams.contenttype;
delete epgStore.baseParams.contenttype;
epgFilterContentGroup.setValue("");
};
clearDurationFilter = function() {
delete epgStore.baseParams.minduration;
delete epgStore.baseParams.minduration;
delete epgStore.baseParams.maxduration;
epgFilterDuration.setValue("");
};
@ -560,41 +552,35 @@ tvheadend.epg = function() {
epgFilterChannels.on('select', function(c, r) {
if (r.data.key == -1)
clearChannelFilter();
else if (epgStore.baseParams.channel !== r.data.key)
epgStore.baseParams.channel = r.data.key;
else if (epgStore.baseParams.channel !== r.data.key)
epgStore.baseParams.channel = r.data.key;
epgStore.reload();
});
epgFilterChannelTags.on('select', function(c, r) {
if (r.data.identifier == -1)
clearChannelTagsFilter();
else if (epgStore.baseParams.tag !== r.data.name)
epgStore.baseParams.tag = r.data.name;
else if (epgStore.baseParams.tag !== r.data.name)
epgStore.baseParams.tag = r.data.name;
epgStore.reload();
});
});
//IH
// TODO - check what gets saved and where, and how we filter out null tages - may happen automatically because there's
// already a null tag. I think this only applies to tags, as they're saved to config
//
// Also, check that the insert method is genuinely inserting and not over-writing the first record.
epgFilterContentGroup.on('select', function(c, r) {
if (r.data.code == -1)
clearContentGroupFilter();
else if (epgStore.baseParams.contenttype !== r.data.code)
epgStore.baseParams.contenttype = r.data.code;
else if (epgStore.baseParams.contenttype !== r.data.code)
epgStore.baseParams.contenttype = r.data.code;
epgStore.reload();
});
epgFilterDuration.on('select', function(c, r) {
if (r.data.identifier == -1)
if (r.data.identifier == -1)
clearDurationFilter();
else if (epgStore.baseParams.minduration !== r.data.minvalue) {
epgStore.baseParams.minduration = r.data.minvalue;
epgStore.baseParams.minduration = r.data.minvalue;
epgStore.baseParams.maxduration = r.data.maxvalue;
}
epgStore.reload();
}
epgStore.reload();
});
epgFilterTitle.on('valid', function(c) {