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
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
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
bf981ca828
Remove Booth Assignment officer totals and add final&system counts
2017-09-25 18:47:44 +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
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
Bertocq
bf37b8e5f9
Use datetime always with zone
2017-09-19 17:30:40 +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
rgarcia
9181610de9
removes obsolete code
2017-08-04 21:27:30 +02:00
rgarcia
0aba196ba2
adds specs for shifts
2017-08-04 21:27:30 +02:00
Bertocq
361e0efe00
Remove Poll Recount model and all usages
2017-07-23 23:29:24 +02:00
Bertocq
d98425f45b
Remove daily officer recounts from admin poll recounts list
2017-07-23 23:28:38 +02:00
Bertocq
69f4e1c683
Fix all rubocop Metrics/LineLength issues (140+)
2017-07-10 13:22:49 +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
Bertocq
b79df113cd
Switch all Time.curren.to_date for Date.current, same result but better syntax
2017-06-11 10:41:09 +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
0bd87c7e43
extracts results from admin's poll/show
2017-02-14 14:26:46 +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
01a52cc61a
fixes ambiguous match error in specs
2017-01-31 19:09:58 +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
547168be3f
adds recounts to poll_officer view in admin zone
...
Admin can see recounts and final recounts made by poll_officer next to
their officing shifts
2017-01-31 12:38:53 +01:00
Raimond Garcia
b0bc97eb37
Merge pull request #1378 from consul/recounting
...
Final recounts info to Admin
2017-01-30 21:54:35 +01:00
Juanjo Bazán
4ee50c86c0
adds final recounts info to admins
2017-01-30 20:42:30 +01:00
kikito
cca6758f71
Removes poll::question.summary from specs
2017-01-30 18:41:24 +01:00
Juanjo Bazán
72ac75abeb
adds final recounting to poll officers' zone
2017-01-30 17:44:39 +01:00
