Commit Graph

8771 Commits

Author SHA1 Message Date
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
María Checa
81e9682aa3 Fixed tests 2017-10-03 22:30:15 +02:00
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
ac1d2e3aec Merge pull request #1960 from consul/polls_minor_changes
Requested polls admin section improvements
2017-10-03 21:36:08 +02:00
María Checa
9871503c5e Restored views 2017-10-03 21:00:40 +02:00
Angel Perez
d9d03079e1 Adapt Poll::Question 'show' action to mockup 2017-10-03 13:29:07 -04:00
María Checa
348e4e54f3 Removed question description 2017-10-03 19:11:54 +02:00
María Checa
5bb831e959 Removed poll question show 2017-10-03 19:11:39 +02:00
Bertocq
45831a0b68 Include last day of poll in range for recount and scrutiny on officing panel 2017-10-03 18:56:27 +02:00
Bertocq
825671ad9b Fix polls answer this question show text 2017-10-03 18:53:44 +02:00
María Checa
080064ed46 Updated schema.rb 2017-10-03 16:48:21 +02:00
María Checa
05d40c0ede Merge branch 'master' into polls_minor_changes 2017-10-03 16:22:33 +02:00
BertoCQ
21e14776fc Merge pull request #1969 from consul/feature/1929#add_shift_task_usage
Poll Shift and OfficerAssignment fixes
2017-10-03 16:15:18 +02:00
María Checa
2cb620296b Fixed test 2017-10-03 15:49:03 +02:00
Pedro
4e7f020d45 Merge pull request #3 from consul/master
Merge final 03/10/17
2017-10-03 14:15:49 +02:00
decabeza
c32a70d2a9 improves css for items on list with images 2017-10-03 13:57:01 +02:00
decabeza
5e9a452e55 removes unnecessary blank space 2017-10-03 13:56:16 +02:00
decabeza
d39c2c6e9e cleans css format 2017-10-03 13:55:59 +02:00
decabeza
894bda92ba moves custom setting to consul settings css 2017-10-03 13:53:57 +02:00
decabeza
367b43fd31 adds polls index orders on ignore i18n-tasks 2017-10-03 13:51:15 +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
690ebfba01 Check Shift destroy also destroy only associated OfficerAssigments 2017-10-03 13:24:07 +02:00
Bertocq
c624129175 Check Shift creates final/not-final OfficerAssigments correctly 2017-10-03 12:57:40 +02:00
Bertocq
fc5ff61365 Destroy all related OfficerAssignments when destroying a Shift 2017-10-03 12:30:42 +02:00
Bertocq
332b9be94a Reorder before/after create methods 2017-10-03 12:26:43 +02:00
Bertocq
34fbf1472c Join in a single validation both Shift date validates statements 2017-10-03 12:26:04 +02:00
María Checa
1afd97b687 Removed unnused translations 2017-10-03 12:09:02 +02:00
Bertocq
4e85e136d1 Remove OfficerAssignment composed index 2017-10-03 12:02:30 +02:00
Bertocq
ad986e600e Merge branch 'master' into feature/1929#add_shift_task_usage 2017-10-03 12:01:21 +02:00
Bertocq
3a17c74f2c Merge branch 'master' into chore/remove_results 2017-10-03 11:42:57 +02:00
Bertocq
9432cd77d8 Merge branch 'master' into chore/update_secrets_example 2017-10-03 11:42:42 +02:00
Bertocq
ccb80ce967 Fix recount spec to take into account already existing values and mandatory officer_assigment 2017-10-03 11:40:36 +02:00
María Checa
e6b5de77fe Removed files that are not being used 2017-10-03 10:50:18 +02:00
María Checa
bf61dffd4b Removed files that are not used 2017-10-03 10:47:48 +02:00
Bertocq
5c4fb1bef3 Merge branch 'master' into chore/update_secrets_example 2017-10-03 00:22:18 +02:00
Bertocq
6c998768e8 Fix Poll Recount model spec after default amount value added 2017-10-03 00:19:12 +02:00
BertoCQ
19e8ec265f Merge branch 'master' into chore/remove_results 2017-10-02 23:54:13 +02:00
Bertocq
9ae72387fe Remove remove_question ability from admin on Poll 2017-10-02 23:29:57 +02:00
BertoCQ
fbbbd38932 Merge pull request #1965 from consul/polls-voting
Polls voting
2017-10-02 22:25:51 +02:00
BertoCQ
3835821871 Merge branch 'master' into iagirre-admin-polls-section 2017-10-02 22:25:09 +02:00
BertoCQ
356eb4ca8a Merge pull request #1959 from consul/polls-index
Polls index view
2017-10-02 21:42:59 +02:00
BertoCQ
1b4f6d5cae Merge pull request #1938 from consul/imageable-polish
Imageable polish
2017-10-02 21:42:15 +02:00
BertoCQ
01e4447050 Merge pull request #1923 from wairbut-m2c/iagirre-preview-budget-results
Admins can see the preview of the budgets' results before the balloti…
2017-10-02 21:40:04 +02:00