alberanid/eventman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixes #179: ability to search for a given field with key:value syntax

Browse source
This commit is contained in:
Davide Alberani 2017-04-29 11:31:17 +02:00
parent b7c9883033
commit a6d60a0e10
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
angular_app/js/filters.js vendored
View file

@ -39,7 +39,13 @@ eventManApp.filter('splittedFilter', ['$filter',
return function(inputArray, searchText) { return function(inputArray, searchText) {
var wordArray = searchText ? searchText.toLowerCase().split(/\s+/) : []; var wordArray = searchText ? searchText.toLowerCase().split(/\s+/) : [];
for (var x=0; x < wordArray.length; x++) { for (var x=0; x < wordArray.length; x++) {
inputArray = $filter('filter')(inputArray, wordArray[x]); var filter_item = wordArray[x];
if (filter_item.indexOf(':') != -1) {
var filter_item_split = filter_item.split(':', 2);
filter_item = {};
filter_item[filter_item_split[0]] = filter_item_split[1];
}
inputArray = $filter('filter')(inputArray, filter_item);
} }
return inputArray; return inputArray;
}; };

3
tools/qrcode_reader.py
View file

@ -123,7 +123,8 @@ class Connector():
pass pass
if limit_field: if limit_field:
code = code[:limit_field] code = code[:limit_field]
params = {cfg['event']['field']: code, '_errorMessage': 'code: %s' % code, '_searchFor': code} _searchFor = '%s:%s' % (cfg['event']['field'], code)
params = {cfg['event']['field']: code, '_errorMessage': 'code: %s' % code, '_searchFor': _searchFor}
checkin_url = self.checkin_url + '?' + urllib.parse.urlencode(params) checkin_url = self.checkin_url + '?' + urllib.parse.urlencode(params)
json = convert(dict(self.cfg['actions'])) json = convert(dict(self.cfg['actions']))
req = self.session.put(checkin_url, json=json, timeout=TIMEOUT) req = self.session.put(checkin_url, json=json, timeout=TIMEOUT)