arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

FIX #488: Unable to filter detailed training record by item ID

Browse Source
This commit is contained in:
FreneticScribbler
2022-02-14 11:14:32 +00:00
parent 05d280172d
commit aa19ceaf18
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
training/views.py
View File

@@ -47,17 +47,7 @@ class TraineeItemDetail(generic.ListView):
template_name = 'trainee_item_list.html'
def get_queryset(self):
q = self.request.GET.get('q', "")
filter = Q(item__description__icontains=q) | Q(supervisor__first_name__icontains=q) | Q(supervisor__last_name__icontains=q)
try:
filter = filter | Q(item__display_id=int(q[0]))
except: # noqa
# not an integer
pass
return models.Trainee.objects.get(pk=self.kwargs['pk']).qualifications_obtained.all().filter(filter).order_by('-item__display_id').select_related('item', 'trainee', 'supervisor', 'item__category')
return models.Trainee.objects.get(pk=self.kwargs['pk']).qualifications_obtained.search(self.request.GET.get('q')).order_by('item__category__reference_number', 'item__reference_number').select_related('item', 'trainee')
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)