diff --git a/apps/map/forms.py b/apps/map/forms.py index 6779fa7..471d8d1 100644 --- a/apps/map/forms.py +++ b/apps/map/forms.py @@ -215,6 +215,13 @@ class LongCaseStudyForm(BaseCaseStudyForm): 'SM': _("including supply of minerals and/or manufacturing/processing of equipment used in the renewable energy economy") } + POWER_TECHNOLOGY_HELP = { + 'PT': _('Lines, transformers, machinery etc.'), + 'ES': _('Biological, chemical, electrical, electromagnetic, electrochemical, mechanical including gravitational potential, thermal etc.'), + 'HN': _('District heating/cooling, etc.'), + 'OT': '', + } + def add_explanatory_text(self, model_choices, explanatory_text): return [ ( @@ -246,6 +253,15 @@ class LongCaseStudyForm(BaseCaseStudyForm): required=False ) + self.fields['power_technology'] = forms.ChoiceField( + widget=forms.RadioSelect(), + choices=self.add_explanatory_text( + CaseStudy.POWER_TECHNOLOGY_CHOICES, + self.POWER_TECHNOLOGY_HELP + ), + required=False + ) + self.fields['project_owners'].required = True self.fields['shareholders'].required = True @@ -297,7 +313,8 @@ class LongCaseStudyForm(BaseCaseStudyForm): _("Technical and economic analysis"), 'sector_of_economy', Fieldset( - _("Power Generation Questions"), + '', + 'generation_type', 'generation_technology', 'biomass_detail', 'generation_technology_other', @@ -308,7 +325,7 @@ class LongCaseStudyForm(BaseCaseStudyForm): css_id="power_generation_questions" ), Fieldset( - _("Power Grids/Energy Storage Questions"), + '', 'power_technology', 'power_technology_other', 'energy_storage_capacity', @@ -320,7 +337,7 @@ class LongCaseStudyForm(BaseCaseStudyForm): css_id="power_grids_energy_storage_questions" ), Fieldset( - _("Mineral/Commodity Questions"), + '', 'minerals_or_commodities', 'minerals_or_commodities_other', 'use_in_energy_economy', diff --git a/apps/map/models.py b/apps/map/models.py index f6220f9..69ff021 100644 --- a/apps/map/models.py +++ b/apps/map/models.py @@ -138,31 +138,47 @@ class CaseStudy(models.Model): ('WB', _('World Bank')), ) + GENERATION_TYPE_CHOICES = ( + ('POW', _('Power')), + ('HOT', _('Heat/Cool')), + ('CHP', _('Combined Heat/Cool and Power (CHP)')), + ) + GENERATION_TECHNOLOGY_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)')), + ('BIO', _('Bio-energy')), ('GEOT', _('Geothermal electricity')), - ('BIOG', _('Biogas turbine')), - ('OTHB', _('Other biomass (including liquid/solid biofuel)')), + (_('Hydro'), ( + ('uHYD', _('Micro hydro (<100kW)')), + ('SHYD', _('Small-scale hydro (<1MW)')), + ('MHYD', _('Medium-scale hydro (1-30MW)')), + ('LHYD', _('Large-scale hydro (>30MW - often not considered renewable)')), + )), + (_('Marine'), ( + ('WAVE', _('Wave')), + ('TSTR', _('Tidal stream')), + ('TBAR', _('Tidal barrage/lagoon')), + ('TOTH', _('Other')), + )), + (_('Solar'), ( + ('SSPV', _('Small-scale photovoltaic (<500kW)')), + ('LSPV', _('Large-scale photovoltaic (>500kW)')), + ( 'CSP', _('Concentrated solar power (CSP)')), + ('PARA', _('Parabolic trough (open or enclosed)')), + ('FRES', _('Fresnel reflector')), + ('STIR', _('Dish Stirling')), + )), + (_('Wind'), ( + ('SSWE', _('Small-scale wind (<500kW)')), + ('LSWE', _('Large-scale wind (>500kW)')) + )), ('OTHR', _('Other (tidal, wave etc)')) ) POWER_TECHNOLOGY_CHOICES = ( - ('PT', _('Power transmission (grid lines, substations etc)')), - ('ES', _('Energy storage (pumped storage, compressed air, battery systems etc')), - ('OT', _('Others')) + ('PT', _('Electrical power transmission')), + ('ES', _('Energy storage')), + ('HN', _('Heat networks')), + ('OT', _('Other')), ) TYPE_OF_EXTRACTION_CHOICES = ( @@ -556,8 +572,15 @@ class CaseStudy(models.Model): # Second Screen - Technical and economic analysis ## - # 2.1 - Renewable Energy Generation - # 2.1.1 + ## Energy generation project + + generation_type = models.CharField( + verbose_name=_('What is being generated?'), + max_length=4, + choices=GENERATION_TYPE_CHOICES, + blank=True + ) + generation_technology = models.CharField( verbose_name=_("Generation technology"), help_text=_("Select the type of renewable energy generation that most applies to this case study."), @@ -566,20 +589,32 @@ class CaseStudy(models.Model): blank=True ) - # 2.1.1.12 - # Should be filled in if 2.1.1 was answered as biogas or biomass. - biomass_detail = models.CharField( - verbose_name=_("Description of feedstock"), - 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)"), + generation_technology_other = models.CharField( + verbose_name=_("Further details"), + help_text=_("If you selected other, or if you would like to further define what you have chosen, \ + please specify the generation technology further. For example, if you chose solar PV \ + it is most likely to be a crystalline silicon type, but maybe it is not."), max_length=200, blank=True ) - # 2.1.1.14 - generation_technology_other = models.CharField( - verbose_name=_("Other generation type"), - help_text=_("If you selected other, please specify the generation technology (e.g. tidal, wave etc)"), + # Should be filled in if generation_technology was answered as bio-energy + biomass_detail = models.CharField( + verbose_name=_("Bio-energy feedstock"), + help_text=_("
Please describe the source of the fuel and how it is processed/used. \ + Please consider:\ +
We do not expect users to know this information, but if you do \ + it may be useful to give a fuller picture.\ +