-
Notifications
You must be signed in to change notification settings - Fork 120
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add callout to green deal in the energy grants calculator. #2369
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
d18441b
Remove duplicate content from energy grant calc.
pmanrubia 61d7fb4
Move conditional from partial to flow
pmanrubia 33500b7
Add partial to render title callout
pmanrubia 64bdb85
Render callout if outcome is under green deal
pmanrubia b19a2c7
Replace precalculated variable in energy grants calc.
pmanrubia 488f60c
Add callout under green deal outcome
pmanrubia 3d6f21f
Move conditional from partial to flow
pmanrubia 52f23e6
Add callout under green deal outcome
pmanrubia fbe80ce
Move conditional from partial to flow
pmanrubia 97eb977
Add callout under green deal outcome
pmanrubia 13d828c
Update copy of title under green deal
pmanrubia acab75d
Update artefacts for `energy-grants-calculator`
pmanrubia 590fc03
Update checksums for `energy-grants-calculator`
pmanrubia File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
...art_answer_flows/energy-grants-calculator/outcomes/_callout_under_green_deal.govspeak.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
^The government has stopped funding the Green Deal Finance Company, which was set up to lend money to Green Deal providers. [Find out how this affects you](/green-deal-energy-saving-measures/changes).^ |
2 changes: 1 addition & 1 deletion
2
...smart_answer_flows/energy-grants-calculator/outcomes/_title_under_green_deal.govspeak.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
Under the Green Deal you could get some of these improvements without having to pay all the cost upfront: | ||
Under the Green Deal you could get some of these improvements without having to pay all the cost upfront. |
5 changes: 4 additions & 1 deletion
5
...ows/energy-grants-calculator/outcomes/outcome_bills_and_measures_no_benefits.govspeak.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 6 additions & 3 deletions
9
...ants-calculator/outcomes/outcome_bills_and_measures_on_benefits_eco_eligible.govspeak.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 6 additions & 3 deletions
9
...-calculator/outcomes/outcome_bills_and_measures_on_benefits_not_eco_eligible.govspeak.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...wer_flows/energy-grants-calculator/outcomes/outcome_measures_help_green_deal.govspeak.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...attic_conversion,loft_insulation,solid_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...attic_conversion,loft_insulation,solid_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...attic_conversion,loft_insulation,solid_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...benefits,permission/1950-01-01/pension_credit/on-or-after-1995/flat/ground_floor/none.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...lp/benefits,permission/1950-01-01/pension_credit/on-or-after-1995/flat/top_floor/none.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...or/all_help/benefits,permission/1950-01-01/pension_credit/on-or-after-1995/house/none.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...attic_conversion,loft_insulation,solid_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...attic_conversion,loft_insulation,solid_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...attic_conversion,loft_insulation,solid_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
.../all_help/benefits,permission/1954-01-01/none/on-or-after-1995/flat/ground_floor/none.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...tor/all_help/benefits,permission/1954-01-01/none/on-or-after-1995/flat/top_floor/none.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...s-calculator/all_help/benefits,permission/1954-01-01/none/on-or-after-1995/house/none.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...attic_conversion,loft_insulation,solid_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...attic_conversion,loft_insulation,solid_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...attic_conversion,loft_insulation,solid_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...benefits,permission/1954-01-01/pension_credit/on-or-after-1995/flat/ground_floor/none.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...lp/benefits,permission/1954-01-01/pension_credit/on-or-after-1995/flat/top_floor/none.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...or/all_help/benefits,permission/1954-01-01/pension_credit/on-or-after-1995/house/none.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...nsulation,solid_wall_insulation,cavity_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 3 additions & 1 deletion
4
...attic_conversion,loft_insulation,solid_wall_insulation,modern_boiler,draught_proofing.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe this
under_green_deal
returns a boolean.. is there a case against not using a question mark at the end of this definitionunder_green_deal?
For me this reads a lot more nicer.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ikennaokpala: I agree about being more readable. Unfortunately this isn't possible when using
precalculate
or other similar blocks. This is because the result is assigned to the state using an attribute writer derived from the block's key. In this case that would meanstate.under_green_deal? = true
which gives aSyntaxError
. We could look at fixing this, but I think the better solution is to extract a calculator/policy object as per the refactoring docs.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ikennaokpala: It's probably worth adding a sentence or two to explain this in the storing data docs. I've added a Trello card to capture this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@floehopper I don't have access to /that/this Trello board
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@floehopper @erikse @ikennaokpala Happy to give a try to the calculator/policy object. It feels like a better approach. Not sure, though, if including it in this PR as we would have two different styles for precalculated values?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I think a separate PR would be sensible. 👍