Bertocq
313d8d2e11
Adjust date ranges of prev/next phases when enabling/disabling a Budget::Phase, with model specs
2018-01-16 15:20:18 +01:00
Bertocq
601351d160
Validate next/prev phases before saving a Budget::Phase, with model specs
2018-01-16 15:20:17 +01:00
BertoCQ
5ee1cc66fd
Merge pull request #2327 from consul/design-ui
...
Design UI
2018-01-16 14:18:45 +01:00
decabeza
0114286e6c
adds class to improve table on mobile version
2018-01-16 12:37:03 +01:00
Bertocq
d505cda949
Add description sanitization to Budget::Phase with model specs
2018-01-16 12:18:13 +01:00
Bertocq
21b62106e5
Add next/prev enabled phase helper functions to Budget::Phase with model specs
2018-01-16 12:18:13 +01:00
Bertocq
59fb0b562c
Create all Phases after a Budget creation
2018-01-16 12:18:13 +01:00
Bertocq
10f5cc0d3b
Add phases relation at Budget model, as well as current_phase helper method
2018-01-16 12:18:13 +01:00
Bertocq
ca3d759d9f
Refactor Budget publishing prices phases constant to Budget::Phase model
2018-01-16 12:18:13 +01:00
Bertocq
66691b644a
Refactor Budget::PHASES constant to Budget::Phase::PHASE_KINDS
2018-01-16 12:18:13 +01:00
Bertocq
f2228a908b
Refactor budget's phase max description lenght from Budget to Phase model
2018-01-16 12:18:13 +01:00
Bertocq
36e74d0ef2
Add Budget::Phase model, spec and factory
...
Create a new Budget::Phase model that:
* Stablishes a relation with its budget
* Stablishes relation with two other Budget::Phases (previous and next)
* Validates basic dates range, kind and description rules.
* Adds scopes to get the ones enabled as well as each individual phase
Create a factory that generates a basic and valid Budget::Phase
Create a model spec that checks kind, date range and budget validations.
2018-01-16 12:18:13 +01:00
Bertocq
153b46b468
Create description_for_phase helper method at Budget, to make it easier to get non-active-phase description
2018-01-16 12:18:13 +01:00
Bertocq
5016568b8a
Correctly indent private function at budget model
2018-01-16 12:18:13 +01:00
rgarcia
5086314bee
Display only current budget for Valuators
...
Before we could have multiple current budgets, as we now only have one
current_budget, some specs broke.
As there is no need to display multiple budgets to Valuators, only the
current budget is necessary, we can remove arrays and assume that only
a single budget, the current budget, is displayed to Valuators
2018-01-15 22:02:04 +01:00
rgarcia
01ef439053
Display only current budget to Managers printing investments
...
In the specs, some investment were missing a heading_id, thus creating
another unexpected budget
By explicitly setting the heading_id we can control better which
budgets are created in each test
2018-01-15 22:02:04 +01:00
rgarcia
349780922d
Add Budget.open scope
...
Before Budget.current could return multiple budgets, now there can only
be a single current_budget.
Adding the concept of open, which better reflects what the admin sees
in this page: A tab for open budgets and a tab for finished budgets
2018-01-15 22:01:59 +01:00
decabeza
8d469c1004
fixes lint scss warnings
2018-01-15 21:40:56 +01:00
decabeza
efa15b2a71
fixes a11y color contrast on map zoom control
2018-01-15 21:38:58 +01:00
decabeza
8d0563e949
fixes wrap text on investment projects with long titles
2018-01-15 21:33:48 +01:00
decabeza
97bf00817c
fixes js class name
2018-01-15 21:21:44 +01:00
decabeza
39b55e11df
changes text and makes bigger link to delete a marker on a map
2018-01-15 21:21:24 +01:00
BertoCQ
3d5bf04829
Merge pull request #2311 from consul/2299-budget_investments_related_content
...
Budget investments related content
2018-01-15 20:02:34 +01:00
rgarcia
be554a629c
Make current_budget accessible in controller and views
2018-01-15 19:13:45 +01:00
rgarcia
9176de949a
Refactor concept of current budget
...
When there was only one budget this implementation worked fine
Nowadays there can be multiple budgets, and therefore the definition of
the current_budget has changed. It is no longer a budget that has not
finished, but rather, the last budget created that is not in the
initial drafting phase.
Budgets in the drafting phase are not considered the current_budget,
but rather a budget that is still being prepared and that soon will
become the current_budget
2018-01-15 19:13:37 +01:00
Bertocq
7179dbbba0
Remove deprecated on hold budget phase group, no longer used in code
2018-01-14 20:41:24 +01:00
María Checa
a1f840e8fd
Added improvements to related contents
2018-01-12 18:35:15 +01:00
decabeza
ba63a91ce7
removes comments
2018-01-11 17:09:54 +01:00
decabeza
a39f5eb691
adds help text for population field on new heading form
2018-01-11 17:08:39 +01:00
decabeza
ddcd5eb2e0
Merge branch 'budgets-ui' of https://github.com/consul/consul into budgets-ui
2018-01-11 17:07:11 +01:00
decabeza
40d32f3e16
Merge branch 'master' into budgets-ui
2018-01-11 17:05:28 +01:00
María Checa
c56a7b4e16
Added related contents to budget investments
2018-01-11 16:49:07 +01:00
Raimond Garcia
b0bd7792be
Merge pull request #1917 from wairbut-m2c/iagirre-admin-budget-heading-action
...
Actions for budgets' headings added. Edit headings, delete headings i…
2018-01-11 13:47:27 +01:00
BertoCQ
71e045fece
Merge pull request #2296 from consul/feature/2278#budget_price_show_phase
...
New Budget's phase to publish investment prices
2018-01-10 23:46:41 +01:00
Bertocq
3026115382
Remove redundant curly braces around a hash parameter
2018-01-10 22:44:11 +01:00
decabeza
e819da5556
improve i18n for budgets notices
2018-01-10 22:27:22 +01:00
decabeza
46666c4b01
add i18n and fix layout for download current selection
2018-01-10 22:27:21 +01:00
decabeza
f4de83da2d
fixes vertical align on support/price on index list
2018-01-10 22:25:41 +01:00
decabeza
baeef5e1e8
fixes typo
2018-01-10 22:25:41 +01:00
decabeza
8dd41325be
hide budget investment table heading if no results
2018-01-10 22:25:09 +01:00
decabeza
cf2a732e3d
improves messages on header
2018-01-10 22:17:26 +01:00
decabeza
c704d100cc
reorders elements like proposals/show
2018-01-10 22:17:26 +01:00
decabeza
ddcfc73e86
shows supports number on bold
2018-01-10 22:17:26 +01:00
decabeza
04c2c3f884
fixes author actions on sidebar
2018-01-10 22:17:26 +01:00
decabeza
6f922621a9
adds help text for population field on admin budgets groups
2018-01-10 22:17:26 +01:00
decabeza
b8b3ce87f3
fixes label name of group on admin budgets groups
2018-01-10 22:17:25 +01:00
Bertocq
88741b9179
Improve investment links at budget list with target blank
2018-01-10 22:09:06 +01:00
Bertocq
760b7ca4c8
Fix indentations and lines lenght
2018-01-10 14:17:48 +01:00
iagirre
0e11e21b2a
Merged with master and solved conflicts
2018-01-10 13:23:39 +01:00
iagirre
f0724ce13a
Changes suggested in the PR made
2018-01-10 13:13:05 +01:00
