Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add Voting Ballot Styles #7779

Merged
merged 13 commits into from Apr 6, 2021
Merged

Add Voting Ballot Styles #7779

merged 13 commits into from Apr 6, 2021

Conversation

orlera
Copy link
Contributor

@orlera orlera commented Apr 1, 2021 •
edited

🎩 What? Why?

Adds the Ballot Style models and implements its CRUD operations from the admin panel.
Votings::BallotStyle model has a many-to-many relationship with Elections::Question through Votings::BallotStyleQuestion.

The design is a bit rough - can be iterated in upcoming PRs on this same topic if necessary.

📌 Related Issues

📋 Checklist

🚨 Please review the guidelines for contributing to this repository.

  • ❓ CONSIDER adding a unit test if your PR resolves an issue.
  • ✔️ DO check open PR's to avoid duplicates.
  • ✔️ DO keep pull requests small so they can be easily reviewed.
  • ✔️ DO build locally before pushing.
  • ✔️ DO make sure tests pass.
  • ✔️ DO make sure any new changes are documented in docs/.
  • ✔️ DO add and modify seeds if necessary.
  • ✔️ DO add CHANGELOG upgrade notes if required.
  • ✔️ DO add to GraphQL API if there are new public fields.
  • ✔️ DO add link to MetaDecidim if it's a new feature.
  • ❌AVOID breaking the continuous integration build.
  • ❌AVOID making significant changes to the overall architecture.

📷 Screenshots

ballot.style.mov

♥️ Thank you!

codeclimate[bot]
codeclimate bot reviewed Apr 1, 2021
View reviewed changes
decidim-elections/app/views/decidim/votings/admin/ballot_styles/_form.html.erb Outdated Show resolved Hide resolved
decidim-elections/app/assets/stylesheets/decidim/votings/admin/votings.scss Outdated Show resolved Hide resolved
decidim-elections/app/assets/stylesheets/decidim/votings/admin/votings/_ballot-styles.scss Outdated Show resolved Hide resolved
decidim-elections/app/assets/stylesheets/decidim/votings/admin/votings/_ballot-styles.scss Outdated Show resolved Hide resolved
decidim-elections/app/assets/stylesheets/decidim/votings/admin/votings/_ballot-styles.scss Outdated Show resolved Hide resolved
decidim-elections/app/assets/stylesheets/decidim/votings/admin/votings/_ballot-styles.scss Outdated Show resolved Hide resolved
@orlera orlera self-assigned this Apr 1, 2021
@leio10 leio10 added contract: e-voting Barcelona City Council contract module: elections labels Apr 2, 2021
@orlera orlera marked this pull request as ready for review April 2, 2021 07:51
@orlera orlera force-pushed the feat/voting_ballot_styles branch from 8f0708b to 3d2eb58 Compare April 2, 2021 10:07
@orlera orlera changed the base branch from develop to feat/admin_voting_census April 2, 2021 10:08
@orlera orlera force-pushed the feat/voting_ballot_styles branch from 3d2eb58 to 9ed84e3 Compare April 2, 2021 10:29
beagleknight
beagleknight previously approved these changes Apr 2, 2021
View reviewed changes
Copy link
Contributor

@beagleknight beagleknight left a comment

Choose a reason for hiding this comment

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

Nice ✨

decidim-elections/app/commands/decidim/votings/admin/update_ballot_style.rb Outdated Show resolved Hide resolved
decidim-elections/app/commands/decidim/votings/admin/update_ballot_style.rb Outdated Show resolved Hide resolved
decidim-elections/db/migrate/20210330123606_add_voting_ballot_style.rb Show resolved Hide resolved
leio10
leio10 previously approved these changes Apr 2, 2021
View reviewed changes
Copy link
Contributor

@leio10 leio10 left a comment

Choose a reason for hiding this comment

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

Great! I like the admin list for the ballot styles, let see how it works in real votings. 😺 💎

decidim-elections/app/forms/decidim/votings/admin/ballot_style_form.rb Outdated Show resolved Hide resolved
decidim-elections/app/forms/decidim/votings/admin/ballot_style_form.rb Outdated Show resolved Hide resolved
decidim-elections/db/migrate/20210330123606_add_voting_ballot_style.rb Show resolved Hide resolved
decidim-elections/db/migrate/20210330123606_add_voting_ballot_style.rb Outdated Show resolved Hide resolved
Base automatically changed from feat/admin_voting_census to develop April 3, 2021 09:29
@oriolgual oriolgual dismissed stale reviews from leio10 and beagleknight April 3, 2021 09:29

The base branch was changed.

@orlera orlera force-pushed the feat/voting_ballot_styles branch from 150b924 to 193b53a Compare April 6, 2021 10:02
@orlera orlera force-pushed the feat/voting_ballot_styles branch from 92f64a2 to a7b5d9a Compare April 6, 2021 10:51
@orlera orlera force-pushed the feat/voting_ballot_styles branch from a7b5d9a to 6d5deff Compare April 6, 2021 12:31
@mrcasals mrcasals merged commit d34a951 into develop Apr 6, 2021
@mrcasals mrcasals deleted the feat/voting_ballot_styles branch April 6, 2021 13:07
entantoencuanto added a commit that referenced this pull request Apr 6, 2021
@entantoencuanto
Merge branch 'develop' into chore/rails-6-upgrade
4a2a96c 
* develop:
  Census access codes exportation flow (#7756)
  Show attachment menu as active only when subitem is active (#7774)
  Add Voting Ballot Styles (#7779)
  Fix map accessibility issue - Map bottom position missing label (#7763)
  Update README.adoc (#7687)
  Fix single initiative type (#7667)
  Enable Proposals Cell to take into account machine translations (#7629)
  Change order by weight in subassemblies (#7620)
  Add categories parent filter to API (#7609)
  Mockup design for Remaining time in voting (#7597)
  Upgrade to Rails 5.2.5 (#7762)
  Generate votings access codes (#7704)
entantoencuanto pushed a commit that referenced this pull request Apr 7, 2021
@orlera @entantoencuanto
Add Voting Ballot Styles (#7779)
076f2f3
entantoencuanto added a commit that referenced this pull request Apr 7, 2021
@entantoencuanto
Merge branch 'develop' into chore/rails-6-upgrade
3764411 
* develop:
  Revert "Fix single initiative type" (#7800)
  Census access codes exportation flow (#7756)
  Show attachment menu as active only when subitem is active (#7774)
  Add Voting Ballot Styles (#7779)
  Fix map accessibility issue - Map bottom position missing label (#7763)
  Update README.adoc (#7687)
  Fix single initiative type (#7667)
  Enable Proposals Cell to take into account machine translations (#7629)
  Change order by weight in subassemblies (#7620)
  Add categories parent filter to API (#7609)
  Mockup design for Remaining time in voting (#7597)
  Upgrade to Rails 5.2.5 (#7762)
  Generate votings access codes (#7704)
@leio10 leio10 added the type: feature PRs or issues that implement a new feature label Jul 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codeclimate codeclimate[bot] codeclimate left review comments

@mrcasals mrcasals mrcasals approved these changes

@beagleknight beagleknight beagleknight left review comments

@leio10 leio10 leio10 left review comments

@agustibr agustibr Awaiting requested review from agustibr

@slickepinne slickepinne Awaiting requested review from slickepinne

Assignees

@orlera orlera

Labels
contract: e-voting Barcelona City Council contract module: elections type: feature PRs or issues that implement a new feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@orlera @beagleknight @leio10 @mrcasals