From 5e49de16d063a8a0533274fddd83896ecacdce90 Mon Sep 17 00:00:00 2001 From: Anna Sidwell Date: Sun, 2 Dec 2018 02:23:58 +0000 Subject: [PATCH] Remove unused fields --- .../map/migrations/0074_auto_20181202_0223.py | 41 +++++++++++++ apps/map/models.py | 59 ------------------- 2 files changed, 41 insertions(+), 59 deletions(-) create mode 100644 apps/map/migrations/0074_auto_20181202_0223.py diff --git a/apps/map/migrations/0074_auto_20181202_0223.py b/apps/map/migrations/0074_auto_20181202_0223.py new file mode 100644 index 0000000..4049ed3 --- /dev/null +++ b/apps/map/migrations/0074_auto_20181202_0223.py @@ -0,0 +1,41 @@ +# Generated by Django 2.1.1 on 2018-12-02 02:23 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('map', '0073_auto_20181202_0209'), + ] + + operations = [ + migrations.RemoveField( + model_name='casestudy', + name='approximate_total_investment', + ), + migrations.RemoveField( + model_name='casestudy', + name='discharge_time', + ), + migrations.RemoveField( + model_name='casestudy', + name='generation_equipment_supplier', + ), + migrations.RemoveField( + model_name='casestudy', + name='maximum_power_output', + ), + migrations.RemoveField( + model_name='casestudy', + name='people_affected_indigenous', + ), + migrations.RemoveField( + model_name='casestudy', + name='potential_partnerships', + ), + migrations.RemoveField( + model_name='casestudy', + name='technical_or_economic_details', + ), + ] diff --git a/apps/map/models.py b/apps/map/models.py index ab5129e..12f820b 100644 --- a/apps/map/models.py +++ b/apps/map/models.py @@ -429,13 +429,6 @@ class CaseStudy(models.Model): blank=True ) - # XXX Delete after migration - merge into affected_communities - people_affected_indigenous = models.TextField( - verbose_name=_("DELETE - Indigenous people affected"), - help_text=_("What group or groups of indigenous people are affected by this project? \ - Please separate by newline."), - blank=True - ) people_affected_other = models.TextField( verbose_name=_("Communities or identities – further detail"), @@ -673,13 +666,6 @@ class CaseStudy(models.Model): null=True ) - # XXX Delete after migration - merge into contractor_or_supplier_of_technology - generation_equipment_supplier = models.TextField( - verbose_name=_("DELETE - Generation equipment supplier(s)"), - help_text=_("Enter the supplier of the generation equipment. (E.g. Siemens Gamesa, GE, Alstom, Vestas, Hanwha Q CELLS, Mitsubishi, First Solar, Jinko Solar, Trina Solar, Suzlon Energy, Statkraft, Shanghai Electric, Ballard Power Systems, Panasonic, etc.)"), - blank=True - ) - # 2.1.4 total_investment = models.IntegerField( verbose_name=_("Total investment (in USD)"), @@ -688,13 +674,6 @@ class CaseStudy(models.Model): null=True ) - # XXX Delete after migration - merge into additional_technical_details - technical_or_economic_details = models.TextField( - verbose_name=_("DELETE - Additional technical or economic details"), - help_text=_("Specify any additional technical or economic details relating to the project."), - blank=True - ) - # 2.2 - Power Grids / Energy Storage # 2.2.1 power_technology = models.CharField( @@ -727,26 +706,6 @@ class CaseStudy(models.Model): null=True, ) - # XXX Delete after migration - no merge - maximum_power_output = models.DecimalField( - verbose_name=_('DELETE - Maximum power output'), - help_text=_('Enter the maximum power output of the storage system in kilowatts (kW).'), - max_digits=12, - decimal_places=3, - blank=True, - null=True, - ) - - # XXX Delete after migration - no merge - discharge_time = models.DecimalField( - verbose_name=_('DELETE - Time for discharge from full capacity'), - help_text=_('Enter the time it takes to discharge from full capacity at maximum power output (in hours).'), - max_digits=6, - decimal_places=3, - blank=True, - null=True - ) - # TODO: Auto-completion based on previous entries so we can query case-studies with the same answer. contractor_or_supplier_of_technology = models.TextField( verbose_name=_('Contractor and/or supplier of technology'), @@ -754,15 +713,6 @@ class CaseStudy(models.Model): blank=True, ) - # XXX Delete after migration - merge into total_investment - approximate_total_investment = models.PositiveIntegerField( - verbose_name=_('DELETE - Approximate total investment'), - help_text=_('Enter the approximate total investment in USD ($).'), - blank=True, - default=None, - null=True, - ) - # 2.2.5 additional_technical_details = models.TextField( verbose_name=_("Additional technical or economic details"), @@ -990,15 +940,6 @@ class CaseStudy(models.Model): blank=True ) - # XXX delete after migration - merge with identified_partnerships - potential_partnerships = models.CharField( - verbose_name=_("DELETE - Describe potential partnerships"), - help_text=_("Are you looking for partnerships or do you have any clearly identified need? If so, please \ - describe it here."), - max_length=512, - blank=True - ) - # 3.2.7 wants_conversation_with_ojuso = models.BooleanField( verbose_name=_("Would you like to have a conversation with the ojuso team?"),