Commit Graph

129 Commits

Author SHA1 Message Date
María Checa
05d40c0ede Merge branch 'master' into polls_minor_changes 2017-10-03 16:22:33 +02:00
María Checa
bf61dffd4b Removed files that are not used 2017-10-03 10:47:48 +02:00
BertoCQ
1b4f6d5cae Merge pull request #1938 from consul/imageable-polish
Imageable polish
2017-10-02 21:42:15 +02:00
María Checa
e464985114 Minor fix
Removed unnecessary markdown
2017-10-02 20:34:38 +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
799e2475da Polls booth assignments fixes
Poll booth preview now renders recounts tab by default instead of the officers one.
2017-10-02 11:08:18 +02:00
María Checa
2c72a054ac Polls admin officer assignments fixes
Removed total results table from officer assignment as now there are only final results.
2017-10-02 11:04:37 +02:00
María Checa
2365ec96fa Polls admin officers tab fixes
Removed actions offered in search results.
2017-10-02 10:41:48 +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
María Checa
fd1d09c8c2 Booths and shifts index pages minor fixes
Showing only actions to assign and edit shifits in shifts index, and option to create a new booth in booths index.
2017-10-02 10:25:11 +02:00
María Checa
14fe771fa5 Fixed wrong officer action path
Before this change, when a user searched for an officer already assigned the ui was blocked because that path wasn't correct.
2017-09-28 17:47:50 +02:00
María Checa
1e0aec37ab Removed link to poll question in the web in admin section 2017-09-28 17:37:31 +02:00
decabeza
876a2b530b fixes lint warnings 2017-09-28 16:03:08 +02:00
BertoCQ
121109f967 Merge branch 'master' into feature/1924#poll_shifts_creation 2017-09-28 13:03:34 +02:00
María Checa
08cdf93ecc Switch date selects for shift tasks 2017-09-28 10:40:48 +02:00
Bertocq
f40a0d09ed Add Shift vote and recount date ranges, filter selected one on controller 2017-09-27 18:08:03 +02:00
decabeza
407c0fc702 fixes styles for filters, orders and subnavs on admin 2017-09-27 17:57:54 +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
77f63a4c44 Add _destroy parameter to nested documents 2017-09-26 13:57:13 +02:00
Bertocq
bf981ca828 Remove Booth Assignment officer totals and add final&system counts 2017-09-25 18:47:44 +02:00
Bertocq
630a3252b7 Fix admin poll officers assignments by officer view 2017-09-19 01:38:02 +02:00
Bertocq
a3bf69e78d Remove final result usage on admin poll officer assignments results 2017-09-19 01:13:04 +02:00
Bertocq
851d397395 Replace FinalResult with TotalResult at admin Poll Recounts page 2017-09-19 00:54:46 +02:00
Bertocq
f27fcc7f99 Replace FinalResult with TotalResult at admin BoothAssignment show 2017-09-19 00:45:13 +02:00
Bertocq
e8d748a881 Add Poll Total recount to officing and admin 2017-09-14 15:33:58 +02:00
BertoCQ
fa8b9a69a3 Merge branch 'master' into polls-persist-officer-data 2017-09-11 00:11:36 +02: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
rgarcia
47564a91a0 persist a shift's officer data 2017-09-08 20:08:45 +02:00
decabeza
3b4e80a34d improves layout and tables for polls shifts 2017-09-08 16:50:53 +02:00
rgarcia
4527236284 adds searching for officers when creating shifts 2017-09-07 22:38:42 +02:00
María Checa
355d68c7f8 Added video URL and document to poll question preview 2017-09-07 17:15:20 +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
decabeza
98961748ad replaces more old back link partial to new back_link_to helper 2017-07-27 00:26:39 +02:00
decabeza
6c5513ab38 replaces back_link partial to back_link_to helper 2017-07-26 18:22:45 +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
decabeza
af7807ce9f Updates custom note class to foundation help-text 2017-06-27 10:29:36 +02: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
Alberto Garcia Cabeza
799bbbe6cb fixes ul close tag on admin polls subnav 2017-02-14 16:40:18 +01:00
Juanjo Bazán
e04cc55eb7 shows add booth link only for not assigned booths 2017-02-14 16:07:34 +01:00
Juanjo Bazán
c359b93fd0 fixes booth search in admin 2017-02-14 16:01:09 +01:00
Juanjo Bazán
2d722f1ad4 redux admin poll subnav 2017-02-14 14:57:49 +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