Implement Tom's emailed suggestions
This commit is contained in:
@ -179,17 +179,19 @@ class LongCaseStudyForm(BaseCaseStudyForm):
|
||||
SECTOR_HELP = {
|
||||
'RN': _("including electricity, heat or combined heat and power generation"),
|
||||
'PG': '',
|
||||
'ST': _('Biological, chemical, electrical, electromagnetic, electrochemical, mechanical including gravitational potential, thermal etc.'),
|
||||
'SM': _("including supply of minerals"),
|
||||
'MA': '',
|
||||
}
|
||||
|
||||
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': '',
|
||||
}
|
||||
|
||||
# TODO: Allow explanatory_text to not contain text for every option
|
||||
# TODO: Only output <span> if there is explanatory text
|
||||
def add_explanatory_text(self, model_choices, explanatory_text):
|
||||
return [
|
||||
(
|
||||
@ -203,11 +205,8 @@ class LongCaseStudyForm(BaseCaseStudyForm):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(LongCaseStudyForm, self).__init__(*args, **kwargs)
|
||||
|
||||
self.fields['positive_case_type'] = forms.ChoiceField(
|
||||
widget=forms.RadioSelect(),
|
||||
choices=CaseStudy.POSITIVE_CASE_TYPE_CHOICES,
|
||||
required=False
|
||||
)
|
||||
self.fields['positive_case_type'].label = ""
|
||||
self.fields['negative_case_reasons'].label = ""
|
||||
|
||||
self.fields['sector_of_economy'] = forms.ChoiceField(
|
||||
widget=forms.RadioSelect(),
|
||||
@ -282,6 +281,7 @@ class LongCaseStudyForm(BaseCaseStudyForm):
|
||||
'type_of_ecosystem',
|
||||
'describe_ecosystem',
|
||||
'affected_communities',
|
||||
'people_affected_other',
|
||||
'project_status',
|
||||
'synopsis',
|
||||
'full_description',
|
||||
@ -297,7 +297,6 @@ class LongCaseStudyForm(BaseCaseStudyForm):
|
||||
'shareholders',
|
||||
'financial_institutions',
|
||||
'financial_institutions_other',
|
||||
'energy_customers'
|
||||
),
|
||||
Fieldset(
|
||||
_("Media reports and other communications"),
|
||||
@ -314,31 +313,41 @@ class LongCaseStudyForm(BaseCaseStudyForm):
|
||||
Tab(
|
||||
_("Technical and economic analysis"),
|
||||
'sector_of_economy',
|
||||
Fieldset(
|
||||
'',
|
||||
Div(
|
||||
'generation_type',
|
||||
'generation_technology',
|
||||
'biomass_detail',
|
||||
'generation_technology_other',
|
||||
'total_generation_capacity',
|
||||
'generation_equipment_supplier',
|
||||
PrependedText('total_investment', 'USD$'),
|
||||
'technical_or_economic_details',
|
||||
css_id="power_generation_questions"
|
||||
css_class='power_generation_questions'
|
||||
),
|
||||
Fieldset(
|
||||
'',
|
||||
Div(
|
||||
'power_technology',
|
||||
'power_technology_other',
|
||||
'energy_storage_capacity',
|
||||
'energy_transmission_capacity',
|
||||
'contractor_or_supplier_of_technology',
|
||||
PrependedText('approximate_total_investment', 'USD$'),
|
||||
'additional_technical_details',
|
||||
css_id="power_grids_energy_storage_questions"
|
||||
css_class='energy_network_questions'
|
||||
),
|
||||
Fieldset(
|
||||
'',
|
||||
Div(
|
||||
'energy_details',
|
||||
css_class='energy_generation_network_and_storage_questions'
|
||||
),
|
||||
Div(
|
||||
'biomass_detail',
|
||||
'total_generation_capacity',
|
||||
css_class='power_generation_questions'
|
||||
),
|
||||
Div(
|
||||
'energy_transmission_capacity',
|
||||
css_class='energy_network_questions'
|
||||
),
|
||||
Div(
|
||||
'energy_storage_capacity',
|
||||
css_class='energy_storage_questions'
|
||||
),
|
||||
Div(
|
||||
PrependedText('total_investment', 'USD $'),
|
||||
'contractor_or_supplier_of_technology',
|
||||
'energy_customers',
|
||||
'additional_technical_details',
|
||||
css_class='energy_generation_network_and_storage_questions'
|
||||
),
|
||||
|
||||
Div(
|
||||
'minerals_or_commodities',
|
||||
'minerals_or_commodities_other',
|
||||
'use_in_energy_economy',
|
||||
@ -348,17 +357,16 @@ class LongCaseStudyForm(BaseCaseStudyForm):
|
||||
'projected_production_of_commodities',
|
||||
'type_of_extraction',
|
||||
'associated_infrastructure',
|
||||
css_id="mineral_commodity_questions"
|
||||
css_class="mineral_commodity_questions"
|
||||
),
|
||||
Fieldset(
|
||||
'',
|
||||
Div(
|
||||
'manufacturing_type',
|
||||
'manufacturing_description',
|
||||
'manufacturing_related_tech',
|
||||
'manufacturing_factors',
|
||||
'manufacturing_factors_description',
|
||||
'manufacturing_ownership',
|
||||
css_id="manufacturing_questions"
|
||||
css_class="manufacturing_questions"
|
||||
),
|
||||
FormActions(
|
||||
HTML("<a class='btn btn-primary btnPrevious'>"+_("Previous")+"</a>"),
|
||||
@ -369,9 +377,15 @@ class LongCaseStudyForm(BaseCaseStudyForm):
|
||||
_("Socio-environmental analysis"),
|
||||
HTML("<p>" + _("In the following, we expect the analysis to reflect the perspective of the organization(s) or person(s) describing the case.") + "</p>"),
|
||||
'positive_or_negative',
|
||||
HTML("<b>What kind of case is this entry about?</b>"),
|
||||
'positive_case_type',
|
||||
'negative_case_reasons',
|
||||
Div(
|
||||
HTML("<label class='col-md-3 control-label'>What kind of case is this entry about?</label>"),
|
||||
Div(
|
||||
'positive_case_type',
|
||||
'negative_case_reasons',
|
||||
css_class='col-md-9',
|
||||
),
|
||||
css_class='form-group',
|
||||
),
|
||||
'negative_case_reasons_other',
|
||||
'socioeconomic_benefits',
|
||||
'isolated_or_widespread',
|
||||
@ -383,10 +397,9 @@ class LongCaseStudyForm(BaseCaseStudyForm):
|
||||
'who_has_been_involved',
|
||||
'participation_mechanisms',
|
||||
'identified_partnerships',
|
||||
'potential_partnerships',
|
||||
'wants_conversation_with_ojuso',
|
||||
Div(
|
||||
css_id="common_questions"
|
||||
css_class="common_questions"
|
||||
),
|
||||
FormActions(
|
||||
HTML("<a class='btn btn-primary btnPrevious'>"+_("Previous")+"</a>"),
|
||||
|
||||
Reference in New Issue
Block a user