Commit Graph

247 Commits

Author SHA1 Message Date
Angel Perez
01c1ac2b10 Replace all occurrences of ActiveRecord::Base with ApplicationRecord 2019-04-17 17:40:56 +02:00
Juanjo Bazán
7ab602175a makes models inherit from ApplicationRecord 2019-04-17 17:40:56 +02:00
Senén Rodero Rodríguez
596ef8d1ed Fix queries and scopes after column deletion
Some queries were accessing original column instead of the new
translatable one. This should have been causing unexpected behavior
for requests maded in a different locale than the application default.
2019-04-17 17:40:55 +02:00
rgarcia
aeb84108bc Verify poll ballots 2019-04-10 18:29:01 +02:00
María Checa
394177213c Adds Ballot Sheet model and business logic 2019-04-10 16:04:39 +02:00
decabeza
94b8caffca Merge branch 'master' into proposal-dashboard 2019-04-04 14:08:30 +02:00
Javi Martín
f7f9fc15a5 Move todays_booths_for_officer to the model
This way we can easily add a test which will fail if by accident we
change the method to use `Date.today`. Until now using `Date.today`
would only fail if we ran specs in a time zone with a different date.
2019-03-28 15:49:17 +01:00
Bertocq
31428a5847 Add booth and officing assigments presence validation for booth votes, unskip specs 2019-03-28 15:47:52 +01:00
rgarcia
b4499321d3 stores officer booth on sign in 2019-03-28 15:47:52 +01:00
kikito
34dfeee9c9 Denormalizes booth_assignmen on the models where it is needed 2019-03-28 15:47:52 +01:00
kikito
10283c32ee Adds scopes to officer_assignment 2019-03-28 15:47:52 +01:00
decabeza
eda6ea7f12 Merge branch 'master' into dashboard 2019-03-26 16:45:48 +01:00
Senén Rodero Rodríguez
c73aae9663 Remove before validation callback
This was breaking nested poll_questions_answers when submitting
more than one new answer at a time.
2019-03-21 14:51:17 +01:00
Julian Herrero
3ba961a2d7 Use double quotes in models 2019-03-14 17:25:43 +01:00
Julian Herrero
5f4a369606 Deleting a booth shift with recounts or partial results.
Show a flash message that it's not possible to delete booth shifts
when they have associated recounts or partial results. Before an
execption was raised.
2019-02-12 18:59:51 +01:00
decabeza
bc1679550b Remove incoming polls filter 2019-02-08 14:28:19 +01:00
Julian Herrero
c563f73189 create officer assignments in order
Make sure we create the Poll::OfficerAssignments in the same order the
booth_assignments where previously created. So the spec "Poll::Shift
officer_assignments creates and destroy corresponding
officer_assignments does" not fail.
2018-11-23 18:15:47 +01:00
Juanjo Bazán
4cccb93677 fix poll accuracy results using floats 2018-11-11 14:54:35 +01:00
Javi Martín
ccdbdb26ba Fix poll question with non-underscored locales
Ruby can't have hyphens in method names, so sending something like
`title_pt-BR=` would raise an exception.
2018-10-23 14:23:10 +02:00
Javi Martín
863b326142 Validate both the model and its translations
This way we guarantee there will be at least one translation for a model
and we keep compatibility with the rest of the application, which
ideally isn't aware of globalize.
2018-10-22 16:30:28 +02:00
Javi Martín
2ab49a1832 Refactor globalize models code using a concern
I've chosen the name "Globalizable" because "Translatable" already
existed.
2018-10-22 16:28:53 +02:00
Javi Martín
e0b9c1bfdd Update poll question answers translatable fields
We needed to bring back support for CKEditor in our translatable form,
which we had temporarily remove.

And now we support CKEditor in our translatable specs, and so we can
remove the duplicated specs for poll question answers.
2018-10-22 16:13:48 +02:00
Javi Martín
d1249d0b4f Update poll questions translatable fields
We need to replace ".title=" by ".title_#{locale}=" in one place because
for some reason globalize builds a new translation record when using the
latter but it doesn't build one when using the former.
2018-10-22 16:13:30 +02:00
decabeza
546105d989 Merge branch 'master' into dashboard-master 2018-10-19 01:48:37 +02:00
Julian Herrero
46030c72e8 remove unnecessary parameter 2018-09-21 20:53:20 +02:00
Julian Herrero
673ec075eb Make answers translatable 2018-09-20 17:13:40 +02:00
Julian Herrero
5e6248d2ac Make questions translatable 2018-09-20 17:11:53 +02:00
Juan Salvador Pérez García
50f73abb0c Fixes #voodoorai2000 comments
Fixes some comments from #voodoorai2000 for the PR to consul
2018-07-27 16:30:03 +02:00
Juan Salvador Pérez García
2be107f4da Specs
Added specs and fixed some issues found after executing them
2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
2ce9f95283 Polls in the dashboard
A reduced version of polls has been added to the dashboard
2018-07-17 17:57:30 +02:00
Bertocq
4fb9f6829c Extract inline query to an OfficerAssignment scope 2018-02-19 11:09:19 +01:00
Raimond Garcia
9e12d67f3f Merge pull request #2114 from wairbut-m2c/iagirre-booth-assignment-removal
Iagirre booth assignment removal
2017-11-28 19:59:20 +01:00
Bertocq
db54273dad Replace == 0 comparisions for .zero? 2017-11-13 02:27:38 +01:00
Bertocq
cd66ba5d54 Rubocop autocorrections 2017-11-13 02:22:00 +01:00
iagirre
1077e25b2b Shifts are destroyed when a booths is unassigned. An alert appears if there are shifts, but it doesn't if there aren't. 2017-10-30 12:36:07 +01:00
iagirre
89425f50ef First steps to destroy shifts when booth_assignments are destroyed 2017-10-27 14:57:32 +02:00
Bertocq
f9458b9ef0 Show booth associated to current/recounting/incoming polls on shift management admin panel 2017-10-23 19:09:57 +02:00
María Checa
5a9ee4642e Merge branch 'master' into 1786-poll_results 2017-10-23 13:43:58 +02:00
María Checa
e85c98f4b4 Improved results and stats percentages 2017-10-20 17:18:54 +02:00
María Checa
9bbf0b1ef9 Improved most_voted method 2017-10-20 16:48:54 +02:00
Bertocq
7507f43ea8 Add helper method on Booth model to get booth assigment for a given poll 2017-10-19 21:30:31 +02:00
María Checa
f029cc2016 Cached Poll stats methods 2017-10-19 12:17:33 +02:00
María Checa
6e680c187f Added new column most_voted to Poll::Question::Answers 2017-10-19 12:17:20 +02:00
María Checa
35f24b519d Merge branch 'master' into 1786-poll_results 2017-10-18 17:33:16 +02:00
Alberto García
91b8ed67f6 Merge pull request #2075 from wairbut-m2c/iagirre-poll-stats
Iagirre poll stats
2017-10-18 17:25:02 +02:00
iagirre
f7bb3ec8b7 Merge remote-tracking branch 'consul/master' into iagirre-poll-stats 2017-10-18 09:48:02 +02:00
Bertocq
08823153a9 Correct answer inclusion validation for no question scenario 2017-10-18 02:03:58 +02:00
Bertocq
8d2945e8a2 Fix answer attribute validation to check question's question_answers inclusion 2017-10-18 01:31:34 +02:00
Bertocq
0a5ee3f861 Remove valid_answers usage on Poll Question model 2017-10-18 01:30:21 +02:00
Bertocq
ce0a7f6fad Rubocop autocorrections 2017-10-17 22:00:00 +02:00