Commit Graph

8448 Commits

Author SHA1 Message Date
BertoCQ
d44db9cec4 Merge branch 'master' into feature/budget_phases 2018-01-16 17:47:47 +01:00
Raimond Garcia
a215c9c603 Merge pull request #2322 from consul/current_budget
Change concept of current budget to account for multiple budgets
2018-01-16 16:53:10 +01:00
Bertocq
005d08e718 Update changelog add and deprecated sections for unreleased block 2018-01-16 15:28:28 +01:00
Bertocq
02d596c872 Add a rake task to generate missing Budget::Phase's and migrate descricptions 2018-01-16 15:20:52 +01:00
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
86cc494cd7 Update letter opener, grpahql and sitemap gnerator gems 2018-01-16 14:48:38 +01:00
Bertocq
029178651f Update unreleased section of changelog 2018-01-16 14:22:22 +01:00
Bertocq
7d222db84b Fix budget investment location label title 2018-01-16 14:21:36 +01:00
BertoCQ
5ee1cc66fd Merge pull request #2327 from consul/design-ui
Design UI
2018-01-16 14:18:45 +01:00
Bertocq
32e746ddb3 Add maps config variables to secrets example file 2018-01-16 12:46:15 +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
82d67258e8 Create Budget Phase table at database 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
BertoCQ
6258bbef13 Merge pull request #2314 from consul/depfu/update/letter_opener_web-1.3.2
Update letter_opener_web: 1.3.1 → 1.3.2 (patch)
2018-01-16 11:25:49 +01:00
BertoCQ
06cf7a362b Merge pull request #2312 from consul/depfu/update/sitemap_generator-6.0.1
Update sitemap_generator: 6.0.0 → 6.0.1 (patch)
2018-01-16 01:02:32 +01:00
depfu[bot]
682cd0f250 Update letter_opener_web to version 1.3.2 2018-01-16 01:02:03 +01:00
BertoCQ
5abbc3704f Merge pull request #2307 from consul/depfu/update/graphql-1.7.8
Update graphql: 1.7.7 → 1.7.8 (patch)
2018-01-16 01:01:39 +01:00
Bertocq
45d5f597a9 Update unreleased section of changelog 2018-01-16 01:00:44 +01:00
rgarcia
34e0c23bb3 Fix valuators authorization spec
This spec used to pass, because even though there were no budgets, as
Budget.current returned an array, it gracefully handled situations
without budgets

Now we assume that there can only be a single current budget, and so
calling any method of budget will raise an exception unless there is a
current budget present

Valuators should not access this page when there is no budget present,
however it might be wise to create an issue to cover this case, just in
case
2018-01-15 22:02:05 +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
9f93f11e90 changes organization name on budget investment show 2018-01-15 21:30:42 +01:00
decabeza
2763f65c7d updates texts on new budget investment form 2018-01-15 21:24:06 +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
61f52b3483 Merge pull request #2293 from wairbut-m2c/aperez-fix-deprecation-warnings
Fix for test suite deprecations warnings
2018-01-15 18:23:42 +01:00
BertoCQ
77e10ac297 Merge pull request #2315 from consul/remove/on_hold
Remove deprecated on hold from Budget phase context
2018-01-15 10:55:40 +01:00
Bertocq
7179dbbba0 Remove deprecated on hold budget phase group, no longer used in code 2018-01-14 20:41:24 +01:00
depfu[bot]
63a7ad3164 Update sitemap_generator to version 6.0.1 2018-01-13 01:50:35 +00:00
rgarcia
7ccb506d64 Update Changelog 2018-01-12 20:10:18 +01:00
María Checa
fa3c0d0143 Added new translations 2018-01-12 18:35:21 +01:00
María Checa
a1f840e8fd Added improvements to related contents 2018-01-12 18:35:15 +01:00
María Checa
b2054ac531 Improved relationable tests for budget investments 2018-01-12 18:26:37 +01:00