Commit Graph

55 Commits

Author SHA1 Message Date
decabeza
546105d989 Merge branch 'master' into dashboard-master 2018-10-19 01:48:37 +02:00
Julian Herrero
9495208518 Make polls translatable 2018-09-20 17:07:43 +02:00
Juan Salvador Pérez García
7c3213a55d Refactored complex scope
Complex scope has been refactored into an static method. Added tests to
validate this new method.
2018-09-17 09:11:51 +02:00
Juan Salvador Pérez García
5b5095b37b Bugfixing and several enhancements
* Added missing specs
* Removed models that were refactored previously
* Added simplecov when executing specs locally
* Fixed bug in poll model validation that was causing an 500 error.
2018-08-01 13:26:30 +02:00
Juan Salvador Pérez García
3d5390dfb0 Fixes #245
Poll card now shows the responses to the poll in the public side
2018-07-27 20:11:19 +02:00
Juan Salvador Pérez García
4ee0a94241 Fixed last minute bugs
Fixed last minute bugs with polls
2018-07-19 10:00:37 +02:00
Juan Salvador Pérez García
ba753f3649 Fixes #222
Community view shows the polls for the given proposal.
2018-07-17 17:59:12 +02:00
Juan Salvador Pérez García
7cdb0c8ebf Proposal related polls won't appear in votes section
Proposal related polls won't be shown in the public votes section.
2018-07-17 17:58:22 +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
rgarcia
2b52d26d82 refactors notifications into concerns and shared examples 2017-12-14 16:15:30 +01:00
Juanjo Bazán
21b2a11339 adds poll comments to API 2017-11-21 14:31:03 +01:00
BertoCQ
db7c80ef13 Merge pull request #2021 from consul/fixed-already-voted-message
Fixed already voted message in poll show
2017-10-17 14:42:46 +02:00
María Checa
58f57bc15b Added poll method voted_in_web? 2017-10-17 13:16:46 +02:00
Bertocq
9146d68c53 Add current_or_recounting_or_incoming method to Poll model 2017-10-13 16:53:03 +02:00
Bertocq
ca2d9a1d68 Add recounting Poll scope with trait and spec 2017-10-13 16:51:58 +02:00
Bertocq
540e12a3ac Add RECOUNT_DURATION Poll constant for recount period duration 2017-10-13 16:47:47 +02:00
rgarcia
89f81bf7a4 fixes exception when sending email about comment reply 2017-10-10 16:01:20 +02:00
Manuel Lucena
63cbe2f7c1 20171003 - [WIP] Functionality and tests for polls comments 2017-10-06 10:36:26 +02:00
Raimond Garcia
c7f576aa4f Merge pull request #1962 from wairbut-m2c/iagirre-admin-polls-section
Iagirre admin polls section
2017-10-03 22:23:53 +02:00
BertoCQ
3835821871 Merge branch 'master' into iagirre-admin-polls-section 2017-10-02 22:25:09 +02:00
Raimond Garcia
a743b6b823 Merge branch 'master' into polls-voting 2017-10-02 17:11:21 +02:00
rgarcia
085991c624 allows voting only in one origin: booth or web 2017-10-02 16:22:31 +02:00
Bertocq
b5cf28cb35 Swap Poll White/Null/Total usage for Poll Recount 2017-10-02 15:46:49 +02:00
iagirre
166caa3b4c Deleted code in views and concerns that lets polls have more images and documentes attached, like it was at first.
Added missing text for english and new texts in english and spanish.

 Cambios para hacer commit:
	modificado:    app/assets/stylesheets/participation.scss
	modificado:    app/models/concerns/imageable.rb
	modificado:    app/models/poll.rb
	modificado:    app/views/admin/poll/polls/_form.html.erb
	modificado:    app/views/images/_admin_image.html.erb
	modificado:    config/locales/en/images.yml
	modificado:    config/locales/es/admin.yml
	modificado:    config/locales/es/images.yml
	modificado:    spec/features/admin/poll/polls_spec.rb
2017-10-02 12:59:26 +02:00
iagirre
c67620fdef Table for links added (links to add images/documents).
Custom partial for admins upload image created, so that it can be reused in upload images and documents.
2017-09-29 14:51:49 +02:00
Bertocq
07592f6b0d Correct Poll current/expired/incoming scopes and helper functions 2017-09-29 11:50:23 +02:00
iagirre
77d0a551cf Migration for adding summary and description to polls created. Both text_areas were added to polls form.
Imageable class included in polls model and the first aproach for adding images added to form.
2017-09-28 17:46:30 +02:00
Bertocq
1f867fb227 Add new model Poll Total Result with specs and relations 2017-09-14 13:51:27 +02:00
rgarcia
456429f08b adds shifts 2017-08-04 21:27:30 +02:00
Bertocq
c9bc028524 Remove all unnecesary extra spacing and Layout/ExtraSpacing list from rubocop file 2017-06-28 14:12:51 +02:00
Juanjo Bazán
35540cdcf1 adds poll results to admin
simple page shows results by question, white and null results
2017-02-06 17:12:54 +01:00
kikito
86d42ce094 Adds specs for Poll.answerable_by, fixing issue with SQL join 2017-02-02 16:41:04 +01:00
Raimond Garcia
bc0a4d65b4 Merge pull request #1374 from consul/polls-index
Polls index
2017-01-30 13:52:48 +01:00
kikito
e394470634 Improves order of polls when listing them in index 2017-01-30 11:29:59 +01:00
rgarcia
6c34599e1e adds officer residence check and user voting 2017-01-29 00:36:20 +01:00
Juanjo Bazán
8f235c25d3 poll has_many voters 2017-01-25 12:18:15 +01:00
kikito
d024505960 moves geozones from poll question to poll in models 2017-01-20 18:58:03 +01:00
Juanjo Bazán
1aa845a9c6 adds published to polls 2017-01-02 18:23:24 +01:00
Juanjo Bazán
ab61d94d2d changes Time.now to Time.current 2016-12-27 18:26:03 +01:00
Juanjo Bazán
78db093e49 moves validation error message 2016-12-21 14:21:02 +01:00
Juanjo Bazán
bc690748fd adds dates validation to polls 2016-12-21 13:50:15 +01:00
Juanjo Bazán
45d26f6dee refactors poll::voter
now belongs_to booth_assignment instead of to booth
2016-12-06 20:20:18 +01:00
Juanjo Bazán
ad2dd7d267 adds officer-polls relation and spec 2016-12-06 14:51:53 +01:00
Juanjo Bazán
891516a0b9 changes officer assignments to polls via new model/relation 2016-12-06 14:33:06 +01:00
Juanjo Bazán
6419878741 fixes booth-poll relation 2016-12-02 14:24:31 +01:00
Juanjo Bazán
bd59ba3b82 adds poll/booth_assigments 2016-12-01 13:02:03 +01:00
Juanjo Bazán
9583c052f0 removes poll-booth direct association 2016-12-01 13:02:03 +01:00
rgarcia
c1ea074be4 adds question, booth and officer tabs for a poll 2016-11-29 11:46:37 +01:00
kikito
83fd70b048 Extracts some logic from poll_question to poll 2016-11-07 17:34:24 +01:00