Bertocq
e1a7fc5dfa
Merge branch 'master' into fix/shift_creation_polls
2017-10-04 15:27:54 +02:00
rgarcia
bf7cab29cf
fixes specs
2017-10-04 15:15:20 +02:00
Bertocq
15039b6c5d
Load the Booth polls instead of all current/incoming on Shift creation for date ranges
2017-10-04 11:02:09 +02:00
María Checa
8dc05d399b
Fixed tests
2017-10-04 10:03:44 +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
María Checa
05d40c0ede
Merge branch 'master' into polls_minor_changes
2017-10-03 16:22:33 +02:00
María Checa
2cb620296b
Fixed test
2017-10-03 15:49:03 +02:00
Bertocq
0384baf26a
Unify both Shift task type creation on a single scenario to check double task on same day
2017-10-03 13:29:26 +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
c0dcedcd0f
Tests fix
2017-10-02 16:39:09 +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
121109f967
Merge branch 'master' into feature/1924#poll_shifts_creation
2017-09-28 13:03:34 +02:00
Bertocq
3da4ee4ee3
Check Poll Shift creation date ranges are correct
2017-09-28 12:18:47 +02:00
Bertocq
49b4af5e04
Add flash error for shift creation without date, increase spec
2017-09-28 10:53:15 +02:00
Bertocq
13aa5a3ba8
Increase Admin Shift creation scenarios for both tasks options
2017-09-27 18:47:06 +02:00
taitus
a0603985ef
Refactor.
2017-09-27 14:51:35 +02:00
taitus
7b54451491
Add missing specs on admin
2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
6c1d1c2cde
Add map settings to backend. Install leaflet assets to render maps.
2017-09-27 14:46:02 +02:00
Senén Rodero Rodríguez
1a8fda9352
Fix broken specs
2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
ce29185b76
Fix documentable on admin poll questions. Adapt nested documentable shared specs to admin fetaure specs and include at admin poll questions specs.
2017-09-26 13:57:13 +02:00
BertoCQ
f2e44f0730
Merge pull request #1919 from consul/chore/remove_booth_assignment_officer_totals
...
Remove Officer recounts, add Final&Totals votes
2017-09-26 10:19:57 +02:00
Bertocq
22822aa173
Fix Style/RedundantParentheses rubocop issues
2017-09-25 22:44:58 +02:00
Bertocq
bf981ca828
Remove Booth Assignment officer totals and add final&system counts
2017-09-25 18:47:44 +02:00
BertoCQ
d449e8ee62
Merge pull request #1875 from consul/admin-design
...
Admin design
2017-09-25 17:23:17 +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
decabeza
1b3292690a
updates spec of admin logo_header
2017-09-20 11:02:13 +02:00
BertoCQ
5d6c4f0bbc
Merge pull request #1868 from wairbut-m2c/aperez-validate-poll-question-is-selected
...
Validate presence 'poll_id' attribute on Poll::Question model
2017-09-19 18:15:32 +02:00
rgarcia
92333e530f
fixes flaky spec
...
Visits directly the page to avoid flakiness
2017-09-19 17:30:40 +02:00
rgarcia
aee34e643c
removes unused expectation
2017-09-19 17:30:40 +02:00
rgarcia
8db8049e49
fixes flaky spec
...
Reactivates feature setting after spec
2017-09-19 17:30:40 +02:00
Bertocq
bf37b8e5f9
Use datetime always with zone
2017-09-19 17:30:40 +02:00
BertoCQ
5cf862064d
Merge pull request #1888 from consul/flaky-specs
...
Fixes some flaky specs
2017-09-19 16:43:41 +02:00
rgarcia
eb89d92320
fixes flaky spec
...
Visits directly the page to avoid flakiness
2017-09-19 15:14:29 +02:00
rgarcia
8e0f709cf0
removes unused expectation
2017-09-19 15:14:28 +02:00
rgarcia
a7ce8d5c70
fixes flaky spec
...
Reactivates feature setting after spec
2017-09-19 15:14:28 +02:00
Bertocq
851d397395
Replace FinalResult with TotalResult at admin Poll Recounts page
2017-09-19 00:54:46 +02:00
Bertocq
f27fcc7f99
Replace FinalResult with TotalResult at admin BoothAssignment show
2017-09-19 00:45:13 +02:00
Bertocq
97fe464232
Use datetime always with zone
2017-09-15 14:06:29 +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
e4e78c8f16
Rubocop autocorrections
2017-09-14 15:08:35 +02:00
BertoCQ
fa8b9a69a3
Merge branch 'master' into polls-persist-officer-data
2017-09-11 00:11:36 +02:00
BertoCQ
1ced54f0e3
Merge pull request #1835 from consul/1677-poll_questions_documents
...
Poll questions document and video
2017-09-11 00:08:31 +02:00
BertoCQ
dd02c83fa3
Merge branch 'master' into poll-shifts-search-officers
2017-09-11 00:07:12 +02:00
rgarcia
4d1f61a87e
adds specs
2017-09-08 22:00:50 +02:00
rgarcia
47564a91a0
persist a shift's officer data
2017-09-08 20:08:45 +02:00
rgarcia
b1abb9dbb3
adds specs
2017-09-07 22:39:03 +02:00
María Checa
27ac4c5815
Added poll questions documents and video specs
...
New tests to ensure video URL is shown in the admin preview. Also that the video URL and documents are correctly saved after creating a question.
2017-09-07 17:19:07 +02:00
