kikito
9e4b2fda89
Adds phases to form
2017-01-01 15:03:58 +01:00
kikito
110a4091f8
Adds budget investment location
2016-12-29 17:30:21 +01:00
kikito
34ee8c1c48
Makes Budgets editable, and makes their description editable with html
2016-12-29 16:21:42 +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
kikito
9d97421b0e
Merge branch 'master' into budgets
2016-12-27 14:02:12 +01:00
kikito
84418bd671
Fixes issue in has_orders concern
2016-12-25 22:58:21 +01:00
kikito
e15377b7d8
Load @assigned_heading in addition to loading @heading
2016-12-25 12:54:48 +01:00
kikito
ef0acaf20f
Only creates ballot when budget balloting
2016-12-25 12:54:32 +01:00
kikito
3fd1993f74
only creates ballots when budget balloting
2016-12-25 12:54:07 +01:00
kikito
03ef20bfde
Merges orders_helper functionality inside has_orders concern
...
Both these objects where using/setting a variable called valid_orders.
As a results, some specs where becoming flacky
(features/budgets/investments_spec.rb, balloting phase). By putting
them together, there is no `valid_orders` variable any more (everything
is @valid_orders) and the flackyness is gone.
2016-12-24 14:42:46 +01:00
Juanjo Bazán
d057c9457d
Merge branch 'master' into signature-sheets
2016-12-23 20:23:56 +01:00
kikito
54bd5aeeb1
adds @budget param to apply_filters_and_search
2016-12-22 20:26:21 +01:00
kikito
260b9aa1e4
loads @investment_ids in ballot lines controller
2016-12-22 20:25:41 +01:00
kikito
15fade5660
loads ballot in budget_investments_controller
2016-12-22 20:25:17 +01:00
Alberto Miedes Garcés
d83c370c6a
Remove duplicated code in Admin::BannersController
2016-12-22 17:18:27 +01:00
rgarcia
675081141c
refactors signatures
2016-12-21 18:46:31 +01:00
rgarcia
4eb700e3d4
refactors signature sheets
2016-12-20 16:46:08 +01:00
rgarcia
3c682b8a9b
adds signature sheets
2016-12-20 12:21:05 +01:00
kikito
a73626d712
Refactors and simplifies ballot/lines_controller.rb
2016-12-19 19:11:45 +01:00
kikito
ff13dee918
Fixes incorrect path & params in bi controller
2016-12-16 18:03:36 +01:00
kikito
3bada69dd0
sets up the @investments variable n investments_controller
2016-12-16 18:03:14 +01:00
kikito
a52ea70c3d
Fixes honeypot-related issues in specs
2016-12-16 18:02:43 +01:00
kikito
2a258fc558
Refactors set_investment_votes
2016-12-14 13:42:12 +01:00
kikito
8d60ea1d3c
Refactors apply_filters_and_search to inside investment model
2016-12-14 13:39:54 +01:00
kikito
5b56336941
Fixes valuation features
2016-12-13 15:51:58 +01:00
kikito
2f446cf056
Renames "open" to "current" to avoid issues with existing method called "open"
2016-12-13 12:39:53 +01:00
Alberto Miedes Garcés
c22a80b48f
Move geozone 'safe to destroy' check from controller to model
2016-12-13 12:30:47 +01:00
Alberto Miedes Garcés
60da2a875b
CRUD html_map_coordinates geozone attribute
2016-12-08 16:50:36 +01:00
Alberto Miedes Garcés
6b53020185
Show districts ordered by name
2016-12-08 13:47:23 +01:00
Alberto Miedes Garcés
93e79228a7
Ability to delete geozones from admin dashboard
2016-12-08 13:16:42 +01:00
kikito
869f7b39d6
fixes i18n
2016-12-08 11:49:13 +01:00
Alberto Miedes Garcés
fea2009396
Ability to edit geozones from admin dashboard
2016-12-07 22:08:22 +01:00
Alberto Miedes Garcés
323c1b7593
Fixed layout for Admin::GeozonesController
2016-12-07 19:19:24 +01:00
kikito
748fd8becf
Makes all tests pass in bi management
2016-12-07 19:16:37 +01:00
kikito
b3be1633af
Fixes all management bi issues except filtering by geozone
2016-12-07 16:35:27 +01:00
kikito
e6cbc4acf6
Fixes spec
2016-12-06 18:13:29 +01:00
kikito
e793a0d8e1
Adapts management::budget_investments to new budgets
2016-12-06 18:05:58 +01:00
kikito
0564392964
Introduces management budgets
2016-12-06 18:02:25 +01:00
kikito
882565aeca
Adds more controller variables and uses them in investment controller
2016-12-05 17:35:40 +01:00
Alberto Miedes Garcés
6175990533
Admin geozones: index, create
...
Modified Geozone factory and seeds to be more complete
2016-12-04 21:19:36 +01:00
kikito
003056fe75
Moves bi management controller
2016-12-02 19:16:31 +01:00
kikito
00cfb95913
Starts fixing management budget investments
2016-12-01 16:31:05 +01:00
kikito
2a2179d0f3
Merge branch 'master' into budget
2016-11-28 11:41:49 +01:00
kikito
f0b8cfd4a2
Time.now -> Time.current
2016-11-23 19:19:19 +01:00
rgarcia
bb3c4c6399
adds consistency to ruby code style
...
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
Alberto Garcia Cabeza
910b24936d
Merge branch 'master' into voting-proposals
...
Conflicts:
app/models/proposal.rb
app/views/proposals/_proposal.html.erb
app/views/proposals/index.html.erb
app/views/proposals/show.html.erb
spec/support/common_actions.rb
2016-09-15 13:58:53 +02:00
Alberto Garcia Cabeza
7abd31e4bf
Renames variable, updates text
2016-09-15 13:47:53 +02:00
Alberto Garcia Cabeza
db6f82fa4c
Moves banner to a partial and includes it on debates index
2016-09-14 11:09:36 +02:00
Raimond Garcia
9a2d45f25d
Merge pull request #1219 from consul/budget-management
...
Budget management
2016-09-13 18:45:30 +02:00
