Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f946010985
106
apps/map/migrations/0059_auto_20180515_1403.py
Normal file
106
apps/map/migrations/0059_auto_20180515_1403.py
Normal file
@ -0,0 +1,106 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.11.6 on 2018-05-15 14:03
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations, models
|
||||
import multiselectfield.db.fields
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('map', '0058_auto_20180429_2205'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
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='energy_customers',
|
||||
field=models.TextField(blank=True, default='', help_text="List any wholesale energy customers that take energy from the development. E.g. 'national grids' or private energy suppliers. Please separate with a newline.", verbose_name='Energy consumers'),
|
||||
preserve_default=False,
|
||||
),
|
||||
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 project.', max_length=128, verbose_name='Entry 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 500kW)'), ('LSWE', 'Large-scale (more than 500kW)'))), ('Photovoltaic electricity', (('SSPV', 'Small-scale (less than 500kW)'), ('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 does the land fall under?', max_length=3, verbose_name='Land ownership'),
|
||||
),
|
||||
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 details'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='casestudy',
|
||||
name='participation_mechanisms',
|
||||
field=models.TextField(blank=True, default='', help_text='e.g. direct action, local referendums, legal cases, letters or petitions etc', verbose_name='What mechanisms of participation have been used?'),
|
||||
preserve_default=False,
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='casestudy',
|
||||
name='power_technology',
|
||||
field=models.CharField(blank=True, choices=[('PT', 'Power transmission (grid 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_owners',
|
||||
field=models.TextField(blank=True, default='', help_text='List companies or organisations that own the project and/or facilities. Separate with a new line.', verbose_name='Project and facility owners'),
|
||||
preserve_default=False,
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='casestudy',
|
||||
name='project_status',
|
||||
field=models.CharField(choices=[('EXSTNG', 'Existing Project'), ('UCONST', 'Under Construction'), ('PROJCD', 'Projected Project')], help_text='What is the status of the current 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 economy'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='casestudy',
|
||||
name='shareholders',
|
||||
field=models.TextField(blank=True, default='', help_text="List shareholders of the project owners you've just listed. Separate with a new line.", verbose_name='Shareholders of the project owners'),
|
||||
preserve_default=False,
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='casestudy',
|
||||
name='technical_or_economic_details',
|
||||
field=models.TextField(blank=True, default='', help_text='Specify any additional technical or economic details relating to the project.', verbose_name='Additional technical or economic details'),
|
||||
preserve_default=False,
|
||||
),
|
||||
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'),
|
||||
),
|
||||
]
|
@ -404,22 +404,16 @@ class CaseStudy(models.Model):
|
||||
)
|
||||
|
||||
# 1.11
|
||||
project_owners = models.CharField(
|
||||
project_owners = models.TextField(
|
||||
verbose_name=_("Project and facility owners"),
|
||||
help_text=_("List companies or organisations that own the project and/or facilities. Separate with a comma."),
|
||||
max_length=120,
|
||||
default=None,
|
||||
null=True,
|
||||
help_text=_("List companies or organisations that own the project and/or facilities. Separate with a new line."),
|
||||
blank=True
|
||||
)
|
||||
|
||||
# 1.12
|
||||
shareholders = models.CharField(
|
||||
shareholders = models.TextField(
|
||||
verbose_name=_("Shareholders of the project owners"),
|
||||
help_text=_("List shareholders of the project owners you've just listed. Separate with a comma."),
|
||||
max_length=120,
|
||||
default=None,
|
||||
null=True,
|
||||
help_text=_("List shareholders of the project owners you've just listed. Separate with a new line."),
|
||||
blank=True
|
||||
)
|
||||
|
||||
@ -441,13 +435,10 @@ class CaseStudy(models.Model):
|
||||
)
|
||||
|
||||
# 1.14
|
||||
energy_customers = models.CharField(
|
||||
energy_customers = models.TextField(
|
||||
verbose_name=_("Energy consumers"),
|
||||
help_text=_("List any wholesale energy customers that take energy from the development. E.g. 'national \
|
||||
grids' or private energy suppliers."),
|
||||
max_length=120,
|
||||
default=None,
|
||||
null=True,
|
||||
grids' or private energy suppliers. Please separate with a newline."),
|
||||
blank=True
|
||||
)
|
||||
|
||||
@ -612,12 +603,9 @@ class CaseStudy(models.Model):
|
||||
)
|
||||
|
||||
# 2.1.5
|
||||
technical_or_economic_details = models.CharField(
|
||||
technical_or_economic_details = models.TextField(
|
||||
verbose_name=_("Additional technical or economic details"),
|
||||
help_text=_("Specify any additional technical or economic details relating to the project."),
|
||||
max_length=500,
|
||||
default=None,
|
||||
null=True,
|
||||
blank=True
|
||||
)
|
||||
|
||||
@ -967,12 +955,9 @@ class CaseStudy(models.Model):
|
||||
)
|
||||
|
||||
# 3.2.4.3
|
||||
participation_mechanisms = models.CharField(
|
||||
participation_mechanisms = models.TextField(
|
||||
verbose_name=_("What mechanisms of participation have been used?"),
|
||||
help_text=_("e.g. direct action, local referendums, legal cases, letters or petitions etc"),
|
||||
max_length=512,
|
||||
default=None,
|
||||
null=True,
|
||||
blank=True
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user