Raimond Garcia
861b583b02
Merge pull request #1977 from wairbut-m2c/aperez-admin-questions-section
...
Admin::Poll questions UI refactor
2017-10-04 19:52:45 +02:00
Alberto García
75538ed207
Merge pull request #1981 from consul/polls-callout
...
Polls callout
2017-10-04 19:49:31 +02:00
decabeza
02ea701dd1
removes unused i18n keys
2017-10-04 19:01:51 +02:00
rgarcia
adda4f9d33
removes unused translation
2017-10-04 18:08:55 +02:00
Bertocq
c62b573489
Fix poll Voter feature spec
2017-10-04 17:59:29 +02:00
rgarcia
007bcb7ec7
fixes specs
2017-10-04 17:46:25 +02:00
rgarcia
4aaf681d2d
uses new answer model in user facing interface
2017-10-04 17:45:51 +02:00
decabeza
6bea0f27e7
removes unnecessary polls partial
2017-10-04 17:18:19 +02:00
decabeza
f2220c6a06
adds missing condition on polls callout partial
2017-10-04 17:18:01 +02:00
rgarcia
461410a79d
adds consistency to answer's namespace
2017-10-04 17:06:29 +02:00
Bertocq
24ef7984a3
Include the answerable by user scope back on Poll list for officer voting panel
2017-10-04 17:05:25 +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
rgarcia
1f2aa301d4
adds specs for answer's index and create
2017-10-04 16:33:52 +02:00
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
9ab22870cc
Merge pull request #1971 from consul/polls-show
...
Polls show
2017-10-04 14:20:50 +02:00
BertoCQ
4e99012f8b
Merge pull request #1978 from consul/officing_requested_changes
...
Officing requested changes
2017-10-04 14:20:36 +02:00
Raimond Garcia
44d0c04e38
Merge branch 'master' into aperez-admin-questions-section
2017-10-04 14:13:20 +02:00
Bertocq
2900104a07
Show only active polls from the shifts assigned to officer on vote panel
2017-10-04 13:11:13 +02:00
decabeza
4a6e557d83
adds missing i18n
2017-10-04 13:06:04 +02:00
BertoCQ
05df996078
Merge pull request #1970 from consul/minor-fixes
...
Minor fixes
2017-10-04 12:55:08 +02:00
María Checa
2020990b05
Merge pull request #1972 from consul/1954-remove_question_show_and_description
...
Removed poll question show view and description attribute
2017-10-04 12:52:46 +02:00
María Checa
85695d51bb
Changed translations "blank ballots" for "totally blank ballots"
2017-10-04 11:52:09 +02:00
decabeza
a318b82159
fixes lint warnings
2017-10-04 11:47:31 +02:00
María Checa
5a1e5da86b
Fixed poll officers search
...
Returning User objects was provoking conflicts retrieving attributes in the views.
2017-10-04 11:41:37 +02:00
decabeza
e4205dc22a
includes poll image on polls index
2017-10-04 11:40:20 +02:00
María Checa
5b7a90221a
Fixed tests
2017-10-04 11:18:09 +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
decabeza
3edd59c8d6
replaces lorem with poll summary and description
2017-10-04 10:54:59 +02:00
Pedro
e690688bbb
Merge pull request #4 from consul/master
...
Merge 04/10/17
2017-10-04 10:43:34 +02:00
decabeza
c9e8152ead
includes lorem content and images to answers
2017-10-04 10:12:54 +02:00
decabeza
cfbc5db9af
adds zoom icons and texts
2017-10-04 10:12:54 +02:00
decabeza
639f24e316
adds foundation orbit components and customise them
2017-10-04 10:12:54 +02:00
decabeza
87676f5296
include lorem ipsum content on polls show
2017-10-04 10:12:54 +02:00
decabeza
ad08303dfd
removes question link on polls index
2017-10-04 10:12:54 +02:00
decabeza
1b3cdc181d
improves polls show layout
2017-10-04 10:12:54 +02:00
María Checa
8dc05d399b
Fixed tests
2017-10-04 10:03:44 +02:00
Angel Perez
1cc0816dcd
Create 'poll_question_answers' controller and views
2017-10-03 23:23:50 -04:00
Angel Perez
1d1b861ddf
Create 'poll_question_answers' table
2017-10-03 23:04:50 -04:00
BertoCQ
e67ca1f86b
Merge pull request #1976 from consul/feature/add_officer_to_poll_voter
...
Add officer to Poll::Voter
2017-10-04 02:03:51 +02:00
BertoCQ
e32521ebe0
Merge branch 'master' into 1954-remove_question_show_and_description
2017-10-04 01:17:07 +02:00
Bertocq
85087b0bea
Check officer value for Poll Voter created from officing panel
2017-10-04 01:09:51 +02:00
Bertocq
e928eb38ac
Add Officer relationship to Poll Voter
2017-10-04 00:39:31 +02:00
BertoCQ
885a7bff2a
Merge pull request #1975 from consul/fix/shift_date_restrictions
...
Correct Poll Shift task & date restrictions
2017-10-04 00:38:09 +02:00
Bertocq
b1eb6698be
Add validation expectations for shift date/task/booth/officer combinations
2017-10-04 00:13:10 +02:00
Bertocq
1975099545
Refactor & cleanup let statements on Shift model spec
2017-10-04 00:07:11 +02:00
Bertocq
b893c0bace
Add shift task presence validation expectation
2017-10-03 23:45:13 +02:00
Bertocq
3a0e709e14
Correct composed index on poll Shift model adding date
2017-10-03 23:34:09 +02:00
María Checa
bdfe822ddf
Removed unused translations
2017-10-03 23:05:06 +02:00
María Checa
80c8fa308f
Merge branch 'master' into 1954-remove_question_show_and_description
2017-10-03 22:33:08 +02:00
