arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-06 15:18:22 +00:00
Code Issues Projects Releases Wiki Activity

CHORE: Conform old code to pep8

Browse Source
This commit is contained in:
FreneticScribbler
2020-02-04 16:32:32 +00:00
parent 6bcb242d6b
commit 9889889f9a
3 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
RIGS/finance.py
View File

@@ -125,29 +125,28 @@ class InvoiceArchive(generic.ListView):
def get_queryset(self): def get_queryset(self):
q = self.request.GET.get('q', "") q = self.request.GET.get('q', "")
filter = Q(event__name__icontains=q) filter = Q(event__name__icontains=q)
#try and parse an int # try and parse an int
try: try:
val = int(q) val = int(q)
filter = filter | Q(pk=val) filter = filter | Q(pk=val)
filter = filter | Q(event__pk=val) filter = filter | Q(event__pk=val)
except: except: # noqa
#not an integer # not an integer
pass pass
try: try:
if q[0] == "N": if q[0] == "N":
val = int(q[1:]) val = int(q[1:])
filter = Q(event__pk=val) #If string is Nxxxxx then filter by event number filter = Q(event__pk=val) # If string is Nxxxxx then filter by event number
elif q[0] == "#": elif q[0] == "#":
val = int(q[1:]) val = int(q[1:])
filter = Q(pk=val) #If string is #xxxxx then filter by invoice number filter = Q(pk=val) # If string is #xxxxx then filter by invoice number
except: # noqa
except:
pass pass
object_list = self.model.objects.filter(filter).order_by('-invoice_date') object_list = self.model.objects.filter(filter).order_by('-invoice_date')
return object_list return object_list

9
RIGS/rigboard.py
View File

@@ -256,24 +256,23 @@ class EventArchive(generic.ArchiveIndexView):
if start: if start:
filter &= Q(start_date__gte=start) filter &= Q(start_date__gte=start)
q = self.request.GET.get('q', "") q = self.request.GET.get('q', "")
if q is not "": if q is not "":
qfilter = Q(name__icontains=q) | Q(description__icontains=q) | Q(notes__icontains=q) qfilter = Q(name__icontains=q) | Q(description__icontains=q) | Q(notes__icontains=q)
#try and parse an int # try and parse an int
try: try:
val = int(q) val = int(q)
qfilter = qfilter | Q(pk=val) qfilter = qfilter | Q(pk=val)
except: #not an integer except: # noqa not an integer
pass pass
try: try:
if q[0] == "N": if q[0] == "N":
val = int(q[1:]) val = int(q[1:])
qfilter = Q(pk=val) #If string is N###### then do a simple PK filter qfilter = Q(pk=val) # If string is N###### then do a simple PK filter
except: except: # noqa
pass pass
filter &= qfilter filter &= qfilter

18
RIGS/views.py
View File

@@ -93,12 +93,12 @@ class PersonList(generic.ListView):
filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q) filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q)
#try and parse an int # try and parse an int
try: try:
val = int(q) val = int(q)
filter = filter | Q(pk=val) filter = filter | Q(pk=val)
except: except: # noqa
#not an integer # not an integer
pass pass
object_list = self.model.objects.filter(filter) object_list = self.model.objects.filter(filter)
@@ -156,12 +156,12 @@ class OrganisationList(generic.ListView):
filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q) filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q)
#try and parse an int # try and parse an int
try: try:
val = int(q) val = int(q)
filter = filter | Q(pk=val) filter = filter | Q(pk=val)
except: except: # noqa
#not an integer # not an integer
pass pass
object_list = self.model.objects.filter(filter) object_list = self.model.objects.filter(filter)
@@ -219,12 +219,12 @@ class VenueList(generic.ListView):
filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q) filter = Q(name__icontains=q) | Q(email__icontains=q) | Q(address__icontains=q) | Q(notes__icontains=q) | Q(phone__startswith=q) | Q(phone__endswith=q)
#try and parse an int # try and parse an int
try: try:
val = int(q) val = int(q)
filter = filter | Q(pk=val) filter = filter | Q(pk=val)
except: except: # noqa
#not an integer # not an integer
pass pass
object_list = self.model.objects.filter(filter) object_list = self.model.objects.filter(filter)