imacat/mia-accounting-django
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Replaced the regular expression match with strptime() to search by the year in the accounting application.

Browse Source
This commit is contained in:
依瑪貓 2020-09-04 19:42:34 +08:00
parent 70d725d2af
commit b92b7fb489
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
accounting/views.py
View File

@ -785,9 +785,12 @@ def search(request: HttpRequest) -> HttpResponse:
| Q(pk=int(query))\ | Q(pk=int(query))\
| Q(transaction__pk=int(query))\ | Q(transaction__pk=int(query))\
| Q(account__pk=int(query)) | Q(account__pk=int(query))
if re.match("^[0-9]{4}$", query): try:
date = datetime.datetime.strptime(query, "%Y")
conditions = conditions\ conditions = conditions\
| Q(transaction__date__year=int(query)) | Q(transaction__date__year=date.year)
except ValueError:
pass
try: try:
conditions = conditions | Q(transaction__date=parse_date(query)) conditions = conditions | Q(transaction__date=parse_date(query))
except ValueError: except ValueError: