consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

228 Commits

Author SHA1 Message Date
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
Angel Perez
1cc0816dcd Create 'poll_question_answers' controller and views 2017-10-03 23:23:50 -04:00
María Checa
80c8fa308f Merge branch 'master' into 1954-remove_question_show_and_description 2017-10-03 22:33:08 +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
348e4e54f3 Removed question description 2017-10-03 19:11:54 +02:00
María Checa
bf61dffd4b Removed files that are not used 2017-10-03 10:47:48 +02:00
BertoCQ
3835821871 Merge branch 'master' into iagirre-admin-polls-section 2017-10-02 22:25:09 +02:00
BertoCQ
7f936f440c Merge branch 'master' into polls_minor_changes 2017-10-02 16:44:53 +02:00
Bertocq
b5cf28cb35 Swap Poll White/Null/Total usage for Poll Recount 2017-10-02 15:46:49 +02:00
María Checa
adf18ee756 Polls admin fixes 
Removed search from questions tab and unassign button.
 2017-10-02 10:37:10 +02:00
iagirre
77d0a551cf Migration for adding summary and description to polls created. Both text_areas were added to polls form. 
Imageable class included in polls model and the first aproach for adding images added to form.
 2017-09-28 17:46:30 +02:00
Bertocq
49b4af5e04 Add flash error for shift creation without date, increase spec 2017-09-28 10:53:15 +02:00
Bertocq
f40a0d09ed Add Shift vote and recount date ranges, filter selected one on controller 2017-09-27 18:08:03 +02:00
Bertocq
ce92dcd088 Add Task selection on Poll Shift creation, and on shifts table 2017-09-27 14:05:25 +02:00
Senén Rodero Rodríguez
f6fba64012 Remove uneeded document and image initializations 2017-09-26 13:57:14 +02:00
Senén Rodero Rodríguez
c22637c349 Move method 'recover_documents_from_cache' from documentable controllers to document. 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
ce29185b76 Fix documentable on admin poll questions. Adapt nested documentable shared specs to admin fetaure specs and include at admin poll questions specs. 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
77f63a4c44 Add _destroy parameter to nested documents 2017-09-26 13:57:13 +02:00
BertoCQ
34568567a3 Merge pull request #1885 from consul/chore/remove_final_recounts 
Remove Poll Final Recounts, replace with Total Results
 2017-09-20 23:00:03 +02:00
Bertocq
a3bf69e78d Remove final result usage on admin poll officer assignments results 2017-09-19 01:13:04 +02:00
Bertocq
e4e78c8f16 Rubocop autocorrections 2017-09-14 15:08:35 +02:00
Angel Perez
0b708397df Add base controller for Admin:Poll controller 
Fixes #1848

On branch aperez-fix-for-issue-1848
  Changes to be committed:
    new file:   app/controllers/admin/poll/base_controller.rb
    modified:   app/controllers/admin/poll/booth_assignments_controller.rb
    modified:   app/controllers/admin/poll/booths_controller.rb
    modified:   app/controllers/admin/poll/officer_assignments_controller.rb
    modified:   app/controllers/admin/poll/officers_controller.rb
    modified:   app/controllers/admin/poll/polls_controller.rb
    modified:   app/controllers/admin/poll/questions_controller.rb
    modified:   app/controllers/admin/poll/recounts_controller.rb
    modified:   app/controllers/admin/poll/results_controller.rb
    modified:   app/controllers/admin/poll/shifts_controller.rb
 2017-09-13 12:22:57 -04:00
BertoCQ
1ced54f0e3 Merge pull request #1835 from consul/1677-poll_questions_documents 
Poll questions document and video
 2017-09-11 00:08:31 +02:00
BertoCQ
dd02c83fa3 Merge branch 'master' into poll-shifts-search-officers 2017-09-11 00:07:12 +02:00
rgarcia
45d2fdd201 adds available booths 2017-09-08 21:59:54 +02:00
rgarcia
4527236284 adds searching for officers when creating shifts 2017-09-07 22:38:42 +02:00
María Checa
9f2522c106 Merge branch 'master' into 1677-poll_questions_documents 2017-09-06 18:28:31 +02:00
María Checa
4af44a45a1 Documents upload for questions working 2017-09-06 12:00:46 +02:00
rgarcia
9181610de9 removes obsolete code 2017-08-04 21:27:30 +02:00
rgarcia
456429f08b adds shifts 2017-08-04 21:27:30 +02:00
Bertocq
361e0efe00 Remove Poll Recount model and all usages 2017-07-23 23:29:24 +02:00
Bertocq
d98425f45b Remove daily officer recounts from admin poll recounts list 2017-07-23 23:28:38 +02:00
Bertocq
69f4e1c683 Fix all rubocop Metrics/LineLength issues (140+) 2017-07-10 13:22:49 +02:00
Bertocq
2fa92937d2 Fix all Style/BracesAroundHashParameters rubocop issues and remove them from rubocop_todo list 2017-06-28 14:12:51 +02:00
Bertocq
78efccc197 Fix all Layout/EmptyLinesAroundAccessModifier rubocop issues and remove files from rubocop_todo list 2017-06-25 15:46:46 +02:00
Juanjo Bazán
1b2061f95b fixes date/datetime comparison 2017-02-17 15:27:04 +01:00
Juanjo Bazán
0a2c6c0921 reorders booth_assignments query 2017-02-15 10:46:38 +01:00
Juanjo Bazán
d68be1f6f0 adds automatic recount to admin poll and paginates recounts 2017-02-14 19:44:19 +01:00
Juanjo Bazán
2b68f02b95 paginates booths 2017-02-14 19:09:31 +01:00
Juanjo Bazán
8129131a3c adds pagination to officer assignments 2017-02-14 19:09:19 +01:00
Juanjo Bazán
4beee7bacc improves naming consistency 2017-02-14 16:05:28 +01:00
Juanjo Bazán
c359b93fd0 fixes booth search in admin 2017-02-14 16:01:09 +01:00
Juanjo Bazán
0bd87c7e43 extracts results from admin's poll/show 2017-02-14 14:26:46 +01:00
Juanjo Bazán
bedb9f29e7 extracts recounting from admin's poll/show 2017-02-14 14:07:22 +01:00
Juanjo Bazán
19ec7f93b3 extracts officer_assignments from admin's poll/show 2017-02-14 13:47:33 +01:00
Juanjo Bazán
20e31133a8 extracts booth_assignment from admin's poll/show 2017-02-14 13:00:19 +01:00
Juanjo Bazán
35540cdcf1 adds poll results to admin 
simple page shows results by question, white and null results
 2017-02-06 17:12:54 +01:00
Juanjo Bazán
a05297ea1a adds Recounting tab to Poll's admin show view 2017-01-31 13:40:53 +01:00
Juanjo Bazán
547168be3f adds recounts to poll_officer view in admin zone 
Admin can see recounts and final recounts made by poll_officer next to
their officing shifts
 2017-01-31 12:38:53 +01:00
Raimond Garcia
b0bc97eb37 Merge pull request #1378 from consul/recounting 
Final recounts info to Admin
 2017-01-30 21:54:35 +01:00