chg: [eventFiltering] First version on the event filter tool

pull/4076/head
mokaddem 2019-02-01 11:47:10 +01:00
parent f8efffe830
commit 3911ce567d
1 changed files with 47 additions and 40 deletions

View File

@ -136,36 +136,36 @@ function triggerEventFilteringTool(clicked) {
5: "Inherit",
}
},
{
"input": "radio",
"type": "integer",
"operators": [
"equal",
],
"unique": true,
"id": "taggedAttributes",
"label": "Tags",
"values": {
0: "Both",
1: "Untagged Attribute",
2: "Tagged Attribute"
}
},
{
"input": "radio",
"type": "integer",
"operators": [
"equal",
],
"unique": true,
"id": "galaxyAttachedAttributes",
"label": "Galaxies",
"values": {
0: "Both",
1: "Attributes without galaxy",
2: "Attributes with galaxy"
}
},
// {
// "input": "radio",
// "type": "integer",
// "operators": [
// "equal",
// ],
// "unique": true,
// "id": "taggedAttributes",
// "label": "Tags",
// "values": {
// 0: "Both",
// 1: "Untagged Attribute",
// 2: "Tagged Attribute"
// }
// },
// {
// "input": "radio",
// "type": "integer",
// "operators": [
// "equal",
// ],
// "unique": true,
// "id": "galaxyAttachedAttributes",
// "label": "Galaxies",
// "values": {
// 0: "Both",
// 1: "Attributes without galaxy",
// 2: "Attributes with galaxy"
// }
// },
// {
// "input": "select",
// "type": "string",
@ -274,16 +274,16 @@ function triggerEventFilteringTool(clicked) {
operator: 'in',
value: <?php echo isset($filters['distribution']) ? json_encode($filters['distribution']) : json_encode(array(0, 1, 2, 3, 4, 5)); ?>
},
{
field: 'taggedAttributes',
id: 'taggedAttributes',
value: <?php echo isset($filters['taggedAttributes']) ? $filters['taggedAttributes'] : 0; ?>
},
{
field: 'galaxyAttachedAttributes',
id: 'galaxyAttachedAttributes',
value: <?php echo isset($filters['galaxyAttachedAttributes']) ? $filters['galaxyAttachedAttributes'] : 0; ?>
},
// {
// field: 'taggedAttributes',
// id: 'taggedAttributes',
// value: <?php echo isset($filters['taggedAttributes']) ? $filters['taggedAttributes'] : 0; ?>
// },
// {
// field: 'galaxyAttachedAttributes',
// id: 'galaxyAttachedAttributes',
// value: <?php echo isset($filters['galaxyAttachedAttributes']) ? $filters['galaxyAttachedAttributes'] : 0; ?>
// },
// {
// condition: 'OR',
// not: false,
@ -345,6 +345,13 @@ function triggerEventFilteringTool(clicked) {
$('#eventFilteringQBLinkCopy').off('click').on('click', function() {
copyToClipboard($('#eventFilteringQBLinkInput'));
});
$ev.off('keyup').on('keyup', function(e){
if(e.keyCode == 13) {
$('#eventFilteringQBSubmit').trigger("click");
}
});
updateURL();
function recursiveInject(result, rules) {