Order training items by number

RIGS/templates/risk_assessment_form.html

@@ -5,17 +5,14 @@
 {% load nice_errors from filters %}
 
 {% block css %}
-    {{ block.super }}
     <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
-    {{ block.super }}
     <script src="{% static 'js/selects.js' %}" async></script>
 {% endblock %}
 
 {% block js %}
-    {{ block.super }}
     <script src="{% static 'js/autocompleter.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
 

training/migrations/0007_auto_20210908_2043.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.1.13 on 2021-09-08 19:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('training', '0006_auto_20210903_2158'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='trainingitem',
+            options={'ordering': ['category__reference_number', 'reference_number']},
+        ),
+        migrations.AlterUniqueTogether(
+            name='trainingitem',
+            unique_together={('reference_number', 'name', 'category')},
+        ),
+        migrations.AlterOrderWithRespectTo(
+            name='trainingitemqualification',
+            order_with_respect_to='item',
+        ),
+    ]

training/models.py

@@ -45,8 +45,12 @@ class TrainingItem(models.Model):
     category = models.ForeignKey('TrainingCategory', related_name='items', on_delete=models.RESTRICT)
     name = models.CharField(max_length=50)
 
+    @property
+    def number(self):
+        return "{}.{}".format(self.category.reference_number, self.reference_number)
+
     def __str__(self):
-        return "{}.{} {}".format(self.category.reference_number, self.reference_number, self.name)
+        return "{} {}".format(self.number, self.name)
 
     @staticmethod
     def user_has_qualification(item, user, depth):
@@ -54,6 +58,10 @@ class TrainingItem(models.Model):
             if q.item == item and q.depth > depth:
                 return True
 
+    class Meta:
+        unique_together = ["reference_number", "name", "category"]
+        ordering = ['category__reference_number', 'reference_number']
+
 
 class TrainingItemQualification(models.Model):
     STARTED = 0
@@ -95,6 +103,7 @@ class TrainingItemQualification(models.Model):
 
     class Meta:
         unique_together = ["trainee", "item", "depth"]
+        order_with_respect_to = 'item'
 
 
 # Levels

training/templates/base_training.html

@@ -10,7 +10,7 @@
 {% if user.is_authenticated %}
     <li class="nav-item"><a class="nav-link" href="/">Home</a></li>
     <li class="nav-item dropdown">
-      <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownRigboard" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+      <a class="nav-link dropdown-toggle text-info" href="#" id="navbarDropdownRigboard" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         My Record
       </a>
       <div class="dropdown-menu" aria-labelledby="navbarDropdownRigboard">
@@ -20,8 +20,9 @@
                             Item Detail</a>
        </div>
     </li>
-    <li class="nav-item"><a class="nav-link" href="{% url 'level_list' %}"><span class="fas fa-layer-group"></span> All Levels</a></li>
-    <li class="nav-item"><a class="nav-link" href="{% url 'item_list' %}"><span class="fas fa-sitemap"></span> All Items</a></li>
+    <li class="nav-item"><a class="nav-link" href="{% url 'trainee_list' %}"><span class="fas fa-users"></span> Trainee List</a></li>
+    <li class="nav-item"><a class="nav-link" href="{% url 'level_list' %}"><span class="fas fa-layer-group"></span> Level List</a></li>
+    <li class="nav-item"><a class="nav-link" href="{% url 'item_list' %}"><span class="fas fa-sitemap"></span> Item List</a></li>
     <li class="nav-item"><a class="nav-link" href="{% url 'training_activity_table' %}"><span class="fas fa-random"></span> Recent Changes</a></li>
 {% endif %}
 {% endblock %}

training/templates/edit_training_record.html

@@ -5,17 +5,14 @@
 {% load button from filters %}
 
 {% block css %}
-    {{ block.super }}
     <link rel="stylesheet" type="text/css" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
-    {{ block.super }}
     <script src="{% static 'js/selects.js' %}"></script>
 {% endblock %}
 
 {% block js %}
-    {{ block.super }}
     <script src="{% static 'js/autocompleter.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
 {% endblock %}
@@ -27,7 +24,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' %}" 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" required>
       </select>
     </div>
     <div class="form-group form-row">
@@ -35,9 +32,15 @@
       {% 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>

training/templates/trainee_detail.html

@@ -6,10 +6,20 @@
 {% load user_level_if_present from tags %}
 {% load colour_from_depth from tags %}
 
+{% block css %}
+    <link rel="stylesheet" type="text/css" href="{% static 'css/selects.css' %}"/>
+{% endblock %}
+
+{% block preload_js %}
+    <script src="{% static 'js/selects.js' %}"></script>
+{% endblock %}
+
 {% block js %}
+    <script src="{% static 'js/autocompleter.js' %}"></script>
+    <script src="{% static 'js/tooltip.js' %}"></script>
     <script>
     $('document').ready(function(){
-        $('#add_record').click(function (e) {
+        $('#add_record,#add_external').click(function (e) {
              e.preventDefault();
              var url = $(this).attr("href");
              $.ajax({
@@ -38,6 +48,10 @@
     <a type="button" class="btn btn-success" href="{% url 'edit_record' object.pk %}" id="add_record">
 	    <span class="fas fa-plus"></span> Add New Training Record
     </a>
+    <a type="button" class="btn btn-warning" href="#" id="add_external">
+	    <span class="fas fa-building"></span> Log External Training
+    </a>
+    <a href="{% url 'trainee_item_detail' object.pk %}" class="btn btn-info col-2"><span class="fas fa-info-circle"></span> View Detailed Record</a><br/>
     </div>
 </div>
 <div class="row mb-3">
@@ -76,7 +90,7 @@
     </div>
 </div>
 <div class="row">
-    <h2 class="col-10">Training Items</h2><a href="{% url 'trainee_item_detail' object.pk %}" class="btn btn-info col-2"><span class="fas fa-info-circle"></span> View Detailed Record</a><br/>
+    <h2 class="col-10">Training Items</h2>
     <div class="alert alert-info" role="alert"><h3 class="col-12">Key: <span class="badge badge-warning">Training Started</span> <span class="badge badge-success">Training Complete</span> <span class="badge badge-info">Passed Out</span></h3></div>
     <div class="card-deck">
         {% for category in categories %}

training/templates/trainee_list.html

@@ -13,8 +13,9 @@
             <table class="table table-striped">
                 <thead>
                     <tr>
-                        <th scope="col">Name<a href="?{% orderby request 'orderBy' 'name' %}"><span class="caret"></span></a></th>
+                        <th scope="col">Name</th>
                         <th>Supervisor?</th>
+                        <th>Qualification Count</th>
                         <th></th>
                     </tr>
                 </thead>
@@ -23,6 +24,7 @@
                     <tr id="row_item">
                         <th scope="row" class="align-middle" id="cell_name">{{ object.name }} {% if request.user.pk == object.pk %}<span class="fas fa-user text-success"></span>{%endif%}</th>
                         <td {% if object.is_supervisor %}class="table-success"{%endif%}>{{ object.is_supervisor|yesno|title }}</td>
+                        <td>{{ object.qualifications_obtained.all|length }}</td>
                         <td>
                             <a class="btn btn-info" href="{% url 'trainee_detail' pk=object.pk %}"><span class="fas fa-eye"></span> View Training Record</a>
                             <a href="{% url 'trainee_item_detail' pk=object.pk %}" class="btn btn-info"><span class="fas fa-info-circle"></span> View Detailed Record</a>