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
121109f967
Merge branch 'master' into feature/1924#poll_shifts_creation
2017-09-28 13:03:34 +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
Senén Rodero Rodríguez
5815389cb8
Rename map settings keys
2017-09-27 14:49:07 +02:00
Senén Rodero Rodríguez
6c1d1c2cde
Add map settings to backend. Install leaflet assets to render maps.
2017-09-27 14:46:02 +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
22822aa173
Fix Style/RedundantParentheses rubocop issues
2017-09-25 22:44:58 +02:00
iagirre
f7e96067b0
Actions for budgets' headings added. Edit headings, delete headings if not budget investments associated and add link in order to see budgets investments filtered by the heading.
...
Cambios para hacer commit:
modificado: app/controllers/admin/budget_headings_controller.rb
modificado: app/models/budget/heading.rb
nuevo archivo: app/views/admin/budget_headings/_errors.html.erb
nuevo archivo: app/views/admin/budget_headings/edit.js.erb
nuevo archivo: app/views/admin/budget_headings/update.js.erb
modificado: app/views/admin/budgets/_group.html.erb
nuevo archivo: app/views/admin/budgets/_heading.html.erb
nuevo archivo: app/views/admin/budgets/_heading_form.html.erb
modificado: config/locales/en/activerecord.yml
modificado: config/locales/es/activerecord.yml
modificado: spec/features/admin/budgets_spec.rb
modificado: spec/models/budget/heading_spec.rb
2017-09-25 15:40:17 +02:00
María Checa
02fa3a83b5
Custom tags for Legislation Process available
...
Custom tags for Legislation Processes, editable in the admin section.
2017-09-22 17:16:04 +02:00
María Checa
ac5620c583
Merge branch 'master' into 1856-legislation_processes_proposals_phase
2017-09-21 21:24:56 +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
María Checa
c811fd46f0
Proposals description migration and form
...
- Added to legislation processes a new attribute called `proposals_description`.
- Then created new views to show a form for the `@process` to edit this attribute **from in the proposals section**.
- Completed translations for new views.
2017-09-13 15:48:07 +02:00
María Checa
f521a9023b
Added Proposal model to Legislation
...
This new Legislation::Proposal model inherits from the original Proposal, as it will behave in a very similar way.
2017-09-13 15:43:36 +02:00
María Checa
dc9fe973f4
Added proposals phase attributes to legislation processes form
...
Also added them to the list of accepted params and completed translations.
2017-09-13 12:33:16 +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
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
taitus
9b6b57a24c
Remove all white spaces
2017-09-06 14:12:32 +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
efacd0def3
Make calculate_winners explicitly delayed
...
Why:
* As seen on preproduction and production environments on Madrid's fork. Budget::Result#calculate_winners is very costly when done to all headings for a given budget (as requested on Admin::BudgetsController#calculate_winners) but its not when done individually for only a heading (as requested on Budget::Investment#recalculate_heading_winners)
How:
* Removing `handle_asynchronously :calculate_winners` from bellow Budget::Result#calculate_winners definition, to avoid making any call delayed. And explicitly calling `.delay` only when needed (on Admin::BudgetsController#calculate_winners)
2017-07-10 15:12:14 +02:00
Bertocq
69f4e1c683
Fix all rubocop Metrics/LineLength issues (140+)
2017-07-10 13:22:49 +02:00
Bertocq
e35817f240
Add selected checkbox on admin investment form
2017-07-04 23:48:18 +02:00
Raimond Garcia
e7e5b3c4a3
Merge branch 'master' into 1647-locale_site_customization
2017-07-04 12:11:07 +02:00
Bertocq
afc77f68fb
Add incompatible checkbox on admin investment edit form
2017-07-04 01:34:24 +02:00
María Checa
36d51b380b
Merge branch 'master' into 1647-locale_site_customization
2017-07-02 23:19:40 +02:00
María Checa
720a2af046
Update pages controller and views
...
Added new attribute `locale` to pages index list and form.
2017-07-02 14:49:56 +02:00
Eduardo Martinez Echevarria
dfa9c988ad
Add checkbox to set published in process admin management
2017-06-30 15:08:23 +02:00
Raimond Garcia
22d28d9c79
Merge branch 'master' into issue#1575-tag-administration
2017-06-29 19:09:54 +02:00
