Through to row 101

This commit is contained in:
2018-11-24 17:58:08 +00:00
parent 5c4e9c330d
commit 857634d1f1
3 changed files with 148 additions and 90 deletions

View File

@ -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',