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

FEAT(Asset): Add filter for only cables

Browse Source
This commit is contained in:
FreneticScribbler
2021-12-30 18:49:52 +00:00
parent a01e351e89
commit fdbdaab52e
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/forms.py
View File

@@ -32,6 +32,7 @@ class AssetSearchForm(forms.Form):
q = forms.CharField(required=False) q = forms.CharField(required=False)
category = forms.ModelMultipleChoiceField(models.AssetCategory.objects.all(), required=False) category = forms.ModelMultipleChoiceField(models.AssetCategory.objects.all(), required=False)
status = forms.ModelMultipleChoiceField(models.AssetStatus.objects.all(), required=False) status = forms.ModelMultipleChoiceField(models.AssetStatus.objects.all(), required=False)
is_cable = forms.BooleanField(required=False)
class SupplierForm(forms.ModelForm): class SupplierForm(forms.ModelForm):

4
assets/templates/asset_list.html
View File

@@ -74,6 +74,10 @@
<label for="status" class="sr-only">Status</label> <label for="status" class="sr-only">Status</label>
{% render_field form.status|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %} {% render_field form.status|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
</div> </div>
<div class="form-check form-check-inline">
{% render_field form.is_cable|add_class:'form-check-input' %}
<label class="form-check-label" for="is_cable">Only Cables?</label>
</div>
<button id="filter-submit" type="submit" class="btn btn-secondary" style="width: 6em">Filter</button> <button id="filter-submit" type="submit" class="btn btn-secondary" style="width: 6em">Filter</button>
</form> </form>
</div> </div>

3
assets/views.py
View File

@@ -52,6 +52,9 @@ class AssetList(LoginRequiredMixin, generic.ListView):
else: else:
queryset = self.model.objects.filter(Q(asset_id__exact=query_string.upper())) queryset = self.model.objects.filter(Q(asset_id__exact=query_string.upper()))
if form.cleaned_data['is_cable']:
queryset = queryset.filter(is_cable=True)
if form.cleaned_data['category']: if form.cleaned_data['category']:
queryset = queryset.filter(category__in=form.cleaned_data['category']) queryset = queryset.filter(category__in=form.cleaned_data['category'])