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

Budget ballot sheets UI #2857

Merged
merged 2 commits into from
Apr 10, 2019
Merged

Budget ballot sheets UI #2857

merged 2 commits into from
Apr 10, 2019

Conversation

MariaCheca
Copy link
Contributor

@MariaCheca MariaCheca commented Aug 23, 2018 •
edited by javierm
Loading

References

Backport AyuntamientoMadrid#1535
Related issue AyuntamientoMadrid#1527

Objectives

Create an index, show, new and create for Partial Results ~in /officing/polls/final

Notes

@MariaCheca MariaCheca changed the title Backport 1527 budget ballots results ui [Backport] Budget ballot sheets UI Aug 23, 2018
@MariaCheca MariaCheca force-pushed the backport_1527-budget_ballots_results_ui branch from b0c1943 to eefc04c Compare September 18, 2018 10:49
@javierm javierm force-pushed the backport_1527-budget_ballots_results_ui branch from eefc04c to 1a03585 Compare November 7, 2018 17:12
@javierm javierm force-pushed the backport_1527-budget_ballots_results_ui branch from 1a03585 to e6a59f3 Compare March 6, 2019 18:34
houndci-bot
houndci-bot reviewed Mar 6, 2019
View reviewed changes
spec/models/poll/ballot_sheet_spec.rb Outdated Show resolved Hide resolved
spec/features/budget_polls/ballot_sheets_spec.rb Outdated Show resolved Hide resolved
spec/features/budget_polls/ballot_sheets_spec.rb Outdated Show resolved Hide resolved
spec/features/budget_polls/ballot_sheets_spec.rb Outdated Show resolved Hide resolved
spec/features/budget_polls/ballot_sheets_spec.rb Outdated Show resolved Hide resolved
spec/features/budget_polls/ballot_sheets_spec.rb Outdated Show resolved Hide resolved
spec/features/budget_polls/ballot_sheets_spec.rb Outdated Show resolved Hide resolved
app/controllers/officing/base_controller.rb Show resolved Hide resolved
app/controllers/officing/ballot_sheets_controller.rb

private

def namespace
Copy link

Choose a reason for hiding this comment

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

Layout/IndentationWidth: Use 2 (not 0) spaces for rails indentation. (https://github.com/bbatsov/ruby-style-guide#spaces-indentation)

@javierm javierm force-pushed the backport_1527-budget_ballots_results_ui branch 8 times, most recently from be347e8 to 3db7b48 Compare March 11, 2019 12:27
houndci-bot
houndci-bot reviewed Mar 11, 2019
View reviewed changes
app/controllers/officing/booth_controller.rb Outdated Show resolved Hide resolved
app/models/poll/voter.rb Outdated Show resolved Hide resolved
app/models/poll/officer_assignment.rb Outdated Show resolved Hide resolved
app/models/poll/officer_assignment.rb Outdated Show resolved Hide resolved
spec/models/poll/stats_spec.rb Outdated Show resolved Hide resolved
spec/features/officing/results_spec.rb Outdated Show resolved Hide resolved
spec/features/officing/booth_spec.rb Outdated Show resolved Hide resolved
spec/features/budget_polls/voter_spec.rb Outdated Show resolved Hide resolved
spec/features/budget_polls/voter_spec.rb Outdated Show resolved Hide resolved
spec/features/budget_polls/questions_spec.rb Outdated Show resolved Hide resolved
@javierm javierm changed the base branch from master to backport-budget_ballots March 11, 2019 12:27
@javierm javierm force-pushed the backport_1527-budget_ballots_results_ui branch 3 times, most recently from e37138b to b9c4752 Compare March 11, 2019 14:20
@javierm javierm force-pushed the backport-budget_ballots branch 3 times, most recently from 9d5ea84 to 7bd0f9c Compare April 3, 2019 20:29
@javierm javierm changed the title [Backport] Budget ballot sheets UI Budget ballot sheets UI Apr 8, 2019
@javierm javierm force-pushed the backport_1527-budget_ballots_results_ui branch from b9c4752 to 113f486 Compare April 9, 2019 11:59
@javierm javierm changed the base branch from backport-budget_ballots to master April 9, 2019 11:59
houndci-bot
houndci-bot reviewed Apr 9, 2019
View reviewed changes
app/views/officing/ballot_sheets/index.html.erb Outdated Show resolved Hide resolved
app/models/budget/investment.rb Outdated Show resolved Hide resolved
app/models/budget/investment.rb Outdated Show resolved Hide resolved
@javierm javierm force-pushed the backport_1527-budget_ballots_results_ui branch from 113f486 to 8c8d1f2 Compare April 9, 2019 12:06
@javierm javierm force-pushed the backport_1527-budget_ballots_results_ui branch from 8c8d1f2 to 3941772 Compare April 10, 2019 14:06
@javierm javierm merged commit e27f590 into master Apr 10, 2019
@javierm javierm deleted the backport_1527-budget_ballots_results_ui branch April 10, 2019 15:04
This was referenced Apr 22, 2019
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@houndci-bot houndci-bot houndci-bot left review comments

@decabeza decabeza decabeza approved these changes

@voodoorai2000 voodoorai2000 voodoorai2000 approved these changes

Assignees

@javierm javierm

Labels
Budgets Polls
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MariaCheca @voodoorai2000 @decabeza @houndci-bot @javierm