From 773c07af816ba340582c90de764a72f398405ff5 Mon Sep 17 00:00:00 2001 From: arona Date: Sat, 20 May 2023 10:40:06 +0000 Subject: [PATCH] Add units to power test record detail and form I'm a bad scientist (coz I'm an engineer) --- RIGS/migrations/0049_auto_20230520_1136.py | 53 +++++++++++++++++++ RIGS/models.py | 19 ++++--- RIGS/templates/hs/power_detail.html | 2 +- RIGS/templates/hs/power_form.html | 6 +-- package-lock.json | 1 + .../partials/form_field.html | 8 +-- 6 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 RIGS/migrations/0049_auto_20230520_1136.py rename {assets/templates => templates}/partials/form_field.html (52%) diff --git a/RIGS/migrations/0049_auto_20230520_1136.py b/RIGS/migrations/0049_auto_20230520_1136.py new file mode 100644 index 00000000..c369208e --- /dev/null +++ b/RIGS/migrations/0049_auto_20230520_1136.py @@ -0,0 +1,53 @@ +# Generated by Django 3.2.19 on 2023-05-20 10:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0048_auto_20230518_1256'), + ] + + operations = [ + migrations.AlterField( + model_name='powertestrecord', + name='fd_earth_fault', + field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (ZS) / Ω', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance'), + ), + migrations.AlterField( + model_name='powertestrecord', + name='fd_pssc', + field=models.IntegerField(blank=True, help_text='Prospective Short Circuit Current / A', null=True, verbose_name='PSCC'), + ), + migrations.AlterField( + model_name='powertestrecord', + name='w1_earth_fault', + field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (ZS) / Ω', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance'), + ), + migrations.AlterField( + model_name='powertestrecord', + name='w1_voltage', + field=models.IntegerField(blank=True, help_text='Voltage / V', null=True), + ), + migrations.AlterField( + model_name='powertestrecord', + name='w2_earth_fault', + field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (ZS) / Ω', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance'), + ), + migrations.AlterField( + model_name='powertestrecord', + name='w2_voltage', + field=models.IntegerField(blank=True, help_text='Voltage / V', null=True), + ), + migrations.AlterField( + model_name='powertestrecord', + name='w3_earth_fault', + field=models.DecimalField(blank=True, decimal_places=2, help_text='Earth Fault Loop Impedance (ZS) / Ω', max_digits=5, null=True, verbose_name='Earth Fault Loop Impedance'), + ), + migrations.AlterField( + model_name='powertestrecord', + name='w3_voltage', + field=models.IntegerField(blank=True, help_text='Voltage / V', null=True), + ), + ] diff --git a/RIGS/models.py b/RIGS/models.py index 36c6e75f..f1d1793d 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -875,6 +875,9 @@ class EventChecklist(ReviewableModel, RevisionMixin): @reversion.register class PowerTestRecord(ReviewableModel, RevisionMixin): + earth_fault_text = "Earth Fault Loop Impedance (ZS) / Ω" + pssc_text = "Prospective Short Circuit Current / A" + event = models.ForeignKey('Event', related_name='power_tests', on_delete=models.CASCADE) power_mic = models.ForeignKey(settings.AUTH_USER_MODEL, blank=True, null=True, related_name='checklists', verbose_name="Power MIC", on_delete=models.CASCADE, help_text="Who is the Power MIC?") @@ -896,21 +899,21 @@ class PowerTestRecord(ReviewableModel, RevisionMixin): fd_voltage_l2 = models.IntegerField(blank=True, null=True, verbose_name="First Distro Voltage L2-N", help_text="L2 - N") fd_voltage_l3 = models.IntegerField(blank=True, null=True, verbose_name="First Distro Voltage L3-N", help_text="L3 - N") fd_phase_rotation = models.BooleanField(blank=True, null=True, verbose_name="Phase Rotation", help_text="Phase Rotation
(if required)") - fd_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (ZS)") - fd_pssc = models.IntegerField(blank=True, null=True, verbose_name="PSCC", help_text="Prospective Short Circuit Current") + fd_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text) + fd_pssc = models.IntegerField(blank=True, null=True, verbose_name="PSCC", help_text=pssc_text) # Worst case points w1_description = models.CharField(blank=True, default='', max_length=255, help_text="Description") w1_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?") - w1_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage") - w1_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (ZS)") + w1_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage / V") + w1_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text) w2_description = models.CharField(blank=True, default='', max_length=255, help_text="Description") w2_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?") - w2_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage") - w2_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (ZS)") + w2_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage / V") + w2_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text) w3_description = models.CharField(blank=True, default='', max_length=255, help_text="Description") w3_polarity = models.BooleanField(blank=True, null=True, help_text="Polarity Checked?") - w3_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage") - w3_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (ZS)") + w3_voltage = models.IntegerField(blank=True, null=True, help_text="Voltage / V") + w3_earth_fault = models.DecimalField(blank=True, null=True, max_digits=5, decimal_places=2, verbose_name="Earth Fault Loop Impedance", help_text=earth_fault_text) all_rcds_tested = models.BooleanField(blank=True, null=True, help_text="All circuit RCDs tested?
(using test button)") public_sockets_tested = models.BooleanField(blank=True, null=True, help_text="Public/Performer accessible circuits tested?
(using socket tester)") diff --git a/RIGS/templates/hs/power_detail.html b/RIGS/templates/hs/power_detail.html index d8253248..958a1d25 100644 --- a/RIGS/templates/hs/power_detail.html +++ b/RIGS/templates/hs/power_detail.html @@ -86,7 +86,7 @@ - Voltage
(cube meter) + Voltage
(cube meter) / V {{ object|help_text:'fd_voltage_l1' }} {{ object|help_text:'fd_voltage_l2' }} {{ object|help_text:'fd_voltage_l3' }} diff --git a/RIGS/templates/hs/power_form.html b/RIGS/templates/hs/power_form.html index 315175b7..64e5bf18 100644 --- a/RIGS/templates/hs/power_form.html +++ b/RIGS/templates/hs/power_form.html @@ -51,7 +51,7 @@
- {% if power_mic %} {% elif event.riskassessment.power_mic %} @@ -62,7 +62,7 @@
- {% if venue %} {% elif event.venue %} @@ -119,7 +119,7 @@ - Voltage
(cube meter) + Voltage
(cube meter) / V {{ form.fd_voltage_l1.help_text }} {{ form.fd_voltage_l2.help_text }} {{ form.fd_voltage_l3.help_text }} diff --git a/package-lock.json b/package-lock.json index 6985d855..e224531a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "PyRIGS", "version": "1.0.0", "license": "Custom", "dependencies": { diff --git a/assets/templates/partials/form_field.html b/templates/partials/form_field.html similarity index 52% rename from assets/templates/partials/form_field.html rename to templates/partials/form_field.html index 027a2cce..b7b75418 100644 --- a/assets/templates/partials/form_field.html +++ b/templates/partials/form_field.html @@ -1,15 +1,15 @@ {% load widget_tweaks %} {% load title_spaced from filters %} {% spaceless %} - +{% if not nolabel %}{%endif%} {% if append or prepend %} -
+
{% if prepend %}
{{ prepend }}
{% endif %} - {% render_field field|add_class:'form-control' %} + {% render_field field|add_class:'form-control' style=style %} {% if append %}
{{ append }} @@ -17,6 +17,6 @@ {% endif %}
{% else %} -{% render_field field|add_class:'form-control' class+=col %} +{% render_field field|add_class:'form-control' class+=col style=style %} {% endif %} {% endspaceless %}