From e9495f91cbb9b33cfbe5b2127f8da25732374c2e Mon Sep 17 00:00:00 2001 From: Kelly Innes Date: Wed, 10 Jul 2019 15:25:31 -0400 Subject: [PATCH] Adjust Facility Type list options Adjust Facility Type list options per comment on https://github.com/open-apparel-registry/open-apparel-registry/issues/634#issuecomment-510192222 --- .../api/migrations/0026_auto_20190710_1922.py | 23 ++++++++++++++ src/django/api/models.py | 30 ++++++++++++++----- 2 files changed, 45 insertions(+), 8 deletions(-) create mode 100644 src/django/api/migrations/0026_auto_20190710_1922.py diff --git a/src/django/api/migrations/0026_auto_20190710_1922.py b/src/django/api/migrations/0026_auto_20190710_1922.py new file mode 100644 index 000000000..98bdcaeb5 --- /dev/null +++ b/src/django/api/migrations/0026_auto_20190710_1922.py @@ -0,0 +1,23 @@ +# Generated by Django 2.0.13 on 2019-07-10 19:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('api', '0025_auto_20190708_2040'), + ] + + operations = [ + migrations.AlterField( + model_name='facilityclaim', + name='facility_type', + field=models.CharField(blank=True, choices=[('Cut and Sew / RMG', 'Cut and Sew / RMG'), ('Dyehouse', 'Dyehouse'), ('Embellishments', 'Embellishments'), ('Fabric Mill', 'Fabric Mill'), ('Finishing', 'Finishing'), ('Ginning', 'Ginning'), ('Knitting', 'Knitting'), ('Laundry', 'Laundry'), ('Packing', 'Packing'), ('Scouring', 'Scouring'), ('Screenprinting', 'Screenprinting'), ('Stitching (Shoes)', 'Stitching (Shoes)'), ('Tannery', 'Tannery'), ('Warehouse', 'Warehouse'), ('Weaving', 'Weaving'), ('Other', 'Other')], help_text='The editable facility type for this claim.', max_length=17, null=True, verbose_name='facility type'), + ), + migrations.AlterField( + model_name='historicalfacilityclaim', + name='facility_type', + field=models.CharField(blank=True, choices=[('Cut and Sew / RMG', 'Cut and Sew / RMG'), ('Dyehouse', 'Dyehouse'), ('Embellishments', 'Embellishments'), ('Fabric Mill', 'Fabric Mill'), ('Finishing', 'Finishing'), ('Ginning', 'Ginning'), ('Knitting', 'Knitting'), ('Laundry', 'Laundry'), ('Packing', 'Packing'), ('Scouring', 'Scouring'), ('Screenprinting', 'Screenprinting'), ('Stitching (Shoes)', 'Stitching (Shoes)'), ('Tannery', 'Tannery'), ('Warehouse', 'Warehouse'), ('Weaving', 'Weaving'), ('Other', 'Other')], help_text='The editable facility type for this claim.', max_length=17, null=True, verbose_name='facility type'), + ), + ] diff --git a/src/django/api/models.py b/src/django/api/models.py index 59b8c7349..44af56904 100644 --- a/src/django/api/models.py +++ b/src/django/api/models.py @@ -393,24 +393,38 @@ class FacilityClaim(models.Model): ) CUT_AND_SEW = 'Cut and Sew / RMG' - FABRIC_MILL = 'Fabric Mill' DYEHOUSE = 'Dyehouse' - LAUNDRY = 'Laundry' + EMBELLISHMENTS = 'Embellishments' + FABRIC_MILL = 'Fabric Mill' FINISHING = 'Finishing' - TANNERY = 'Tannery' - SPINNING = 'Spinning' GINNING = 'Ginning' + KNITTING = 'Knitting' + LAUNDRY = 'Laundry' + PACKING = 'Packing' + SCOURING = 'Scouring' + SCREENPRINTING = 'Screenprinting' + STITCHING = 'Stitching (Shoes)' + TANNERY = 'Tannery' + WAREHOUSE = 'Warehouse' + WEAVING = 'Weaving' OTHER = 'Other' FACILITY_TYPE_CHOICES = ( (CUT_AND_SEW, CUT_AND_SEW), - (FABRIC_MILL, FABRIC_MILL), (DYEHOUSE, DYEHOUSE), - (LAUNDRY, LAUNDRY), + (EMBELLISHMENTS, EMBELLISHMENTS), + (FABRIC_MILL, FABRIC_MILL), (FINISHING, FINISHING), - (TANNERY, TANNERY), - (SPINNING, SPINNING), (GINNING, GINNING), + (KNITTING, KNITTING), + (LAUNDRY, LAUNDRY), + (PACKING, PACKING), + (SCOURING, SCOURING), + (SCREENPRINTING, SCREENPRINTING), + (STITCHING, STITCHING), + (TANNERY, TANNERY), + (WAREHOUSE, WAREHOUSE), + (WEAVING, WEAVING), (OTHER, OTHER), )