-
- - {{ object|help_text:'known_venue' }}
- -
- {{ object.known_venue|yesnoi:'invert' }}
-
- - {{ object|help_text:'safe_loading'|safe }}
- -
- {{ object.safe_loading|yesnoi:'invert' }}
-
- - {{ object|help_text:'safe_storage' }}
- -
- {{ object.safe_storage|yesnoi:'invert' }}
-
- - {{ object|help_text:'area_outside_of_control' }}
- -
- {{ object.area_outside_of_control|yesnoi:'invert' }}
-
- - {{ object|help_text:'barrier_required' }}
- -
- {{ object.barrier_required|yesnoi:'invert' }}
-
- - {{ object|help_text:'nonstandard_emergency_procedure' }}
- -
- {{ object.nonstandard_emergency_procedure|yesnoi:'invert' }}
-
-
+
+
+
+
+
+
+ - {{ object|help_text:'known_venue' }}
+ -
+ {{ object.known_venue|yesnoi:'invert' }}
+
+ - {{ object|help_text:'safe_loading'|safe }}
+ -
+ {{ object.safe_loading|yesnoi:'invert' }}
+
+ - {{ object|help_text:'safe_storage' }}
+ -
+ {{ object.safe_storage|yesnoi:'invert' }}
+
+ - {{ object|help_text:'area_outside_of_control' }}
+ -
+ {{ object.area_outside_of_control|yesnoi:'invert' }}
+
+ - {{ object|help_text:'barrier_required' }}
+ -
+ {{ object.barrier_required|yesnoi:'invert' }}
+
+ - {{ object|help_text:'nonstandard_emergency_procedure' }}
+ -
+ {{ object.nonstandard_emergency_procedure|yesnoi:'invert' }}
+
+
+
+
-
-
-
-
-
- - {{ object|help_text:'special_structures' }}
- -
- {{ object.special_structures|yesnoi:'invert' }}
-
- - {{ object|help_text:'suspended_structures' }}
- -
- {{ object.suspended_structures|yesnoi:'invert' }}
-
- - {{ object|help_text:'persons_responsible_structures' }}
- -
- {{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }}
-
- - {{ object|help_text:'rigging_plan'|safe }}
- -
- {{ object.rigging_plan|linkornone }}
-
-
+
+
+
+
+
+ - {{ object|help_text:'special_structures' }}
+ -
+ {{ object.special_structures|yesnoi:'invert' }}
+
+ - {{ object|help_text:'suspended_structures' }}
+ -
+ {{ object.suspended_structures|yesnoi:'invert' }}
+
+ - {{ object|help_text:'persons_responsible_structures' }}
+ -
+ {{ object.persons_responsible_structures.name|default:'N/A'|linebreaks }}
+
+ - {{ object|help_text:'rigging_plan'|safe }}
+ -
+ {{ object.rigging_plan|linkornone|default:'N/A' }}
+
+
+
+
diff --git a/RIGS/templatetags/filters.py b/RIGS/templatetags/filters.py
index fb722a9d..5a4348aa 100644
--- a/RIGS/templatetags/filters.py
+++ b/RIGS/templatetags/filters.py
@@ -222,3 +222,13 @@ def button(type, url=None, pk=None, clazz="", icon=None, text="", id=None, style
@register.simple_tag
def invoices_waiting():
return len(models.Event.objects.waiting_invoices())
+
+
+@register.simple_tag
+def invoices_outstanding():
+ return len(models.Invoice.objects.outstanding_invoices())
+
+
+@register.simple_tag
+def total_invoices_todo():
+ return len(models.Event.objects.waiting_invoices()) + len(models.Invoice.objects.outstanding_invoices())
diff --git a/RIGS/tests/test_interaction.py b/RIGS/tests/test_interaction.py
index 3192ad12..dc50fd93 100644
--- a/RIGS/tests/test_interaction.py
+++ b/RIGS/tests/test_interaction.py
@@ -721,12 +721,12 @@ def test_ec_create_medium(logged_in_browser, live_server, admin_user, medium_ra)
page.fd_voltage_l2 = 235
page.fd_voltage_l3 = 0
page.fd_phase_rotation = True
- page.fd_earth_fault = 666
+ page.fd_earth_fault = "1.21"
page.fd_pssc = 1984
page.w1_description = "In the carpark, by the bins"
page.w1_polarity = True
page.w1_voltage = 240
- page.w1_earth_fault = 333
+ page.w1_earth_fault = "0.42"
page.submit()
assert page.success
diff --git a/assets/models.py b/assets/models.py
index bf662ccc..37af4687 100644
--- a/assets/models.py
+++ b/assets/models.py
@@ -49,7 +49,7 @@ class Supplier(models.Model, RevisionMixin):
ordering = ['name']
def get_absolute_url(self):
- return reverse('supplier_list')
+ return reverse('supplier_detail', kwargs={'pk': self.pk})
def __str__(self):
return self.name
@@ -82,6 +82,9 @@ class CableType(models.Model):
else:
return "Unknown"
+ def get_absolute_url(self):
+ return reverse('cable_type_detail', kwargs={'pk': self.pk})
+
def get_available_asset_id(wanted_prefix=""):
sql = """
diff --git a/assets/templates/asset_detail.html b/assets/templates/asset_detail.html
index 35dedfcc..13c2e3dd 100644
--- a/assets/templates/asset_detail.html
+++ b/assets/templates/asset_detail.html
@@ -2,6 +2,9 @@
{% load widget_tweaks %}
{% block content %}
+
+{% include 'partials/asset_buttons.html' %}
+
{% include 'partials/asset_detail_form.html' %}
diff --git a/assets/templates/asset_form.html b/assets/templates/asset_form.html
index 905d3942..57766f98 100644
--- a/assets/templates/asset_form.html
+++ b/assets/templates/asset_form.html
@@ -34,7 +34,7 @@
})
.ajaxSelectPicker({
ajax: {
- url: '{% url 'asset_search_json' %}',
+ url: "{% url 'asset_search_json' %}",
type: "GET",
data: function () {
let params = {
diff --git a/assets/templates/partials/asset_buttons.html b/assets/templates/partials/asset_buttons.html
index 77a3d047..2551365e 100644
--- a/assets/templates/partials/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -11,7 +11,10 @@
{% button 'edit' url='asset_update' pk=object.asset_id %}
{% button 'duplicate' url='asset_duplicate' pk=object.asset_id %}
-
Audit
+
Audit
+ {% if object.is_cable %}
+
Generate Label
+ {% endif %}
{% endif %}
{% if create or edit or duplicate %}
diff --git a/assets/templates/partials/cable_form.html b/assets/templates/partials/cable_form.html
index c5c4f5ff..5799bc35 100644
--- a/assets/templates/partials/cable_form.html
+++ b/assets/templates/partials/cable_form.html
@@ -17,11 +17,9 @@
{% else %}
- Cable Type
- - {{ object.cable_type|default_if_none:'-' }}
-
+ - {% if object.cable_type %}{{ object.cable_type }}{%else%}-{%endif%}
- Length
- {{ object.length|default_if_none:'-' }}m
-
- Cross Sectional Area
- {{ object.csa|default_if_none:'-' }}mm²
diff --git a/assets/templates/partials/parent_form.html b/assets/templates/partials/parent_form.html
index 8ca9bc41..27c562c5 100644
--- a/assets/templates/partials/parent_form.html
+++ b/assets/templates/partials/parent_form.html
@@ -28,13 +28,13 @@
Children
{% if object.asset_parent.all %}
+
{% else %}
-
{% endif %}
diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html
index 24a373dd..02501431 100644
--- a/assets/templates/partials/purchasedetails_form.html
+++ b/assets/templates/partials/purchasedetails_form.html
@@ -1,4 +1,5 @@
{% load widget_tweaks %}
+{% load linkornone from filters %}