Commit Graph

5287 Commits

Author SHA1 Message Date
Juanjo Bazán
cc6d841978 refactors age calculation 2017-01-25 17:16:17 +01:00
Juanjo Bazán
754095f4d0 fixes modified i18n key 2017-01-25 17:15:38 +01:00
Juanjo Bazán
b13a76963a records participation of user via web
answering a poll question creates a voter with the user data to record
participation in question’s poll
2017-01-25 14:21:03 +01:00
Juanjo Bazán
086f4a4170 refactors Poll::Voter 2017-01-25 14:19:36 +01:00
Juanjo Bazán
5a72e4fbe8 fixes factories method call 2017-01-25 14:18:32 +01:00
Juanjo Bazán
0b2454fb97 adds User#age 2017-01-25 14:17:49 +01:00
Juanjo Bazán
8d8d822323 adds answer spec 2017-01-25 13:04:26 +01:00
Juanjo Bazán
5806d86e33 changes poll_voters to optionally reference an answer
adds indexes for poll_voters
2017-01-25 12:57:00 +01:00
Juanjo Bazán
6bc4f5b307 adds Poll::Answer model for web users
PartialResults is kept for booth results
2017-01-25 12:46:44 +01:00
Juanjo Bazán
8f235c25d3 poll has_many voters 2017-01-25 12:18:15 +01:00
Juanjo Bazán
900563e31c adds poll_id and stats fields to poll_voters 2017-01-25 12:03:48 +01:00
Juanjo Bazán
480f92bdd9 Merge pull request #1366 from consul/polls-geozones
Polls Geozones
2017-01-25 11:31:58 +01:00
kikito
499f9b51e2 makes it possible to create orphan poll questions 2017-01-25 11:19:18 +01:00
kikito
2be88cb316 Adds missing validation to poll::question. Fixes specs 2017-01-25 10:46:57 +01:00
kikito
25930563e9 adds missing i18n 2017-01-25 10:15:38 +01:00
kikito
e935629fdb i18n 2017-01-24 19:01:28 +01:00
kikito
a4585b00f2 Merge branch 'polls' into polls-geozones 2017-01-24 18:26:23 +01:00
kikito
15b531f068 Fixes failing specs 2017-01-24 18:10:41 +01:00
kikito
6ed73f34b6 Adds activerecord translations 2017-01-24 18:10:30 +01:00
kikito
ddf8d5f811 Removes answerable/non_answerable questions in polls
Now they are either all answerable or non-answerable, so it is not
worth it to make the distinction in code
2017-01-24 18:10:13 +01:00
kikito
6711063c7d Moves geozones from question to poll in user show views 2017-01-24 18:09:27 +01:00
kikito
ab63c18d01 Moves geozones from questions to polls in admin show views 2017-01-24 18:08:48 +01:00
kikito
176a190149 Moves geozones from questions to polls in admin forms 2017-01-24 18:08:15 +01:00
kikito
65b0d27995 Moves geozones from questions to polls in admin controllers 2017-01-24 18:06:41 +01:00
kikito
86b895a7af Adds checkbox toggle js library 2017-01-24 17:51:18 +01:00
Juanjo Bazán
8bd74d2a20 fixes specs
namespace method defined in AdminHelper now returns
X/Y instead of X::Y
2017-01-24 13:07:49 +01:00
Juanjo Bazán
467ca1ba68 Merge branch 'master' into polls 2017-01-24 12:08:59 +01:00
Juanjo Bazán
29f57e7da2 Merge pull request #1365 from medialab-prado/flaky-spec-ballots-hover
Try to avoid intermittent poltergeist error on hover
2017-01-21 19:44:30 +01:00
Amaia Castro
7692fb9cb0 Try to avoid poltergeist error on hover 2017-01-20 19:56:33 +01:00
kikito
8dbc72c374 moves geozones from poll question to poll in dev_seeds 2017-01-20 18:58:19 +01:00
kikito
d024505960 moves geozones from poll question to poll in models 2017-01-20 18:58:03 +01:00
kikito
063c94822d Removes all_geozones from poll_questions table 2017-01-20 17:47:49 +01:00
kikito
d53c867ba4 Adds geozone_restricted to polls 2017-01-20 17:45:11 +01:00
kikito
67c287dc14 Migrates geozones from poll questions to polls 2017-01-20 16:50:03 +01:00
Juanjo Bazán
bd6514d4a4 Merge branch 'master' into polls 2017-01-20 11:34:12 +01:00
Juanjo Bazán
4957ea2bf1 Merge pull request #1364 from medialab-prado/increase-poltergeist-timeout
Increase Poltergeist timeout in specs
2017-01-20 11:28:31 +01:00
Juanjo Bazán
da2d264f7a adds missing budget_id parameter 2017-01-19 18:30:32 +01:00
Alberto Garcia Cabeza
d30c97c0c2 fixes } scss 2017-01-19 18:04:04 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Amaia Castro
551e8dc6c1 Increase Poltergeist timeout in specs
This is to try to avoid flaky js specs in Travis
2017-01-19 13:38:06 +01:00
rgarcia
c918c9e081 adds specs for many tags in a budget investment 2017-01-19 10:03:38 +01:00
Raimond Garcia
fce5eb9803 Merge pull request #1361 from consul/taggable_path
adds taggables/s path helper
2017-01-18 18:50:30 +01:00
Juanjo Bazán
c3635f4182 adds taggables/s path helper 2017-01-18 18:17:02 +01:00
Juanjo Bazán
6cb028a11e Merge pull request #1360 from consul/budgets-styles
budgets styles
2017-01-17 19:24:54 +01:00
Alberto Garcia Cabeza
750909916b improves layout on sign in and sign up views 2017-01-17 19:13:31 +01:00
Alberto Garcia Cabeza
72ab4f5923 fixes styles on callout warning 2017-01-17 19:09:46 +01:00
Alberto Garcia Cabeza
86360a8719 shows fixed bar only in correct heading on voting phase 2017-01-17 18:59:12 +01:00
Alberto Garcia Cabeza
c5c686ec74 adds progress bar styles 2017-01-17 18:58:32 +01:00
Alberto Garcia Cabeza
d890b0a98b adds fixed bar js 2017-01-17 18:58:13 +01:00
Alberto Garcia Cabeza
2aaf917510 adds different back link if headings count equal to 1 2017-01-17 18:16:50 +01:00