Skip to content

Selected projects on budgets#6365

Merged
tramuntanal merged 7 commits intodevelopfrom
feature/budgets_selected_projects
Sep 7, 2020
Merged

Selected projects on budgets#6365
tramuntanal merged 7 commits intodevelopfrom
feature/budgets_selected_projects

Conversation

@agustibr
Copy link
Copy Markdown
Contributor

@agustibr agustibr commented Jul 29, 2020 •
edited
Loading

🎩 What? Why?

Within a budget, Admins can mark selected projects and Participants can see which have been selected.

📌 Related Issues

📋 Subtasks

  • Add CHANGELOG upgrade notes, if required
  • If there's a new public field, add it to GraphQL API
  • Add documentation regarding the feature
  • Add/modify seeds
  • Add tests
  • Another subtask

📷 Screenshots (optional)

Participant UI

  • Project list, with status filter and selected tag:
    Screenshot 2020-08-03 at 18 13 52

Admin UI

  • Budget component edit:
    Screenshot 2020-08-03 at 18 15 25
  • Project list:
    Screenshot 2020-07-29 at 17 40 13
  • Project edit:
    Screenshot 2020-07-29 at 17 41 27

@dep dep bot added the dependent label Jul 29, 2020
@agustibr agustibr self-assigned this Jul 29, 2020
@agustibr agustibr added module: budgets project: PAM2020 Barcelona City Council contract labels Jul 29, 2020
@agustibr agustibr linked an issue Jul 29, 2020 that may be closed by this pull request
Show selected projects after voting step on Budgets #5715
Closed
2 tasks
@agustibr agustibr force-pushed the feature/budgets_selected_projects branch 6 times, most recently from 19b6fe2 to 7240717 Compare August 4, 2020 12:12
@agustibr agustibr marked this pull request as ready for review August 4, 2020 17:33
@agustibr agustibr requested review from mrcasals and oriolgual August 4, 2020 17:33
mrcasals
mrcasals previously approved these changes Aug 5, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@mrcasals mrcasals left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@mrcasals
Copy link
Copy Markdown
Contributor

mrcasals commented Aug 5, 2020

I've restarted the Admin job, it looks like it got stuck

@agustibr
Copy link
Copy Markdown
Contributor Author

agustibr commented Aug 5, 2020

Thanks @mrcasals 👍, All checks passed!

tramuntanal
tramuntanal suggested changes Aug 14, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@tramuntanal tramuntanal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a great PR @agustibr !

I've just asked for small change in order to have all the context and logic that cells require encapsulated.

@agustibr agustibr force-pushed the feature/budget_component_w_many_budgets branch 3 times, most recently from bccbade to 0ca9ef1 Compare August 25, 2020 13:45
@agustibr agustibr force-pushed the feature/budgets_selected_projects branch from 00b04e0 to 31c3746 Compare August 25, 2020 15:27
@agustibr agustibr force-pushed the feature/budget_component_w_many_budgets branch from 1c67057 to 7b74c84 Compare August 26, 2020 14:55
@agustibr agustibr force-pushed the feature/budgets_selected_projects branch 2 times, most recently from e02961e to 0779513 Compare August 27, 2020 08:33
@agustibr
Copy link
Copy Markdown
Contributor Author

agustibr commented Aug 27, 2020

Thanks @tramuntanal for the review. I've updated the cells model as you suggested. Also refactored some code due to @decidim/product review.

Please note that I've renamed two of them, to a more appropriate name:

  • ProjectSelectedBadgeCell --> ProjectSelectedStatusCell
  • ProjectSupportsCountCell --> ProjectVotesCountCell

Please review PR #6223 before merging this one, as this will merge into feature/budget_component_w_many_budgets which is the base branch of this PR 😁

@agustibr agustibr force-pushed the feature/budgets_selected_projects branch from 0779513 to 04d6d67 Compare August 28, 2020 09:03
@agustibr agustibr force-pushed the feature/budget_component_w_many_budgets branch from 00aebbc to 320f004 Compare August 28, 2020 11:28
@agustibr agustibr force-pushed the feature/budgets_selected_projects branch 2 times, most recently from b07376f to bc02eac Compare September 1, 2020 12:15
@agustibr agustibr force-pushed the feature/budgets_selected_projects branch from bc02eac to a5961d1 Compare September 1, 2020 16:38
@agustibr agustibr mentioned this pull request Sep 2, 2020
Merged
29 tasks
@agustibr
Copy link
Copy Markdown
Contributor Author

agustibr commented Sep 2, 2020

@decidim/core this has been approved by @decidim/product, can you review it please? 😄
Keep in mind that this PR depends on #6223

@Leusev Leusev self-requested a review September 2, 2020 12:42
@tramuntanal tramuntanal self-assigned this Sep 3, 2020
Base automatically changed from feature/budget_component_w_many_budgets to develop September 4, 2020 11:58
@tramuntanal tramuntanal dismissed mrcasals’s stale review September 4, 2020 11:58

The base branch was changed.

@tramuntanal
Copy link
Copy Markdown
Contributor

tramuntanal commented Sep 4, 2020

@agustibr can you rebase with develop please?

@agustibr agustibr force-pushed the feature/budgets_selected_projects branch from a5961d1 to 59dc245 Compare September 5, 2020 06:48
@mrcasals
Copy link
Copy Markdown
Contributor

mrcasals commented Sep 7, 2020

@tramuntanal this has been rebased, can you re-review this please? 😄 /cc @decidim/core

tramuntanal
tramuntanal approved these changes Sep 7, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@tramuntanal tramuntanal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok @agustibr good job!

decidim-budgets/db/migrate/20200804175222_votes_enabled_to_votes_choices.rb
votes_value = config.dig("votes_enabled") ? "enabled" : "disabled"

new_config[step] = config.merge("votes": votes_value).except("votes_enabled")
new_config
Copy link
Copy Markdown
Contributor

@tramuntanal tramuntanal Sep 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no need to return the object/hash

Suggested change
new_config

@tramuntanal tramuntanal merged commit f2ad7ec into develop Sep 7, 2020
@tramuntanal tramuntanal deleted the feature/budgets_selected_projects branch September 7, 2020 14:27
@tramuntanal tramuntanal mentioned this pull request Sep 7, 2020
Merged
13 tasks
@ahukkanen ahukkanen mentioned this pull request Jan 20, 2026
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oriolgual oriolgual Awaiting requested review from oriolgual

@Leusev Leusev Awaiting requested review from Leusev

2 more reviewers

@tramuntanal tramuntanal tramuntanal approved these changes

@mrcasals mrcasals mrcasals left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@tramuntanal tramuntanal

@agustibr agustibr

Labels

dependent in-review module: budgets project: PAM2020 Barcelona City Council contract

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Show selected projects after voting step on Budgets

4 participants

@agustibr @mrcasals @tramuntanal @Leusev