From 0086461d6caac88a1c2a21ca265acaa10c568b02 Mon Sep 17 00:00:00 2001 From: James Herbert Date: Fri, 8 Oct 2021 18:31:12 +0100 Subject: [PATCH] Change Zs field in Event Checklist from integer to decimal (#450) Co-authored-by: David Taylor Co-authored-by: James Herbert --- RIGS/migrations/0042_auto_20211007_2338.py | 34 ++++++++++++++++++++++ RIGS/models.py | 8 ++--- RIGS/tests/test_interaction.py | 4 +-- 3 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 RIGS/migrations/0042_auto_20211007_2338.py diff --git a/RIGS/migrations/0042_auto_20211007_2338.py b/RIGS/migrations/0042_auto_20211007_2338.py new file mode 100644 index 00000000..20343cdf --- /dev/null +++ b/RIGS/migrations/0042_auto_20211007_2338.py @@ -0,0 +1,34 @@ +# Generated by Django 3.1.13 on 2021-10-07 22:38 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('RIGS', '0041_auto_20210302_1204'), + ] + + operations = [ + migrations.AlterField( + model_name='eventchecklist', + 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='eventchecklist', + 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='eventchecklist', + 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='eventchecklist', + 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'), + ), + ] + diff --git a/RIGS/models.py b/RIGS/models.py index 55800808..4687c9b3 100644 --- a/RIGS/models.py +++ b/RIGS/models.py @@ -796,21 +796,21 @@ class EventChecklist(models.Model, 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.IntegerField(blank=True, null=True, verbose_name="Earth Fault Loop Impedance", help_text="Earth Fault Loop Impedance (ZS)") + 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") # 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.IntegerField(blank=True, null=True, help_text="Earth Fault Loop Impedance (ZS)") + 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)") 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.IntegerField(blank=True, null=True, help_text="Earth Fault Loop Impedance (ZS)") + 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)") 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.IntegerField(blank=True, null=True, help_text="Earth Fault Loop Impedance (ZS)") + 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)") 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/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