Commit Graph

705 Commits

Author SHA1 Message Date
Juanjo Bazán
bdf16395d3 removes poll_id from voter
YAGNI
2016-12-07 19:11:43 +01:00
Juanjo Bazán
45d26f6dee refactors poll::voter
now belongs_to booth_assignment instead of to booth
2016-12-06 20:20:18 +01:00
Juanjo Bazán
ad2dd7d267 adds officer-polls relation and spec 2016-12-06 14:51:53 +01:00
Juanjo Bazán
891516a0b9 changes officer assignments to polls via new model/relation 2016-12-06 14:33:06 +01:00
Juanjo Bazán
6419878741 fixes booth-poll relation 2016-12-02 14:24:31 +01:00
Juanjo Bazán
bd59ba3b82 adds poll/booth_assigments 2016-12-01 13:02:03 +01:00
Juanjo Bazán
9583c052f0 removes poll-booth direct association 2016-12-01 13:02:03 +01:00
rgarcia
c1ea074be4 adds question, booth and officer tabs for a poll 2016-11-29 11:46:37 +01:00
rgarcia
20cb044015 adds search and filter for poll questions 2016-11-29 11:46:30 +01:00
rgarcia
ceebae644f removes question column from poll_questions 2016-11-22 11:41:10 +01:00
rgarcia
e12f183775 fixes typo 2016-11-19 14:03:10 +01:00
rgarcia
5f6d0590e8 tmp commit refactoring answerable questions 2016-11-18 03:57:31 +01:00
rgarcia
4955daf886 adds poll and poll question's specs 2016-11-17 22:48:00 +01:00
rgarcia
626a8e9154 updates specs for admin poll questions 2016-11-17 21:31:51 +01:00
rgarcia
d9ad658758 adds admin interface for poll questions 2016-11-17 09:30:42 +01:00
rgarcia
1dbdabb69a adds consistency to spacing 2016-11-16 19:42:35 +01:00
rgarcia
348a6dc970 everybody can vote for now 2016-11-16 19:42:05 +01:00
rgarcia
b104859da3 adds question comments 2016-11-16 19:41:52 +01:00
rgarcia
6fe965a9b8 adds question's show 2016-11-16 19:41:29 +01:00
kikito
598b1b9c01 Adds group by to answerable_by scope to avoid duplicates 2016-11-14 13:35:23 +01:00
kikito
38efad77f3 Changes the way question#copy_attributes_from_proposal works 2016-11-11 19:11:53 +01:00
kikito
11a98dce07 Refactors in poll/question model 2016-11-11 19:10:36 +01:00
kikito
048ada3e17 Adds poll partial result 2016-11-11 19:08:32 +01:00
kikito
6dd2b54123 Fixes bug in Poll::Question#answerable_by 2016-11-08 15:52:13 +01:00
kikito
3255ca700f User new answerable_by method in ability 2016-11-07 17:42:52 +01:00
kikito
83fd70b048 Extracts some logic from poll_question to poll 2016-11-07 17:34:24 +01:00
kikito
d39f19abb8 Defines Poll::Question#answerable_by?(user) and uses it in abilities 2016-11-07 16:28:39 +01:00
kikito
f821d7beb7 Implements abilities for poll & poll_question 2016-11-07 10:37:22 +01:00
kikito
35a5136d9f Implements filtering in polls/index 2016-11-03 17:52:15 +01:00
kikito
0305d2bd65 Adds time scopes and methods to poll 2016-11-02 17:49:34 +01:00
kikito
575aa62960 Starts introducing valid answers to poll questions 2016-10-31 16:31:48 +01:00
kikito
1aab780592 Starts adding questions to polls 2016-10-31 14:27:25 +01:00
kikito
3eca3faacd First version of Polls Controller 2016-10-31 14:13:56 +01:00
kikito
85aba10798 Initial work in Poll::Question 2016-10-28 18:02:28 +02:00
Juanjo Bazán
db7b2ef8af Merge branch 'master' into polling-views-plus 2016-10-19 13:50:08 +02:00
Marcia
680c0636ed expired password last 2016-10-06 14:19:48 +02:00
Marcia
1e87810593 improves expired password view 2016-09-29 14:34:37 +02:00
rgarcia
527b734e0e assigns officers to booths 2016-09-28 18:39:01 +02:00
rgarcia
2c3127b6bd adds booth backend for index, show, create and edit actions 2016-09-28 11:56:19 +02:00
Marcia
4269f3810b Merge remote-tracking branch 'upstream/master' into admin_password_expired 2016-09-27 13:26:08 +02:00
Marcia
78c6a30424 optimize code 2016-09-27 13:07:06 +02:00
rgarcia
0795da02d8 adds poll CRU actions 2016-09-25 10:21:16 +02:00
rgarcia
c965e2dda1 tmp commit poll index, show and new 2016-09-23 09:13:02 +02:00
rgarcia
5bcd8f1e9d fixes conflicts with poll branch 2016-09-20 11:53:40 +02:00
rgarcia
a6384af527 updates query to be more efficient 2016-09-20 11:48:35 +02:00
rgarcia
88e7af70d0 displays voter name if already voted 2016-09-19 18:48:19 +02:00
rgarcia
48d2aaa845 validates user has not already voted 2016-09-19 18:48:18 +02:00
rgarcia
0ec3a8e8bf validates voter in census 2016-09-19 18:47:17 +02:00
rgarcia
7d4d9b0ead sorts archived proposals by votes 2016-09-16 19:42:18 +02:00
Alberto Garcia Cabeza
910b24936d Merge branch 'master' into voting-proposals
Conflicts:
	app/models/proposal.rb
	app/views/proposals/_proposal.html.erb
	app/views/proposals/index.html.erb
	app/views/proposals/show.html.erb
	spec/support/common_actions.rb
2016-09-15 13:58:53 +02:00