Commit Graph

410 Commits

Author SHA1 Message Date
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
Juanjo Bazán
4ee50c86c0 adds final recounts info to admins 2017-01-30 20:42:30 +01:00
kikito
d72dc20987 Removes summary from poll questions controller 2017-01-30 18:41:24 +01:00
Juanjo Bazán
05f054ece4 adds final recount/results shift for officers from Admin 2017-01-30 17:44:39 +01:00
Juanjo Bazán
e634e80113 adds system recounting to admin booth_assignments 2017-01-27 15:19:03 +01:00
kikito
2be88cb316 Adds missing validation to poll::question. Fixes specs 2017-01-25 10:46:57 +01:00
kikito
65b0d27995 Moves geozones from questions to polls in admin controllers 2017-01-24 18:06:41 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Amaia Castro
a2a61341fe Merge branch 'master' into legislation-module-stable 2017-01-11 22:54:41 +01:00
Amaia Castro
4a5276f089 Revert change in admin namespace helper and redefine it in the controller 2017-01-11 15:43:46 +01:00
rgarcia
3ba57bbab2 adds valuator tags 2017-01-08 13:24:05 +01:00
Fernando Blat
1fbb10ff34 Include link to resource in the flash message 2017-01-05 17:03:08 +01:00
Fernando Blat
ed714f7c7d Add flash messages. Redirect to edit action after update 2017-01-05 12:56:55 +01:00
Juanjo Bazán
70b86170a2 adds booth_assignment show with officers and recounts info 2017-01-04 21:00:36 +01:00
kikito
9e4b2fda89 Adds phases to form 2017-01-01 15:03:58 +01:00
Amaia Castro
30ec5bdcb5 Build one option for the questions form when creating a new question 2016-12-30 11:22:39 +01:00
kikito
34ee8c1c48 Makes Budgets editable, and makes their description editable with html 2016-12-29 16:21:42 +01:00
Amaia Castro
5b3dcd7886 Force processes order 2016-12-29 09:59:29 +01:00
kikito
d2356c18d0 Adds toggle_selection action 2016-12-28 19:11:59 +01:00
kikito
010aeaa9ac i18n 2016-12-28 17:42:15 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
Juanjo Bazán
40f6ca5886 adds poll shift management to admin 2016-12-27 17:47:15 +01:00
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +01:00
Juanjo Bazán
283a474135 adds order to search results 2016-12-27 12:38:46 +01:00
Juanjo Bazán
ee8c057a46 adds officer search to admin polls 2016-12-27 12:36:16 +01:00
Juanjo Bazán
f0156c5b5a adds admin search/add/remove question to poll 2016-12-26 16:19:35 +01:00
kikito
3fd1993f74 only creates ballots when budget balloting 2016-12-25 12:54:07 +01:00
Juanjo Bazán
d057c9457d Merge branch 'master' into signature-sheets 2016-12-23 20:23:56 +01:00
Juanjo Bazán
8b4f519d71 adds booth assignation to admin poll 2016-12-23 19:06:55 +01:00
Alberto Garcia Cabeza
082c483269 removes unnecessary method on questions controller 2016-12-23 18:31:45 +01:00
Fernando Blat
704dffe7c5 Merge pull request #39 from medialab-prado/28-question-page-comments
Comments in legislation question page
2016-12-23 18:20:27 +01:00
Amaia Castro
33266e41fe Merge branch 'master' into legislation-module-stable 2016-12-23 16:00:55 +01:00
Alberto Garcia Cabeza
c0c76b67c2 adds successful proposals list on admin questions index 2016-12-23 14:16:29 +01:00
Amaia Castro
55eb03531c Comments in legislation question page 2016-12-23 09:35:02 +01:00
kikito
15fade5660 loads ballot in budget_investments_controller 2016-12-22 20:25:17 +01:00