iagirre
f0724ce13a
Changes suggested in the PR made
2018-01-10 13:13:05 +01: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
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
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
Bertocq
c9bc028524
Remove all unnecesary extra spacing and Layout/ExtraSpacing list from rubocop file
2017-06-28 14:12:51 +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
57f476c2fa
Merge branch 'master' into feature/add_population_to_budget_heading
2017-06-27 18:43:24 +02:00
Bertocq
e6dd33bd66
Fix all Layout/SpaceAfterComma issues and remove from rubocop_todo list
2017-06-26 17:57:53 +02:00
Raimond Garcia
6e60f5acde
Merge pull request #1680 from consul/chore/small_rubocop_cleanup
...
Chore/small rubocop cleanup
2017-06-26 17:42:10 +02:00
Raimond Garcia
f41d3637cf
Merge pull request #1678 from consul/feature/1601#budget_winner_investments_button
...
Add button to Calculate Budget Winner investments
2017-06-26 17:41:08 +02:00
Bertocq
8cd7c685dc
Add population to allowed params on admin budget heading controller
2017-06-25 15:47:46 +02:00
Bertocq
154cdac332
Add calculate_winners on Admin Budget controller, route and ability for admins
2017-06-25 15:47:04 +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
taitus
f220952883
Add CRUD Milestone on Admin::BudgetInvestment. Rename Checkpoint to Milestone.
2017-06-24 22:38:48 +02:00
Eduardo Martinez Echevarria
e60ffa3c00
Remove featured attribute management on admin/tags
2017-06-23 17:34:55 +02:00
Eduardo Martinez Echevarria
7fe5fc18b0
Manage only tags of kind 'category' on admin/tags controller
2017-06-23 17:34:55 +02:00
Bertocq
6aecb558cc
Add Budget Investment winners filter on admin list view and controller
2017-06-21 01:32:09 +02:00
Bertocq
73ff68815d
Update admin legislation process controller and form to allow enabling/disabling phase/publications
2017-06-13 23:50:12 +02:00
Bertocq
0c27f1ffde
Rename Legislation Process final_publication_date field to more descriptive result_publication_date
2017-06-13 22:04:36 +02:00
rgarcia
b1fa2d22f7
only count active users in stats
2017-06-13 12:59:04 +02:00
Bertocq
02d31953be
Remove Target field from Legislative Process from views, i18n, factories and specs
2017-06-10 23:16:13 +02:00
Bertocq
d624a08abc
Remove How To Participate field from Legislative Process from views, i18n, factories and specs
2017-06-10 23:11:55 +02:00
Amaia Castro
b616210607
View and search users from admin panel
2017-06-09 17:30:06 +02:00
Amaia Castro
29d994dd4a
Rename users to hidden users in admin
2017-06-09 17:19:01 +02:00
Bertocq
c05744b846
Add summary field to the admin form for Legislative Processes, plus placeholder translations
2017-06-07 18:43:34 +02:00
rgarcia
1a46b4d4cb
fixes conflicts with master
2017-05-31 10:36:38 +02:00
Juanjo Bazán
1ae55a59f6
Merge pull request #1560 from bertocq/feature/admin_administrators_management
...
Administrators management in admin area
2017-05-30 10:44:50 +02:00
Bertocq
fe5ddd019b
Add logic to prevent the current user from removing himself from the administrator list, and a flash error notice for that scenario
2017-05-25 11:29:39 +02:00
