summaryrefslogtreecommitdiff
path: root/archaeological_operations/lookups.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2021-03-19 11:21:04 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2021-03-19 11:21:04 +0100
commitced270d071384046eb3b9a85572dc817c7ef042c (patch)
tree1696a72b2ec46fa34981533484e0d67ec9d14e93 /archaeological_operations/lookups.py
parentbaf29e1bb4b18fb9830956c53f3475db2f828e3f (diff)
downloadIshtar-ced270d071384046eb3b9a85572dc817c7ef042c.tar.bz2
Ishtar-ced270d071384046eb3b9a85572dc817c7ef042c.zip
Format - black: operation
Diffstat (limited to 'archaeological_operations/lookups.py')
-rw-r--r--archaeological_operations/lookups.py55
1 files changed, 27 insertions, 28 deletions
diff --git a/archaeological_operations/lookups.py b/archaeological_operations/lookups.py
index 66bcf0831..0b590374e 100644
--- a/archaeological_operations/lookups.py
+++ b/archaeological_operations/lookups.py
@@ -6,70 +6,69 @@ from django.db.models import Q
from django.utils.encoding import force_text
from django.utils.html import escape
-from archaeological_operations.models import Operation, ArchaeologicalSite, \
- Parcel, CulturalAttributionType
+from archaeological_operations.models import (
+ Operation,
+ ArchaeologicalSite,
+ Parcel,
+ CulturalAttributionType,
+)
-@register('operation')
+@register("operation")
class OperationLookup(LookupChannel):
model = Operation
def get_query(self, q, request):
query = Q()
- for term in q.strip().split(' '):
- subquery = (
- Q(cached_label__icontains=term)
- )
+ for term in q.strip().split(" "):
+ subquery = Q(cached_label__icontains=term)
query &= subquery
- return self.model.objects.filter(query).order_by('cached_label')[:20]
+ return self.model.objects.filter(query).order_by("cached_label")[:20]
def format_item_display(self, item):
return "<span class='ajax-label'>%s</span>" % item.cached_label
-@register('archaeological_site')
+@register("archaeological_site")
class ArchaeologicalSiteLookup(LookupChannel):
model = ArchaeologicalSite
def get_query(self, q, request):
query = Q()
- for term in q.strip().split(' '):
- subquery = (
- Q(reference__icontains=term) |
- Q(name__icontains=term)
- )
+ for term in q.strip().split(" "):
+ subquery = Q(reference__icontains=term) | Q(name__icontains=term)
query &= subquery
- return self.model.objects.filter(query).order_by('reference',
- 'name')[:20]
+ return self.model.objects.filter(query).order_by("reference", "name")[:20]
def format_item_display(self, item):
return "<span class='ajax-label'>%s</span>".format(item)
-@register('parcel')
+@register("parcel")
class ParcelLookup(LookupChannel):
model = Parcel
def get_query(self, q, request):
query = Q()
- for term in q.strip().split(' '):
+ for term in q.strip().split(" "):
subquery = (
- Q(associated_file__cached_label__icontains=term) |
- Q(operation__cached_label__icontains=term) |
- Q(section__icontains=term) |
- Q(parcel_number__icontains=term) |
- Q(town__name__icontains=term)
+ Q(associated_file__cached_label__icontains=term)
+ | Q(operation__cached_label__icontains=term)
+ | Q(section__icontains=term)
+ | Q(parcel_number__icontains=term)
+ | Q(town__name__icontains=term)
)
try:
subquery |= Q(year=int(term))
except ValueError:
pass
query &= subquery
- return self.model.objects.filter(
- query).order_by('-associated_file__cached_label',
- '-operation__cached_label',
- 'section',
- 'parcel_number')[:20]
+ return self.model.objects.filter(query).order_by(
+ "-associated_file__cached_label",
+ "-operation__cached_label",
+ "section",
+ "parcel_number",
+ )[:20]
def format_match(self, obj):
return escape(force_text(obj.long_label()))