Make power grid / energy storage Qs optional

approximate_total_investment & contractor_or_supplier_of_technology
should both be optional for non-"power grid / energy storage" types

apps/map/forms.py

@@ -68,6 +68,7 @@ class ShortCaseStudyForm(BaseCaseStudyForm):
             'community_voices'
         ]
 
+
 class LongCaseStudyForm(BaseCaseStudyForm):
     """Long version of the CaseStudy form."""
 

apps/map/migrations/0051_auto_20180404_2215.py

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.6 on 2018-04-04 22:15
+from __future__ import unicode_literals
+
+import django.contrib.gis.db.models.fields
+from django.db import migrations, models
+import multiselectfield.db.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('map', '0050_auto_20180402_1237'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='casestudy',
+            name='approximate_total_investment',
+            field=models.PositiveIntegerField(blank=True, default=None, help_text='Enter the approximate total investment in USD ($).', null=True, verbose_name='Approximate total investment'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='biomass_detail',
+            field=models.CharField(blank=True, default=None, help_text='If you selected biogas or biomass, please describe the feedstock (where the fuel came from e.g.                    corn, algae, anaerobic digestion, commercial waste etc.)', max_length=200, null=True, verbose_name='Description of feedstock'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='community_voices',
+            field=models.TextField(blank=True, default=None, help_text='Add any direct quotes from members of the community that                   relate to this project', null=True, verbose_name='Community voices'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='contractor_or_supplier_of_technology',
+            field=models.CharField(blank=True, default=None, help_text='List companies that act as contractors or suppliers of technology related to energy storage.', max_length=256, null=True, verbose_name='Contractor and/or supplier of technology'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='energy_customers',
+            field=models.CharField(blank=True, default=None, help_text="List any wholesale customers that take energy from the development. E.g. 'national                     grids' or private energy suppliers.", max_length=120, null=True, verbose_name='Energy consumers'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='entry_name',
+            field=models.CharField(help_text='Enter the name of the entry. This should usually be the                   name of the project.', max_length=128, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='full_description',
+            field=models.TextField(help_text='Describe the project in full. Separate paragraphs with a                    new line Please add as much detail as you feel is necessary                    here.', verbose_name='Full description'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='generation_technology',
+            field=models.CharField(blank=True, choices=[('Wind energy', (('SSWE', 'Small-scale (less than 500 kW)'), ('LSWE', 'Large-scale (more than 500kW)'))), ('Photovoltaic electricity', (('SSPV', 'Small-scale (less than 500 kW)'), ('LSPV', 'Large-scale (more than 500kW)'))), ('Hydroelectric', (('SHYD', 'Small-scale (less than 1MW)'), ('MHYD', 'Medium-scale (between 1-20MW)'), ('LHYD', 'Large-scale (more than 20MW - often not considered renewable)'))), ('STHE', 'Solar thermal electricity (e.g. using parabolic reflectors)'), ('GEOT', 'Geothermal electricity'), ('BIOG', 'Biogas turbine'), ('OTHB', 'Other biomass (including liquid/solid biofuel)'), ('OTHR', 'Other (tidal, wave etc.)')], default=None, help_text='Select the type of renewable energy generation that most applies to this case study.', max_length=4, null=True, verbose_name='Generation technology'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='generation_technology_other',
+            field=models.CharField(blank=True, default=None, help_text='If you selected other, please specify the generation technology (e.g. tidal, wave etc.)', max_length=200, null=True, verbose_name='Other generation type'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='land_ownership',
+            field=models.CharField(choices=[('PRI', 'Private land'), ('PUB', 'Public land'), ('COM', 'Community land'), ('OTH', 'Other')], help_text='What type of ownership/tenure does the land fall under?', max_length=3, verbose_name='Land ownership/tenure'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='land_ownership_details',
+            field=models.CharField(blank=True, help_text="Please specify details about land ownership if you chose 'other'", max_length=256, null=True, verbose_name='Land ownership/tenure details'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='location',
+            field=django.contrib.gis.db.models.fields.PointField(help_text='Place a marker using the tools on the left of the map. Zoom in as far as you can so the placement                     is accurate (important).', srid=4326, verbose_name='Project location'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='power_technology',
+            field=models.CharField(blank=True, choices=[('PT', 'Power transmission (power lines, substations etc.)'), ('ES', 'Energy storage (pumped storage, compressed air, battery systems etc.)'), ('OT', 'Others')], default=None, help_text='Select the related energy technology.', max_length=2, null=True, verbose_name='Power technology'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='project_status',
+            field=models.CharField(choices=[('EXSTNG', 'Existing project'), ('UCONST', 'Under construction'), ('PROJCD', 'Planned project')], help_text='What is the current status of the project?', max_length=6, verbose_name='Status of project'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='sector_of_economy',
+            field=models.CharField(choices=[('RN', 'Renewable energy generation'), ('PG', 'Power grids'), ('SM', 'Supply of minerals')], help_text='Which sector of the renewable energy economy is most                    relevant?', max_length=3, verbose_name='Sector of the renewable energy economy'),
+        ),
+        migrations.AlterField(
+            model_name='casestudy',
+            name='type_of_ecosystem',
+            field=multiselectfield.db.fields.MultiSelectField(blank=True, choices=[('MARINE', 'Marine (e.g. ocean, sea)'), ('FRESH', 'Freshwater (e.g. freshwater, lake)'), ('FOREST', 'Forest/jungle'), ('AGRI', 'Agricultural land'), ('GRASS', 'Grassland'), ('DESERT', 'Desert (tundra, ice or sand)'), ('WETLND', 'Wetland (marsh, mangrove, peat soil)'), ('URBAN', 'Urban')], default=None, help_text='Select the most relevant type(s).', max_length=56, null=True, verbose_name='Type(s) of ecosystem'),
+        ),
+    ]

apps/map/models.py

@@ -661,7 +661,7 @@ class CaseStudy(models.Model):
         max_length=256,
         default=None,
         null=True,
-        blank=None
+        blank=True
     )
 
     # 2.2.4
@@ -670,7 +670,7 @@ class CaseStudy(models.Model):
         help_text=_('Enter the approximate total investment in USD ($).'),
         default=None,
         null=True,
-        blank=None
+        blank=True
     )
 
     # 2.2.5