Commit Graph

35 Commits

Author SHA1 Message Date
María Checa
b1e91cdc03 Tests improvements 2017-10-23 12:57:52 +02:00
María Checa
6b5c29f23e Added tests 2017-10-23 12:25:51 +02:00
rgarcia
6a697bd6d0 adds specs 2017-10-19 11:28:09 +02:00
Bertocq
39f23d3b7b Switch from valid_answers to question_answers on specs 2017-10-18 01:28:38 +02:00
Bertocq
60f2815010 Add missing total_results check on poll result specs 2017-10-18 01:27:39 +02:00
decabeza
090ff83cc1 updates edit texts on specs 2017-10-09 20:09:56 +02:00
iagirre
4035097c60 Specs added for branch polls-show in consul and thumbnail for poll images in admins views.
Cambios para hacer commit:
	modificado:    app/views/images/_admin_image.html.erb
	modificado:    spec/features/admin/poll/polls_spec.rb
	modificado:    spec/features/polls/polls_spec.rb
2017-10-04 16:43:35 +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
BertoCQ
7f936f440c Merge branch 'master' into polls_minor_changes 2017-10-02 16:44:53 +02:00
María Checa
afbdd48891 Fixed tests 2017-10-02 16:11:17 +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
BertoCQ
34568567a3 Merge pull request #1885 from consul/chore/remove_final_recounts
Remove Poll Final Recounts, replace with Total Results
2017-09-20 23:00:03 +02:00
Bertocq
851d397395 Replace FinalResult with TotalResult at admin Poll Recounts page 2017-09-19 00:54:46 +02:00
Angel Perez
0611e0f4ea Validate presence of 'poll_id' attribute on Poll::Question model
Fixes #1831

On branch aperez-validate-poll-question-is-selected
  Changes to be committed:
    modified:   app/models/poll/question.rb
    modified:   spec/models/poll/question_spec.rb
    modified:   spec/features/admin/poll/polls_spec.rb
2017-09-14 11:52:19 -04:00
Bertocq
d98425f45b Remove daily officer recounts from admin poll recounts list 2017-07-23 23:28:38 +02:00
Bertocq
e6dd33bd66 Fix all Layout/SpaceAfterComma issues and remove from rubocop_todo list 2017-06-26 17:57:53 +02:00
Bertocq
15c92b27c8 Fix Style/BlockDelimiters rubocop issues and remove it from rubocop_todo list 2017-06-19 10:45:18 +02:00
Juanjo Bazán
d68be1f6f0 adds automatic recount to admin poll and paginates recounts 2017-02-14 19:44:19 +01:00
Juanjo Bazán
75d088b472 fixes specs 2017-02-14 15:01:04 +01: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
Juanjo Bazán
a05297ea1a adds Recounting tab to Poll's admin show view 2017-01-31 13:40:53 +01:00
Juanjo Bazán
70b86170a2 adds booth_assignment show with officers and recounts info 2017-01-04 21:00:36 +01:00
Alberto Garcia Cabeza
4ab9a417fb updates specs 2016-12-28 14:04:28 +01:00
Juanjo Bazán
f0156c5b5a adds admin search/add/remove question to poll 2016-12-26 16:19:35 +01:00
Juanjo Bazán
298c9cb76a adds better spec for poll dates 2016-12-21 14:00:21 +01:00
Juanjo Bazán
bc690748fd adds dates validation to polls 2016-12-21 13:50:15 +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
60e7ac20e7 tweaks admin/polls pages and specs 2016-12-06 13:51:14 +01:00
rgarcia
de330b1c02 adds booth info to poll show 2016-11-14 13:57:16 +01:00
rgarcia
daac86a7a8 removes poll unused attributes 2016-11-14 13:56:49 +01:00
rgarcia
c1a9caeab0 adds poll CRU actions 2016-11-14 13:56:49 +01:00
rgarcia
304743f64e tmp commit poll index, show and new 2016-11-14 13:56:49 +01:00