Add annual demand increase option to demand estimation by CelinaKellinghaus · Pull Request #31 · rl-institut/offgridplanner-thailand

CelinaKellinghaus · 2026-03-10T07:11:37Z

This PR enhances the Demand Estimation page by adding an optional feature that allows users to apply an annual demand increase in percent.

Added a toggle: "Apply annual demand increase"
When enabled, display an input field for annual demand increase
Accepts decimal values (Default value: 0%)
No changes to calculations yet

Contributes to #1

paulapreuss

Thanks for getting started on this! We can have a look at the review comments together and discuss how to continue 🔨

paulapreuss · 2026-03-10T08:09:25Z

+                    <div class="input-group" style="max-width: 200px">
+                      <input type="number"
+                             id="annualDemandGrowth"
+                             class="form-control"
+                             value="0"
+                             step="0.1"
+                             min="0">
+                      <span class="input-group-text">%</span>
+                    </div>
+


I think even though we have not settled on the calculation yet, we can already add the field to the CustomDemand model instead of a hard-coded form field in the html. The field should then also be defined in form_parameters.csv with the default and help text, so we don't have these things within the template.

paulapreuss · 2026-03-10T08:10:10Z

+                             id="annualDemandGrowth"
+                             class="form-control"
+                             value="0"
+                             step="0.1"


This is just a nitpick, but I think If the field takes inputs in %, the step value should be 1 to be less confusing, as it is with the demand tier values.

paulapreuss · 2026-03-10T08:14:02Z

+              <!-- Collapsible Input Section -->
+              <div class="accordion-item" style="border-top: none; padding: 10px">
+
+                <div id="collapseGrowth"
+                     class="accordion-collapse collapse">
+


I think it fits within the current layout to do this with an accordion, but here there is a part of the accordion that still looks a bit off, probably because of the container order or one div too many... html is a bit finnicky like that

We will also have to watch the collapse logic of the accordions, e.g. when I select custom demand timeseries the other options should be hidden, but currently it is showing

paulapreuss · 2026-03-10T08:18:26Z

+// Anual Demand Increase
+const growthToggle = document.getElementById("growthToggle");
+const annualDemandGrowthInput = document.getElementById("annualDemandGrowth");



It seems like you are not on the most current state of main, because Josi did a big refactoring of demand_estimation.js that I merged last week and it does not show here yet. I am a bit surprised that your branch is not showing any merge conflicts. Can you pull the latest changes from main and rebase this branch on top of it? :)

paulapreuss

I did not have time to check the template functionality, but you're also still working on it so I think that's alright. I left some comments on the rest of the code. Looking correct and clean so far :)

paulapreuss · 2026-03-18T14:33:17Z

+            initial["annual_demand_increase"] = self.change_percentage_format(
+                instance.annual_demand_increase,
+                upper_limit=100
+            )


Instead of having this check here, you can just add the field to self.percentage_fields a couple lines above, so that it will be changed within the respective loop

paulapreuss · 2026-03-18T14:33:41Z

Here is where all the fields that should be served in a percentage format are handled within this form

paulapreuss · 2026-03-18T14:35:04Z

+        if cleaned_data.get("annual_demand_increase") is not None:
+            cleaned_data["annual_demand_increase"] = self.change_percentage_format(
+                cleaned_data["annual_demand_increase"],
+                upper_limit=1,
+            )


Same here, if you include the field in the respective list once it will just be handled with the rest, no need to clean it separately :)

Actually, one thing you could do if you wanted to custom clean this field, would be to set it to None if the input value is 0 (that would help you with the functionality of the accordeon in the template rendering as closed when the user returns to the page). If so, you could look at clean_<fieldname> instead of doing it in the general clean method.

https://docs.djangoproject.com/en/6.0/ref/forms/validation/
https://sayari3.com/articles/12-understand-clean-and-clean_fieldname-in-django/

paulapreuss · 2026-03-18T14:35:46Z

    def change_percentage_format(value, upper_limit=1):
+        if value is None:
+            return None
        # Changes the value from a percentage range 0-1 to 0-100 and viceversa


Good call! I should have already included this check earlier

paulapreuss · 2026-03-18T14:39:46Z

                      <div class="shares-container">
                        {% for field in form %}
-                        {% if field.name != 'annual_total_consumption' and field.name != 'annual_peak_consumption' %}
+                        {% if field.name != 'annual_total_consumption' and field.name != 'annual_peak_consumption' and field.name != 'annual_demand_increase'%}


Just a style thought: I feel like this is getting a bit convoluted. I would rather pass a list of the other fields ["low", "medium", "high"] to the context and change this to something like

Suggested change

{% if field.name != 'annual_total_consumption' and field.name != 'annual_peak_consumption' and field.name != 'annual_demand_increase'%}

{% if field.name in shares_tiers %}

Actually, you can just call this list directly from the custom demand object in the view

shares_tiers = custom_demand.shares_tiers #custom_demand being the CustomDemand model instance

paulapreuss

Nice, thank you! ⭐ I pushed one commit moving the slider a bit in the html - I think it would be better to have it outside of the big accordion, so that it can still be selected if uploading a demand file. Otherwise it looks and works well, the issues with the slider being in the wrong position when reloading the page are very normal cacheing properties that also apply to the other sliders. I think we can keep it as is for now and finetune down the line if it ends up being necessary.

I think we shouldn't quite merge this yet, but keep it on hold and continue working on it once we decide how the demand increase will actually influence the demand.

# Conflicts: # offgridplanner/static/js/pages/demand_estimation.js

That way this option can also be selected if custom demand has been uploaded

CelinaKellinghaus requested a review from paulapreuss March 10, 2026 07:11

paulapreuss reviewed Mar 10, 2026

View reviewed changes

CelinaKellinghaus force-pushed the feature/demand-increase branch 2 times, most recently from 8d99238 to c9deb51 Compare March 17, 2026 08:34

paulapreuss reviewed Mar 18, 2026

View reviewed changes

CelinaKellinghaus force-pushed the feature/demand-increase branch 2 times, most recently from cd36dcc to 7b97bc0 Compare March 25, 2026 10:53

paulapreuss self-requested a review March 25, 2026 13:47

paulapreuss reviewed Mar 25, 2026

View reviewed changes

CelinaKellinghaus force-pushed the feature/demand-increase branch from fc4e185 to c219c6a Compare May 20, 2026 09:00

CelinaKellinghaus and others added 15 commits June 10, 2026 16:25

Add annual demand increase option to demand estimation

510c585

# Conflicts: # offgridplanner/static/js/pages/demand_estimation.js

Added annual demand increase to views.py, forms.py and models.py

f0e5400

Added toggle-switch to demand estimation page

1b3d6ad

Added annual demand increase option to the demand estimation page

334d90e

Added migration file for annual demand increase

dceb7ab

Fixed change_percentage_format function

55c24ee

Refactor percentage field handling in CustomDemandForm

9d6e431

Set annual_demand_increase to None when 0

78a36b6

Simplify template by using shares_tiers instead of exclusions

78f2501

Updated CHANGELOG.md

ab2f9be

Move slider outside of main accordion

67d139a

That way this option can also be selected if custom demand has been uploaded

Apply annual demand increase to demand calculations

a43f231

Remove unused variable and print statement

8dd476d

Add processing tests

f8064d8

Add annual demand increase tests

9e67d9d

paulapreuss force-pushed the feature/demand-increase branch from 085adc9 to 9e67d9d Compare June 11, 2026 08:53

paulapreuss added 2 commits June 11, 2026 12:02

Fix styling for annual increase header

a05bf6b

Update changelog

9c27d02

paulapreuss linked an issue Jun 11, 2026 that may be closed by this pull request

Add demand increase function into "demand estimation" page #1

Closed

paulapreuss marked this pull request as ready for review June 11, 2026 13:57

paulapreuss merged commit aff13c1 into main Jun 11, 2026
2 checks passed

paulapreuss deleted the feature/demand-increase branch June 11, 2026 13:57

	{% if field.name != 'annual_total_consumption' and field.name != 'annual_peak_consumption' and field.name != 'annual_demand_increase'%}
	{% if field.name in shares_tiers %}

Uh oh!

Conversation

CelinaKellinghaus commented Mar 10, 2026

Uh oh!

paulapreuss left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

paulapreuss left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

paulapreuss left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants