- use getPage for site dialog

- add events and users dialog and backend
- add some values to preferences/settings dialog
- more migration of backend to new query api

pandora/event/managers.py

@@ -3,14 +3,73 @@
 
 from django.db.models import Q, Manager
 
+def parseCondition(condition, user):
+    k = condition.get('key', 'name')
+    k = {
+        'user': 'user__username',
+    }.get(k, k)
+    v = condition['value']
+    op = condition.get('operator')
+    if not op:
+        op = '='
+    if op.startswith('!'):
+        op = op[1:]
+        exclude = True
+    else:
+        exclude = False
+
+    key = '%s%s' % (k, {
+        '==': '__iexact',
+        '^': '__istartswith',
+        '$': '__iendswith',
+    }.get(op,'__icontains'))
+
+    key = str(key)
+    if exclude:
+        q = ~Q(**{k: v})
+    else:
+        q = Q(**{k: v})
+    return q
+
+def parseConditions(conditions, operator, user):
+    '''
+    conditions: [
+    ],
+    operator: "&"
+    '''
+    conn = []
+    for condition in conditions:
+        if 'conditions' in condition:
+            q = parseConditions(condition['conditions'],
+                             condition.get('operator', '&'), user)
+            if q:
+                conn.append(q)
+            pass
+        else:
+            if condition.get('value', '') != '' or \
+               condition.get('operator', '') == '=':
+                conn.append(parseCondition(condition, user))
+    if conn:
+        q = conn[0]
+        for c in conn[1:]:
+            if operator == '|':
+                q = q | c
+            else:
+                q = q & c
+        return q
+    return None
 
 class EventManager(Manager):
 
     def get_query_set(self):
         return super(EventManager, self).get_query_set()
 
-    def find(self, q=''):
+    def find(self, data, user):
         qs = self.get_query_set()
-        if q:
-            qs = qs.filter(Q(name_find__icontains=q))
+        query = data.get('query', {})
+        conditions = parseConditions(query.get('conditions', []),
+                                     query.get('operator', '&'),
+                                     user)
+        if conditions:
+            qs = qs.filter(conditions)
         return qs

pandora/event/views.py

@@ -6,8 +6,10 @@ from ox.utils import json
 from ox.django.decorators import login_required_json
 from ox.django.shortcuts import render_to_json_response, get_object_or_404_json, json_response
 
-import models
 from api.actions import actions
+from item import utils
+
+import models
 
 
 @login_required_json
@@ -88,6 +90,33 @@ def removeEvent(request):
     return render_to_json_response(response)
 actions.register(removeEvent, cache=False)
 
+def parse_query(data, user):
+    query = {}
+    query['range'] = [0, 100]
+    query['sort'] = [{'key':'name', 'operator':'+'}]
+    for key in ('keys', 'group', 'list', 'range', 'sort', 'query'):
+        if key in data:
+            query[key] = data[key]
+    query['qs'] = models.Event.objects.find(query, user)
+    if 'itemQuery' in data:
+        item_query = models.Item.objects.find({'query': data['itemQuery']}, user)
+        query['qs'] = query['qs'].filter(items__in=item_query)
+    return query
+
+def order_query(qs, sort):
+    order_by = []
+    for e in sort:
+        operator = e['operator']
+        if operator != '-':
+            operator = ''
+        key = {
+            'name': 'name_sort',
+        }.get(e['key'], e['key'])
+        order = '%s%s' % (operator, key)
+        order_by.append(order)
+    if order_by:
+        qs = qs.order_by(*order_by, nulls_last=True)
+    return qs
 
 def findEvents(request):
     '''
@@ -126,11 +155,30 @@ Positions
                    https://wiki.0x2620.org/wiki/pandora/QuerySyntax
             ids:  ids of events for which positions are required
     '''
-    data = json.loads(request.POST['data'])
     response = json_response(status=200, text='ok')
-    response['data']['events'] = []
-    #FIXME: add coordinates to limit search
-    for p in models.Event.objects.find(data['query']):
-        response['data']['events'].append(p.json())
+
+    data = json.loads(request.POST['data'])
+    query = parse_query(data, request.user)
+    qs = query['qs']
+    if 'keys' in data:
+        qs = qs[query['range'][0]:query['range'][1]]
+        response['data']['items'] = [p.json(request.user) for p in qs]
+    elif 'position' in query:
+        ids = [i.get_id() for i in qs]
+        data['conditions'] = data['conditions'] + {
+            'value': data['position'],
+            'key': query['sort'][0]['key'],
+            'operator': '^'
+        }
+        query = parse_query(data, request.user)
+        qs = order_query(query['qs'], query['sort'])
+        if qs.count() > 0:
+            response['data']['position'] = utils.get_positions(ids, [qs[0].itemId])[0]
+    elif 'positions' in data:
+        ids = [i.get_id() for i in qs]
+        response['data']['positions'] = utils.get_positions(ids, data['positions'])
+    else:
+        response['data']['items'] = qs.count()
+
     return render_to_json_response(response)
 actions.register(findEvents)