Allow to search training items by (full) reference number)

training/migrations/0004_rename_name_trainingitem_description.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.11 on 2022-01-30 11:59
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('training', '0003_trainingcategory_training_level'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='trainingitem',
+            old_name='name',
+            new_name='description',
+        ),
+    ]

training/models.py

@@ -4,6 +4,8 @@ from django.db import models
 from django.urls import reverse
 from django.utils.safestring import mark_safe
 from versioning.versioning import RevisionMixin
+from queryable_properties.properties import queryable_property
+from queryable_properties.managers import QueryablePropertiesManager
 
 
 class TraineeManager(models.Manager):
@@ -67,15 +69,28 @@ class TrainingCategory(models.Model):
 class TrainingItem(models.Model):
     reference_number = models.IntegerField()
     category = models.ForeignKey('TrainingCategory', related_name='items', on_delete=models.CASCADE)
-    name = models.CharField(max_length=50)
+    description = models.CharField(max_length=50)
     active = models.BooleanField(default=True)
 
+    objects = QueryablePropertiesManager()
+
     @property
+    def name(self):
+        return str(self)
+
+    @queryable_property
     def display_id(self):
         return f"{self.category.reference_number}.{self.reference_number}"
 
+    @display_id.filter
+    @classmethod
+    def display_id(cls, lookup, value):
+        category_number, number = value.split('.')
+        if category_number and number:
+            return models.Q(category__reference_number=category_number, reference_number=number)
+
     def __str__(self):
-        name = f"{self.display_id} {self.name}"
+        name = f"{self.display_id} {self.description}"
         if not self.active:
             name += " (inactive)"
         return name
@@ -108,6 +123,8 @@ class TrainingItemQualification(models.Model, RevisionMixin):
     notes = models.TextField(blank=True)
     # TODO Maximum depth - some things stop at Complete and you can't be passed out in them
 
+    objects = QueryablePropertiesManager()
+
     def __str__(self):
         return f"{self.get_depth_display()} in {self.item} on {self.date.strftime('%b %d %Y')}"
 

training/templates/edit_training_record.html

@@ -29,8 +29,8 @@
     {% csrf_token %}
     {% 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&filters=active" required>
+      <label for="item_id" class="col col-form-label">Item</label>
+      <select name="item" id="item_id" class="form-control selectpicker custom-select col-sm-10" data-live-search="true" data-sourceurl="{% url 'api_secure' model='training_item' %}?fields=display_id,description&filters=active" required>
         {% if object.item %}
         <option value="{{object.item.pk}}" selected>{{object.item}}</option>
         {% endif %}
@@ -38,7 +38,7 @@
     </div>
     <div class="form-group form-row">
       <label for="depth" class="col-sm-2 col-form-label">Depth</label>
-      {% render_field form.depth|add_class:'form-control custom-select col-sm-4' %}
+      {% render_field form.depth|add_class:'form-control custom-select col-sm-8' %}
     </div>
     <div class="form-group form-row">
       <label for="supervisor" class="col-sm-2 col-form-label">Supervisor</label>