[Backport] Budget execution list #2864
Merged
Conversation
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
MariaCheca
force-pushed
the
backport_1543-budget_execution_list
branch
from
ff553b4
to
6347062
Compare
|
|
This new tab will show all winner investments projects with milestones
javierm
force-pushed
the
backport_1543-budget_execution_list
branch
3 times, most recently
from
9a2547b
to
70d39a5
Compare
javierm
force-pushed
the
backport_1543-budget_execution_list
branch
from
70d39a5
to
dbb57cf
Compare
So it's in the same lines as in Madrid's repository.
This commit makes 3 changes: 1. Extracts a query into a helper for clarity and DRYness 2. Adds a `.where` clause to filter investments based on their (current) milestone status 3. Fixes a bug where investments would be rendered as many times as milestones associated to an investment
The page should not show any headings which don't have any winning investments. The "no content" message should only be shown when there are no headings with investments to avoid an otherwise blank page. __Note:__ in the main @headings query, _both_ #includes and #joins are needed to: 1. eager load all necessary data (#includes) and 2. to perform an INNER JOIN on milestones to filter out investments with no milestones (#joins).
Spending proposals did not have a winner attribute, instead winners where calculated dynamically looking at votes Removing this condition, so that we can see investment for the 2016 participatory budget which used spending proposals
Using `Date.today` caused some milestones to be published before/after the date defined by `Rails.application.config.time_zone`. See also commit AyuntamientoMadird/consul@088c76d for a more detailed explanation.
javierm
force-pushed
the
backport_1543-budget_execution_list
branch
from
dbb57cf
to
ab870c7
Compare
javierm
force-pushed
the
backport_1543-budget_execution_list
branch
from
c1829b3
to
9bacf39
Compare
decabeza
approved these changes
Nov 7, 2018
voodoorai2000
approved these changes
Nov 7, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
References
Backport AyuntamientoMadrid#1543
Related issue #2583
Commit AyuntamientoMadrid/consul@8349117 was backported on this pull request because the related code wasn't in consul when we opened #2911.