Commit Graph

1508 Commits

Author SHA1 Message Date
María Checa
dfa8f4590a Most voted fix 2017-10-20 16:57:41 +02:00
María Checa
9bbf0b1ef9 Improved most_voted method 2017-10-20 16:48:54 +02:00
BertoCQ
e886559e9e Merge branch 'master' into 1786-poll_results 2017-10-20 11:10:39 +02:00
Bertocq
085e6ecba4 Complete booth assigment create/destroy methods to work with ajax 2017-10-19 21:32:37 +02:00
Bertocq
f8839434f7 Complete booth assignment view list without actions yet 2017-10-19 20:10:51 +02:00
Bertocq
45d91a7e50 Add Poll booth_assignments and :Poll::BoothAssignment manage routes, actions and views 2017-10-19 19:27:26 +02:00
rgarcia
39ebc5173a displays recounts for a single booth 2017-10-19 11:28:09 +02:00
rgarcia
34ee16a1c1 displays results for booth 2017-10-19 11:28:09 +02:00
Manuel Ortega
97fb986626 Added documentable feature to legislation processes 2017-10-18 19:50:34 +02:00
María Checa
70a35fbe58 Poll views improvements
Reorganized poll `#show`,  `#stats` and `#results` views. Gave stats section its own route.
2017-10-18 18:35:53 +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
BertoCQ
c6d683083f Merge pull request #2073 from consul/feature/2072#remove_question_valid_answers
Remove valid answers usage
2017-10-18 11:52:14 +02:00
BertoCQ
98ba367dfd Merge pull request #2069 from consul/chore/fix_officing_final_result_date
Force Officer results to current date instead of datepicker
2017-10-18 10:59:07 +02:00
iagirre
f7bb3ec8b7 Merge remote-tracking branch 'consul/master' into iagirre-poll-stats 2017-10-18 09:48:02 +02:00
Bertocq
e9294f2a22 Switch from valid_answers to question_answers usage for Poll Questions 2017-10-18 01:32:15 +02:00
Bertocq
ce03251c72 Filter officing results officer assigments to current date 2017-10-17 23:15:26 +02:00
Bertocq
ce0a7f6fad Rubocop autocorrections 2017-10-17 22:00:00 +02:00
Bertocq
04910fea5b Remove officing results date picker for current date 2017-10-17 21:00:19 +02:00
María Checa
55c15bca86 Added poll results route 2017-10-17 18:29:14 +02:00
Manuel Ortega
12ac758e8e Added investment's user generated tags to admin interface form 2017-10-17 18:11:29 +02:00
iagirre
6a292daf42 Partial to render the polls stats and model methods to get the information from DB 2017-10-17 15:04:29 +02:00
iagirre
78cc09cc5a Controllers and models to see the polls stats. Routes related also added. 2017-10-16 17:25:04 +02:00
rgarcia
f2d99d6747 searches for officers assigned to a poll 2017-10-13 18:39:13 +02:00
Bertocq
916f9ba40b Correctly query and order poll question answers for description block 2017-10-13 12:44:55 +02:00
Bertocq
34c278db74 Small fixes for Poll Question Answer ordering 2017-10-11 12:05:20 +02:00
iagirre
644d09ebd2 PR comments applied and poll_question_answer default name changed in factory. 2017-10-11 09:42:52 +02:00
iagirre
44474e7686 Deleted a forgotten comment 2017-10-10 16:39:19 +02:00
iagirre
943c1f23af Spects added to test the order of answers. Default order for question_answers set. 2017-10-10 16:38:55 +02:00
iagirre
2b10b59e2a Order in the admin page using jquery-ui sortable widget. 2017-10-10 16:38:29 +02:00
rgarcia
843048a861 cleans up 2017-10-10 12:14:04 +02:00
Raimond Garcia
2b588753ee Merge branch 'master' into mlucena-poll-comments 2017-10-09 17:59:12 +02:00
María Checa
841ef2a3a2 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-10-09 17:19:07 +02:00
María Checa
65237db099 Fixed poll answer document upload redirect 2017-10-07 17:50:42 +02:00
Raimond Garcia
2e4ce39722 Merge pull request #1994 from consul/feature/1985#voting_token
Voter Answer unique Token
2017-10-07 16:54:01 +02:00
rgarcia
777237421f fixes specs 2017-10-07 14:55:08 +02:00
rgarcia
38f100d183 fixes loading of poll question 2017-10-07 14:40:26 +02:00
BertoCQ
6a0197a61b Merge branch 'master' into feature/1985#voting_token 2017-10-07 10:46:13 +02:00
Raimond Garcia
638fcdbc1d Merge pull request #2005 from consul/fix/2002#voting_after_singout
Allow re-casting an answer after singout
2017-10-06 21:14:32 +02:00
rgarcia
cf3a62b126 fixes specs 2017-10-06 20:32:06 +02:00
Bertocq
81f65f1ac9 Touch answer model to force the updated_at value update 2017-10-06 19:57:52 +02:00
Bertocq
165509b525 Switch from Poll::Answer to Poll::Voter usage and small fixes 2017-10-06 18:59:47 +02:00
Raimond Garcia
23ef9ded1d Merge branch 'master' into aperez-edit-poll-question-answers 2017-10-06 18:47:04 +02:00
María Checa
35148015b9 Added token to poll voters 2017-10-06 18:43:00 +02:00
Raimond Garcia
8576f59af1 Merge branch 'master' into aperez-edit-poll-question-answers 2017-10-06 18:14:00 +02:00
Angel Perez
63eaa0bef6 Allow Poll::Question::Answer edit
As requested by #1992
2017-10-06 09:48:17 -04:00
decabeza
dd69401477 Merge branch 'master' into question-answer-documents 2017-10-06 15:18:42 +02:00
Bertocq
d4408efda6 Generate a unique token for a Poll Ballot and use it on answer buttons 2017-10-06 14:36:21 +02:00
Raimond Garcia
108d4104e8 Merge pull request #1986 from wairbut-m2c/iagirre-remove-documents-questions
Iagirre remove documents questions
2017-10-06 14:07:21 +02:00
decabeza
de9b599578 Merge branch 'master' into question-answer-documents 2017-10-06 13:55:49 +02:00