|
@@ -94,12 +94,23 @@ def generate_search_querybuilder(search_param):
|
|
|
query_set = query_set.filter(Q(identifier__icontains=number) | Q(number__icontains=number) | Q(ecli__icontains=number))
|
|
|
|
|
|
if not empty(search_param, 'dateAfter'):
|
|
|
- date_after = datetime.strptime(search_param['dateAfter'], '%d/%m/%Y')
|
|
|
- query_set = query_set.filter(issued_date__gte=date_after)
|
|
|
+ try:
|
|
|
+ date_after = datetime.strptime(search_param['dateAfter'], '%d/%m/%Y')
|
|
|
+ except ValueError as e:
|
|
|
+ pass
|
|
|
+ else:
|
|
|
+ query_set = query_set.filter(issued_date__gte=date_after)
|
|
|
+
|
|
|
|
|
|
if not empty(search_param, 'dateBefore'):
|
|
|
- date_before = datetime.strptime(search_param['dateBefore'], '%d/%m/%Y')
|
|
|
- query_set = query_set.filter(issued_date__lte=date_before)
|
|
|
+ try:
|
|
|
+ date_before = datetime.strptime(search_param['dateBefore'], '%d/%m/%Y')
|
|
|
+ except ValueError as e:
|
|
|
+ pass
|
|
|
+ else:
|
|
|
+ query_set = query_set.filter(issued_date__lte=date_before)
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
query_set = query_set.filter(authority__slug__in=search_param['authorities'])
|