Skip to content

Budgets complex votings#5993

Closed
leio10 wants to merge 11 commits intodevelopfrom
feat/budgets-complex-votings
Closed

Budgets complex votings#5993
leio10 wants to merge 11 commits intodevelopfrom
feat/budgets-complex-votings

Conversation

@leio10
Copy link
Copy Markdown
Contributor

@leio10 leio10 commented Apr 16, 2020

🎩 What? Why?

This PR group all the PR related to the implementation of the budgets complex votings flow

📌 Related Issues

📋 Subtasks

📷 Screenshots (optional)

@agustibr agustibr mentioned this pull request Apr 16, 2020
5 tasks
@leio10 leio10 mentioned this pull request Apr 16, 2020
2 tasks
@leio10 leio10 added project: PAM2020 Barcelona City Council contract status: WIP labels Apr 16, 2020
@leio10 leio10 mentioned this pull request Apr 20, 2020
3 tasks
@leio10 leio10 force-pushed the feat/budgets-complex-votings branch 2 times, most recently from 3dbc8b3 to 9ebb46d Compare April 24, 2020 13:59
@leio10 leio10 force-pushed the feat/budgets-complex-votings branch 3 times, most recently from 2e4e80b to c9f4972 Compare May 14, 2020 08:07
@leio10 leio10 force-pushed the feat/budgets-complex-votings branch 2 times, most recently from f8fec56 to 0c38c86 Compare May 25, 2020 07:27
leio10 and others added 3 commits May 25, 2020 09:54
* Add changelog entry

* feat: add parent/child relationship to components

* feat: add settings to define if a component can have parent or children

* feat(admin): add parent field to component form when allowed

* refactor(admin): enforce the use of participatory space context concern

* refactor(admin): unify the menu components list rendering

* feat(admin): hide child components from lists

* feat(front): hide child components from lists

* feat: add the budgets groups component to the budgets module

* feat: allow budget components to have a parent component

* feat(admin): allow budgets group admin to manage children components

* feat(front): show children components on budget group index page

* style: fix lint issues

* test: fix tests broken with refactor

* Fix CI config for consultations

* Fix CI config

A single asterisk only matches branch names *without* slashes.
Double asterisk will match any branch name including slashes.

* Fix liinter complaints

* Add missing method on consultations

* Fix conferences tests

* Add missing field on test double

* Don't make budgets groups engine load tasks

* Lint files

* Use correct consultations questions admin layout

* feat: budgets group view improvements

* Fix lint errors

Co-authored-by: Marc Riera Casals <mrc2407@gmail.com>
Co-authored-by: Agustí B.R <agusti@codegram.com>
@leio10 leio10 force-pushed the feat/budgets-complex-votings branch from 0c38c86 to 8c80955 Compare May 25, 2020 07:55
leio10 and others added 8 commits May 25, 2020 12:50
* feat: add workflows to BudgetGroups

* feat: allow parent components to define a parent context

This context object can be reused in children components controllers, cells, permissions and views, among others when interacting with the parent component.

* feat: check parent component permissions on budgets

Through the `parent_component_context` the budgets component permissions checks the parent permissions without having to know the type of the parent component.

* feat: add configurable texts for budgets groups

* refactor: use `view_hooks` to avoid children dependencies with parents

* feat: complete cells using parent_component_context from the controller

* feat: show "More information" modal at page load when needed

Tell the user If vote in the component is not allowed, but they can discard an in-progress order in other component to be allowed to vote in this one.

* feat: allow to cancel in-progress orders.

* feat: refactor projects views

* feat: improve navigation flow when checking out or deleting orders

* feat: order components by name when weight and manifest are the same

* fix: normalize i18n and address lint issues

* fix: repair broken existing tests

* fix: address codeclimate issues

* fix: avoid warnings raised by JS

* fix: address i18n and lint issues

* feat: use enum component settings

* style: fix i18n and lint issues

* test: add test to workflows

* test: complete permissions tests

* test: add group budgets integration tests

* feat: allow to configure more information modal text

* style: fix ERB lint issues

* chore: move limit_reached? method from base_cell to workflow/base

* fix: don't allow voting on components already voted

Co-authored-by: Agustí B.R <hola@agusti.cat>
@agustibr agustibr mentioned this pull request Jun 19, 2020
29 tasks
@tramuntanal
Copy link
Copy Markdown
Contributor

tramuntanal commented Jul 7, 2020

Hi @leio10 this PR is WIP and has conflicts but I'm hesitating to start to review it as it is huge. Do you plan to re-take it soon?

@leio10
Copy link
Copy Markdown
Contributor Author

leio10 commented Jul 7, 2020

Hi @leio10 this PR is WIP and has conflicts but I'm starting to review as it is huge

Hi @tramuntanal, we are working on a different approach for this here, so I think we should wait, as this PR probably won't be merged.

@andreslucena
Copy link
Copy Markdown
Member

as this PR probably won't be merged

As we're refactoring this on #6223, can we close this? @agustibr what do you think?

@agustibr
Copy link
Copy Markdown
Contributor

agustibr commented Jul 8, 2020

As we're refactoring this on #6223, can we close this? @agustibr what do you think?

@andreslucena Yes, I close this one.

Hi @leio10 this PR is WIP and has conflicts but I'm hesitating to start to review it as it is huge. Do you plan to re-take it soon?

@tramuntanal , if you want you can start reviewing the refactor PR I hope to finish it this week, you can go commit by commit as the functionality is added progressively.

@agustibr agustibr closed this Jul 8, 2020
@tramuntanal tramuntanal deleted the feat/budgets-complex-votings branch July 10, 2020 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

project: PAM2020 Barcelona City Council contract status: WIP

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Complex voting on Budgets EPIC: Improve the Budgets component Configure permissions at district (scope) level for the different components

5 participants