diff --git a/apps/map/models.py b/apps/map/models.py index f136e07..90c33d4 100644 --- a/apps/map/models.py +++ b/apps/map/models.py @@ -1115,30 +1115,6 @@ class CaseStudy(models.Model): """Gets the 11 number video ID from the video field.""" return parse.urlparse(self.video).path - def get_negative_case_reasons_no_other(self): - """Return a list of negative case reasons, minus the 'other' choice (if selected)""" - choices = self.get_negative_case_reasons_list() - - return choices - - def get_renewable_generation_detail(self): - """Prepend appropriate descriptive text when accessing renewable generation type.""" - - if self.generation_technology: - if self.generation_technology.endswith('WE'): - return _('Wind energy') + " – " + self.get_generation_technology_display() - elif self.generation_technology.endswith('PV'): - return _('Photovoltaic electricity') + " – " + self.get_generation_technology_display() - elif self.generation_technology.endswith('HYD'): - return _('Hydroelectric') + " – " + self.get_generation_technology_display() - elif self.generation_technology == 'OTHR': - return self.generation_technology_other - else: - return self.get_generation_technology_display() - - else: - return "" - class Meta: verbose_name_plural = 'case studies' diff --git a/apps/map/templates/map/detail.html b/apps/map/templates/map/detail.html index b061b90..1f6036f 100644 --- a/apps/map/templates/map/detail.html +++ b/apps/map/templates/map/detail.html @@ -117,12 +117,13 @@ dd ul { padding-left: 0; margin-left: 0; } {% endif %} {% if case_study.land_ownership %} -
{% trans "Land ownership" %}: - {% if case_study.land_ownership == 'OTH' %} -
{{ case_study.land_ownership_details }} - {% else %} -
{{ case_study.get_land_ownership_display }} - {% endif %} +
{% trans "Land ownership and tenure" %}: +
+ {% if case_study.land_ownership != 'OTH' %} + {{ case_study.get_land_ownership_display }} + {% endif %} + + {{ case_study.land_ownership_details | linebreaks }} {% endif %} {% if case_study.type_of_ecosystem %} @@ -137,13 +138,10 @@ dd ul { padding-left: 0; margin-left: 0; } - {% if case_study.affects_indigenous %} + {% if case_study.affected_communities %}

{% trans "Affected groups of people" %}

-

{% trans "Indigenous people" %}

- {{ case_study.people_affected_indigenous | linebreaks }} - -

{% trans "Non-indigenous people" %}

+ {{ case_study.get_affected_communities_display }} {{ case_study.people_affected_other | linebreaks }} {% endif %} @@ -156,12 +154,12 @@ dd ul { padding-left: 0; margin-left: 0; } {% endif %} {% if case_study.start_year %} -
{% trans "Start year" %}: +
{% trans "Construction start year" %}:
{{ case_study.start_year }} {% endif %} {% if case_study.completion_year %} -
{% trans "Completion year" %}: +
{% trans "Operation start year" %}:
{{ case_study.completion_year }} {% endif %} @@ -170,6 +168,11 @@ dd ul { padding-left: 0; margin-left: 0; }
{{ case_study.project_owners }} {% endif %} + {% if case_study.consultants_contractors %} +
{% trans "Consultants and contractors" %}: +
{{ case_study.consultants_contractors }} + {% endif %} + {% if case_study.shareholders %}
{% trans "Shareholders of the project owners" %}:
{{ case_study.shareholders }} @@ -177,7 +180,9 @@ dd ul { padding-left: 0; margin-left: 0; } {% if case_study.financial_institutions %}
{% trans "Financial institutions" %}: -
{{ case_study.financial_institutions }} +
+ {{ case_study.get_financial_institutions_display }} + {{ case_study.financial_institutions_other }} {% endif %} {% if case_study.energy_customers %} @@ -241,17 +246,24 @@ dd ul { padding-left: 0; margin-left: 0; }

Technical and economic analysis

{% if case_study.sector_of_economy == 'RN' %} - +
+ {% if case_study.generation_type %} +
{% trans "What is being generated?" %}: +
+ {{ case_study.get_generation_type_detail }} + {% endif %} + {% if case_study.generation_technology %}
{% trans "Generation technology" %}:
- {{ case_study.get_renewable_generation_detail }} +

{{ case_study.get_generation_technology_display }} +

{{ case_study.energy_details }} {% endif %} - {% if case_study.generation_technology == 'BIOG' or case_study.generation_technology == 'OTHB' %} -

{% trans "Feedstock" %}: + {% if case_study.generation_technology == 'BIO' %} +
{% trans "Bio-energy feedstock" %}:
{{ case_study.biomass_detail }} {% endif %} @@ -274,49 +286,45 @@ dd ul { padding-left: 0; margin-left: 0; } ${{ case_study.total_investment | intcomma }} (USD) {% endif %} - {% if case_study.technical_or_economic_details %} + {% if case_study.additional_technical_details %}
{% trans "Additional technical or economic details" %}: -
- {{ case_study.technical_or_economic_details | linebreaks }} +
+ {{ case_study.additional_technical_details | linebreaks }} {% endif %} -
- {% elif case_study.sector_of_economy == 'PG' %} - + {% elif case_study.sector_of_economy == 'PG' or case_study.sector_of_economy == 'ST' %} +
{% if case_study.power_technology %}
{% trans "Generation technology" %}:
- {% if case_study.power_technology == 'OT' %} - {{ case_study.power_technology_other }} - {% else %} - {{ case_study.power_technology }} - {% endif %} +

{{ case_study.power_technology }} +

{{ case_study.power_technology_other }} {% endif %} {% if case_study.energy_storage_capacity %}

{% trans "Energy storage capacity" %}:
- {{ case_study.energy_storage_capacity }} TODO UNITS? + {{ case_study.energy_storage_capacity }} kWh {% endif %} {% if case_study.energy_transmission_capacity %}
{% trans "Energy transmission capacity" %}:
- {{ case_study.energy_transmission_capacity }} TODO UNITS? + {{ case_study.energy_transmission_capacity }} kW {% endif %} - {% if case_study.contractor_or_supplier_of_technology %} -
{% trans "Contractor and/or supplier of technology" %}: -
- {{ case_study.contractor_or_supplier_of_technology }} + {% if case_study.generation_equipment_supplier %} +
{% trans "Generation equipment supplier" %}: +
+ {{ case_study.generation_equipment_supplier }} {% endif %} - {% if case_study.approximate_total_investment %} + {% if case_study.total_investment %}
{% trans "Approximate total investment" %}: -
- ${{ case_study.approximate_total_investment | intcomma }} (USD) +
+ ${{ case_study.total_investment | intcomma }} (USD) {% endif %} {% if case_study.additional_technical_details %} @@ -324,30 +332,33 @@ dd ul { padding-left: 0; margin-left: 0; }
{{ case_study.additional_technical_details | linebreaks }} {% endif %} +
{% elif case_study.sector_of_economy == 'SM' %} - +
{% if case_study.minerals_or_commodities %} -
{% trans "Mineral commodity/commodities" %}: +
{% trans "Primary mineral mined" %}:
- {% if case_study.minerals_or_commodities == 'OTR' %} - {{ case_study.minerals_or_commodities_other }} - {% else %} - {{ case_study.get_minerals_or_commodities_display }} + {% if case_study.minerals_or_commodities != 'OTR' %} +

{{ case_study.get_minerals_or_commodities_display }} {% endif %} + + {{ case_study.minerals_or_commodities_other | linebreaks }} {% endif %} {% if case_study.use_in_energy_economy %}

{% trans "Potential use in renewable energy economy" %}:
- {% if case_study.use_in_energy_economy == 'OTR' %} - {{ case_study.use_in_energy_economy_other }} - {% else %} + {% if case_study.use_in_energy_economy != 'OTR' %} {{ case_study.get_use_in_energy_economy_display }} {% endif %} + + {% if case_study.use_in_energy_economy_other %} + {{ case_study.use_in_energy_economy_other }} + {% endif %} {% endif %} {% if case_study.project_life_span %} @@ -363,7 +374,7 @@ dd ul { padding-left: 0; margin-left: 0; } {% endif %} {% if case_study.projected_production_of_commodities %} -
{% trans "Projected production of key commodities" %}: +
{% trans "Estimated production of key commodities" %}:
{{ case_study.projected_production_of_commodities }} {% endif %} @@ -381,29 +392,85 @@ dd ul { padding-left: 0; margin-left: 0; } {% endif %}
+ {% elif case_study.sector_of_economy == 'MA' %} + + +
+ {% if case_study.manufacturing_type %} +
{% trans "Manufacturing process" %}: +
+ {{ case_study.get_manufacturing_type_display }} + {% endif %} + + {% if case_study.manufacturing_description %} +
{% trans "Description" %}: +
+ {{ case_study.manufacturing_description }} + {% endif %} + + {% if case_study.manufacturing_related_tech %} +
{% trans "Related technology" %}: +
{% trans "Remarkable factors" %}: +
+ {{ case_study.get_manufacturing_factors_display }} + {% endif %} + + {% if case_study.manufacturing_factors_description %} +
{% trans "More info" %}: +
+ {{ case_study.manufacturing_factors_description }} + {% endif %} + + {% if case_study.manufacturing_factors_ownership %} +
{% trans "Ownership information" %}: +
+ {{ case_study.manufacturing_factors_ownership }} + {% endif %} +
+ {% endif %}

Socio-economic analysis

-
{% trans "Case type" %} +
{% trans "Kind of organising process around this project" %}
{{ case_study.get_positive_or_negative_display }} - {% if case_study.positive_or_negative == "P" %} - +
{% trans "This is case is about" %}: +
+
    - {% if case_study.positive_case_type %} -
    {% trans "Type of positive case" %}: -
    - {{ case_study.get_positive_case_type_display }} - {% endif %} + {% if case_study.positive_case_type %} + {% for text in case_study.get_positive_case_type_list %} +
  • {{ text }} + {% endfor %} + {% endif %} + + {% if case_study.negative_case_reasons %} + {% for text in case_study.get_negative_case_reasons_list %} +
  • {{ text }} + {% endfor %} + {% endif %} + +
{% if case_study.socioeconomic_benefits %} -
{% trans "Socio-economic benefits" %}: +
{% trans "Socio-economic impacts" %}
{{ case_study.socioeconomic_benefits }} {% endif %} + {% if case_study.isolated_or_widespread %} +
{% trans "Is the project part of developments which are causing a cumulative effect?" %} +
+ {{ case_study.isolated_or_widespread }} + {% endif %} + {% if case_study.key_actors_involved %}
{% trans "Key actors involved" %}:
@@ -411,53 +478,23 @@ dd ul { padding-left: 0; margin-left: 0; } {% endif %} {% if case_study.project_status_detail %} -
{% trans "Current status of project" %}: +
{% trans "Current status of the case" %}:
{{ case_study.project_status_detail }} {% endif %} {% if case_study.obstacles_and_hindrances %} -
{% trans "Obstacles and hindrances" %}: +
{% trans "Current status of the organizing process around this case" %}:
{{ case_study.obstacles_and_hindrances }} {% endif %} - {% if case_study.identified_partnerships %} -
{% trans "Identified partnerships" %}: -
- {{ case_study.identified_partnerships }} - {% endif %} - - - {% else %} - - - {% if case_study.negative_case_reasons %} -
{% trans "Reasons this is a negative case study" %}: -
-
    - {% for text in case_study.get_negative_case_reasons_no_other %} -
  • {{ text }} - {% endfor %} - - {% if case_study.negative_case_reasons_other %} -
  • {{ case_study.negative_case_reasons_other }} - {% endif %} -
- {% endif %} - {% if case_study.negative_socioenvironmental_impacts %} -
{% trans "Negative socio-environmental impacts" %}: +
{% trans "Socio-environmental impacts" %}:
{{ case_study.negative_socioenvironmental_impacts }} {% endif %} - {% if case_study.isolated_or_widespread %} -
{% trans "Isolated or commonplace" %}: -
- {{ case_study.isolated_or_widespread }} - {% endif %} - {% if case_study.when_did_organising_start %}
{% trans "Local organising efforts began" %}:
@@ -470,13 +507,17 @@ dd ul { padding-left: 0; margin-left: 0; } {{ case_study.who_has_been_involved }} {% endif %} - {% if case_study.potential_partnerships %} -
{% trans "Potential partnerships" %}: -
- {{ case_study.potential_partnerships }} + {% if case_study.participation_mechanisms %} +
{% trans "Mechanisms of participation" %}: +
+ {{ case_study.participation_mechanisms }} {% endif %} - {% endif %} + {% if case_study.identified_partnerships %} +
{% trans "Identified partnerships" %}: +
+ {{ case_study.identified_partnerships }} + {% endif %}