Fix various minor issues (#545)

* Add absolute URL to power tests

* Update to target Python 3.10

* Return user to current page when clicking 'mark reviewed'

* Add units to power test record detail and form

I'm a bad scientist (coz I'm an engineer)

* Allow a higher value in PSSC fields

* Default venue to event venue in EC/PT

* Fix population of initial venue values for EC/PT

* Add link to create power test from EC detail

* Do not set power plan field to required on RA

"This might be a problem if the risk assessment is being done by one person and the power plan by another."

* Default power MIC to MIC

* Implement some suggestions from the Doctor

* Prevent checking in to cancelled events and dry hires

Will close #539

* Exclude dry hires from H&S overview list

* Add "ex VAT" tooltips to asset purchase price and replacement cost

* Automagically clear and focus ID field when audit modal closes

Closes #533

* Delete unused things

* Allow two decimal places in cable length, show training item IDs in selectpicker

Will close #540

* Fix #524 500 Error when viewing qualification list for items nobody is qualified in

* Update README.md

* Add a guard against nulls in recent changes

Maybe fixes #537 I'm unable to replicate locally

* Turn down verbosity of CI tests, fix tests, potential speedup

* Squash migration

* Add encoding to open

* Update to v3 upload-artifact

Resolves a deprecation warning

assets/migrations/0028_alter_asset_length.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.19 on 2023-05-24 22:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assets', '0027_asset_nickname'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='asset',
+            name='length',
+            field=models.DecimalField(blank=True, decimal_places=2, help_text='m', max_digits=10, null=True),
+        ),
+    ]

assets/models.py

@@ -135,7 +135,7 @@ class Asset(models.Model, RevisionMixin):
     # Cable assets
     is_cable = models.BooleanField(default=False)
     cable_type = models.ForeignKey(to=CableType, blank=True, null=True, on_delete=models.SET_NULL)
-    length = models.DecimalField(decimal_places=1, max_digits=10,
+    length = models.DecimalField(decimal_places=2, max_digits=10,
                                  blank=True, null=True, help_text='m')
     csa = models.DecimalField(decimal_places=2, max_digits=10,
                               blank=True, null=True, help_text='mm²')
@@ -192,5 +192,5 @@ class Asset(models.Model, RevisionMixin):
         return str(self.asset_id)
 
     @property
-    def name(self):
+    def display_name(self):
         return f"{self.display_id} | {self.description}"

assets/templates/asset_audit_list.html

@@ -35,6 +35,11 @@
     function onAuditClick(assetID) {
          $('#' + assetID).remove();
     }
+    $('#modal').on('hidden.bs.modal', function (e) {
+      searchbar = document.getElementById('id_q');
+      searchbar.value = "";
+      setTimeout(searchbar.focus(), 2000);
+    })
     </script>
 {% endblock %}
 

assets/templates/asset_form.html

@@ -12,7 +12,6 @@
     {{ block.super }}
     <script src="{% static 'js/selects.js' %}"></script>
     <script src="{% static 'js/easymde.min.js' %}"></script>
-    <script src="{% static 'js/interaction.js' %}"></script>
 {% endblock %}
 
 {% block js %}
@@ -35,9 +34,10 @@
             $(document).find(".selectpicker").selectpicker().each(function(){initPicker($(this))});
         });
     </script>
+    <script src="{% static "js/tooltip.js" %}"></script>
     <script>
-        $(document).ready(function () {
-            setupMDE('#id_comments');
+        $(function () {
+          $('[data-toggle="tooltip"]').tooltip();
         });
     </script>
 {% endblock %}

assets/templates/partials/asset_list_table.html

@@ -12,7 +12,7 @@
       </thead>
       <tbody id="asset_table_body">
         {% for item in object_list %}
-            <tr class="table-{{ item.status.display_class|default:'' }} assetRow">
+            <tr class="table-{{ item.status.display_class|default:'' }} assetRow" id="{{ item.asset_id }}">
                 <th scope="row" class="align-middle"><a class="assetID" href="{% url 'asset_detail' item.asset_id %}">{{ item.asset_id }}</a></th>
                 <td class="assetDesc"><span class="text-truncate d-inline-block align-middle">{{ item.description }}</span></td>
                 <td class="assetCategory align-middle">{{ item.category }}</td>

assets/templates/partials/form_field.html

@@ -1,22 +0,0 @@
-{% load widget_tweaks %}
-{% load title_spaced from filters %}
-{% spaceless %}
-<label for="{{ field.id_for_label }}" {% if col %}class="col-4 col-form-label"{% endif %}>{% if title %}{{ title }}{%else%}{{field.name|title_spaced}}{%endif%}</label>
-{% if append or prepend %}
-<div class="input-group {{col}}">
-  {% if prepend %}
-  <div class="input-group-prepend">
-    <span class="input-group-text">{{ prepend }}</span>
-  </div>
-  {% endif %}
-  {% render_field field|add_class:'form-control' %}
-  {% if append %}
-  <div class="input-group-append">
-    <span class="input-group-text">{{ append }}</span>
-  </div>
-  {% endif %}
-</div>
-{% else %}
-{% render_field field|add_class:'form-control' class+=col %}
-{% endif %}
-{% endspaceless %}

assets/templates/partials/purchasedetails_form.html

@@ -34,7 +34,7 @@
       <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
       <div class="input-group">
         <div class="input-group-prepend"><span class="input-group-text">£</span></div>
-        {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
+        {% render_field form.purchase_price|add_class:'form-control'|set_data:"toggle:tooltip" value=object.purchase_price title="Ex. VAT" %}
       </div>
     </div>
 
@@ -42,7 +42,7 @@
       <label for="{{ form.salvage_value.id_for_label }}">Replacement Cost</label>
       <div class="input-group">
         <div class="input-group-prepend"><span class="input-group-text">£</span></div>
-        {% render_field form.replacement_cost|add_class:'form-control' value=object.replacement_cost %}
+        {% render_field form.replacement_cost|add_class:'form-control'|set_data:"toggle:tooltip" value=object.replacement_cost title="Ex. VAT" %}
       </div>
     </div>
 

assets/tests/pages.py

@@ -77,7 +77,7 @@ class AssetForm(FormPage):
         'description': (regions.TextBox, (By.ID, 'id_description')),
         'is_cable': (regions.CheckBox, (By.ID, 'id_is_cable')),
         'serial_number': (regions.TextBox, (By.ID, 'id_serial_number')),
-        'comments': (regions.SimpleMDETextArea, (By.ID, 'id_comments')),
+        'comments': (regions.TextBox, (By.ID, 'id_comments')),
         'purchase_price': (regions.TextBox, (By.ID, 'id_purchase_price')),
         'replacement_cost': (regions.TextBox, (By.ID, 'id_replacement_cost')),
         'date_acquired': (regions.DatePicker, (By.ID, 'id_date_acquired')),