María Checa
84f67db26d
Added restrictions to access Poll results and stats
2017-10-23 14:17:25 +02:00
decabeza
96f588566a
changes id name to specs
2017-10-22 01:06:03 +02:00
decabeza
a0eb6e56a1
fixes styles for polls tabs, uses underscore for ids
2017-10-19 12:23:57 +02:00
María Checa
70a35fbe58
Poll views improvements
...
Reorganized poll `#show`, `#stats` and `#results` views. Gave stats section its own route.
2017-10-18 18:35:53 +02:00
iagirre
81b1fb1a72
Fixed some conflicts automatically merged that didn't realised before they were there
2017-10-18 10:27:41 +02:00
iagirre
f7bb3ec8b7
Merge remote-tracking branch 'consul/master' into iagirre-poll-stats
2017-10-18 09:48:02 +02:00
iagirre
0f73b787b2
Fixed views and Poll::Stats model to pass the specs
2017-10-17 16:07:44 +02:00
iagirre
6a292daf42
Partial to render the polls stats and model methods to get the information from DB
2017-10-17 15:04:29 +02: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
a476019c49
Merge pull request #2020 from consul/poll-videos
...
Poll answer videos
2017-10-16 20:03:34 +02:00
iagirre
78cc09cc5a
Controllers and models to see the polls stats. Routes related also added.
2017-10-16 17:25:04 +02:00
iagirre
2c6c320fa1
When answer 2 more info expand is clicked, it expands on top of the first one, not below. Same if the expand is clicked for the first answer
2017-10-13 14:38:30 +02:00
decabeza
3a20a6bc2a
adds margin to read more answer description link
2017-10-11 20:16:38 +02:00
Bertocq
34c278db74
Small fixes for Poll Question Answer ordering
2017-10-11 12:05:20 +02:00
rgarcia
faa2f31b3a
Adds comment's tab
2017-10-10 12:06:41 +02:00
Raimond Garcia
2b588753ee
Merge branch 'master' into mlucena-poll-comments
2017-10-09 17:59:12 +02:00
María Checa
3fc3f9e88e
Fixed condition
2017-10-09 17:42:13 +02:00
María Checa
f23073bb28
Fixed already voted message in poll show
2017-10-09 13:12:44 +02:00
decabeza
ba9814cd85
shows videos on polls answers
2017-10-09 13:01:39 +02:00
María Checa
316ba37d91
Requested changes
2017-10-07 20:27:44 +02:00
María Checa
65f5c9efa9
Changed token message background color
2017-10-07 19:21:27 +02:00
María Checa
728edf64a5
Added "participate in other polls" link in poll show
2017-10-07 19:12:58 +02:00
María Checa
ca24be79e3
Moved token message below questions
2017-10-07 19:12:17 +02:00
Raimond Garcia
689b6ecb9d
Merge pull request #2011 from consul/show-poll-answers-after-booth-vote
...
Show poll answers in poll show view after voting on a booth
2017-10-07 18:20:29 +02:00
María Checa
8b2f6d454c
Show poll answers in poll show view after voting on a booth
...
If the user votes in a booth, it can see the poll and answers but can't see what he/she voted and the answers are inactive (no link, inactive ui style).
2017-10-07 17:33:27 +02:00
decabeza
7cfd47ad87
removes duplicated content on polls show
2017-10-07 17:11:40 +02:00
rgarcia
a08d5bdba9
fixes conflict in merge
2017-10-07 17:00:26 +02:00
Raimond Garcia
2e4ce39722
Merge pull request #1994 from consul/feature/1985#voting_token
...
Voter Answer unique Token
2017-10-07 16:54:01 +02:00
decabeza
12427e1ce5
adds styles to document link on polls show
2017-10-07 14:46:55 +02:00
decabeza
316b6720cb
fixes polls show indentation and adds missing <% end %>
2017-10-07 14:31:04 +02:00
Alberto García
ca724c7d25
Merge branch 'master' into polls-gallery-polish
2017-10-07 14:26:50 +02:00
decabeza
a5d3d5d239
adds links to read more and less for answer description
2017-10-07 11:53:34 +02:00
María Checa
e127b52225
Minor fixes
2017-10-07 11:37:33 +02:00
BertoCQ
6a0197a61b
Merge branch 'master' into feature/1985#voting_token
2017-10-07 10:46:13 +02:00
decabeza
cd495c80fe
changes border right to bottom when expand gallery
2017-10-07 02:08:01 +02:00
rgarcia
5f1485dbfa
fixes specs
2017-10-06 22:49:53 +02:00
Angel Perez
8b8e8aff8f
Show answer's title if answer has any records associated
...
If an answer has a description and/or documents/images
associated, the answer's title will be shown on the UI
so the user can associate a certain answer with its
related records
See issue #1998 , as well as commit 7fad604
2017-10-06 14:46:13 -04:00
María Checa
bcfd1a844a
Poll voter token
2017-10-06 20:44:47 +02:00
Angel Perez
a1907c6f50
Show answer's associated documents on polls
...
As requested by #2003
2017-10-06 14:40:54 -04:00
Angel Perez
7fad604842
Avoid show div into markup for answers' information
...
If an answer does not contain any description or images
associated, the "poll-more-info-answers" div won't be
shown in the markup
Change requested by #1998
2017-10-06 14:17:01 -04:00
decabeza
dcc5ebf530
removes data equalizer to avoid big scrolls
2017-10-06 18:09:05 +02:00
Raimond Garcia
936ffa1fb6
Merge pull request #1993 from consul/1984-voting_messages
...
Voting messages
2017-10-06 17:57:17 +02:00
decabeza
225ede4a42
hides temporally documents sidebar on polls show
2017-10-06 16:58:49 +02:00
decabeza
47ee8a2f79
shows answer title on polls show only if description is present
2017-10-06 16:19:55 +02:00
Bertocq
d4408efda6
Generate a unique token for a Poll Ballot and use it on answer buttons
2017-10-06 14:36:21 +02:00
Manuel Lucena
8277e3cc2b
removed obsolete polls questions view
2017-10-06 11:55:25 +02:00
Manuel Lucena
63cbe2f7c1
20171003 - [WIP] Functionality and tests for polls comments
2017-10-06 10:36:26 +02:00
María Checa
0cf5299846
Set voting messages
2017-10-06 00:04:25 +02:00
decabeza
0ba2dbd4f3
replaces lorem content on polls show
2017-10-05 11:45:51 +02:00
