From f0b3a6daf3d2b70161e5b04e2c0e660792b5d581 Mon Sep 17 00:00:00 2001
From: Arona Jones <aj@aronajones.com>
Date: Wed, 29 Dec 2021 13:07:30 +0000
Subject: [PATCH] Filter for active training items

Can't easily filter by supervisor, its not a database field, argh...
---
 PyRIGS/views.py                              | 6 ++++++
 training/templates/edit_training_record.html | 8 +-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/PyRIGS/views.py b/PyRIGS/views.py
index e9258a70..713d478b 100644
--- a/PyRIGS/views.py
+++ b/PyRIGS/views.py
@@ -78,6 +78,9 @@ class SecureAPIRequest(generic.View):
         fields = request.GET.get('fields', None)
         if fields:
             fields = fields.split(",")
+        filters = request.GET.get('filters', [])
+        if filters:
+            filters = filters.split(",")
 
         # Supply data for one record
         if pk:
@@ -98,6 +101,9 @@ class SecureAPIRequest(generic.View):
                 for field in fields:
                     q = Q(**{field + "__icontains": part})
                     qs.append(q)
+                for filter in filters:
+                    q = Q(**{field: True})
+                    qs.append(q)
                 queries.append(reduce(operator.or_, qs))
 
             # Build the data response list
diff --git a/training/templates/edit_training_record.html b/training/templates/edit_training_record.html
index eda89dfe..5b2d328e 100644
--- a/training/templates/edit_training_record.html
+++ b/training/templates/edit_training_record.html
@@ -30,7 +30,7 @@
     {% render_field form.trainee|attr:'hidden' value=form.trainee.initial %}
     <div class="form-group form-row">
       <label for="item_id" class="col-sm-2 col-form-label">Item</label>
-      <select name="item" id="item_id" class="form-control selectpicker custom-select col-sm-4" data-live-search="true" data-sourceurl="{% url 'api_secure' model='training_item' %}?fields=reference_number,name" required>
+      <select name="item" id="item_id" class="form-control selectpicker custom-select col-sm-4" data-live-search="true" data-sourceurl="{% url 'api_secure' model='training_item' %}?fields=reference_number,name&filters=active" required>
       </select>
     </div>
     <div class="form-group form-row">
@@ -38,15 +38,9 @@
       {% render_field form.depth|add_class:'form-control custom-select col-sm-4' %}
     </div>
     <div class="form-group form-row">
-      {% if external %}
-      <label for="supervisor" class="col-sm-2 col-form-label">Supervising Organisation</label>
-      <select name="supervisor" id="supervising_organisation_id" class="form-control selectpicker custom-select col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='organisation' %}" required>
-      </select>
-      {% else %}
       <label for="supervisor" class="col-sm-2 col-form-label">Supervisor</label>
       <select name="supervisor" id="supervisor_id" class="form-control selectpicker custom-select col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='profile' %}?fields=first_name,last_name,initials" required>
       </select>
-      {% endif %}
     </div>
     <div class="form-group form-row">
         <label for="date" class="col-sm-2 col-form-label">Training Date</label>