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

Added multi-option search along.

Browse Source 
Added auto hiding of categories in search unless selected.
Added field allowing to choose whether category auto-hidden

Fixes #353
This commit is contained in:
Matthew Smith
2019-10-16 18:23:08 +01:00
parent 2d84a598f7
commit 3de58740c6
6 changed files with 72 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
assets/views.py
View File

@@ -19,39 +19,51 @@ class AssetList(LoginRequiredMixin, generic.ListView):
template_name = 'asset_list.html'
paginate_by = 40
ordering = ['-pk']
hide_hidden_status = True
def get_queryset(self):
# TODO Feedback to user when search fails
query = self.request.GET.get('query', "")
if len(query) == 0:
queryset = self.model.objects.all()
elif len(query) >= 3:
queryset = self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
if self.request.method == 'POST':
self.form = forms.AssetSearchForm(data=self.request.POST)
elif self.request.method == 'GET':
self.form = forms.AssetSearchForm(data=self.request.GET)
else:
queryset = self.model.objects.filter(Q(asset_id__exact=query))
self.form = forms.AssetSearchForm(data={})
form = self.form
if not form.is_valid():
return self.model.objects.none()
cat = self.request.GET.get('cat', "")
status = self.request.GET.get('status', "")
if cat != "":
queryset = queryset.filter(category__name__exact=cat)
if status != "":
queryset = queryset.filter(status__name__exact=status)
# TODO Feedback to user when search fails
query_string = form.cleaned_data['query'] or ""
if len(query_string) == 0:
queryset = self.model.objects.all()
elif len(query_string) >= 3:
queryset = self.model.objects.filter(Q(asset_id__exact=query_string) | Q(description__icontains=query_string))
else:
queryset = self.model.objects.filter(Q(asset_id__exact=query_string))
if form.cleaned_data['category']:
queryset = queryset.filter(category__in=form.cleaned_data['category'])
if len(form.cleaned_data['status']) > 0:
queryset = queryset.filter(status__in=form.cleaned_data['status'])
elif self.hide_hidden_status:
queryset = queryset.filter(status__in=models.AssetStatus.objects.filter(should_show=True))
return queryset
def get_context_data(self, **kwargs):
context = super(AssetList, self).get_context_data(**kwargs)
context["search_name"] = self.request.GET.get('query', "")
context["form"] = self.form
context["categories"] = models.AssetCategory.objects.all()
context["category_select"] = self.request.GET.get('cat', "")
context["statuses"] = models.AssetStatus.objects.all()
context["status_select"] = self.request.GET.get('status', "")
return context
class AssetSearch(AssetList):
hide_hidden_status = False
def render_to_response(self, context, **response_kwargs):
result = []