consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,728 Commits 1 Branch 0 Tags
307fe18c5927c4b4788e5b0231b8eadd341aec5e
Commit Graph

8728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alberto García
1b2992ce99 Merge pull request #2297 from consul/budgets-ui 
Budgets UI
 2018-01-11 17:59:55 +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
depfu[bot]
8e67f50449 Update graphql to version 1.7.8 2018-01-11 14:50:30 +00:00
rgarcia
c76b099971 Update Changelog 2018-01-11 14:03:17 +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
rgarcia
55aa5bfdfb Update Changelog 2018-01-11 12:24:07 +01:00
Raimond Garcia
43ba27c9cf Merge pull request #1908 from wairbut-m2c/aperez-split-routes-file 
Split 'routes.rb' file into multiple small files
 2018-01-11 12:20:42 +01:00
Bertocq
2f27a86034 Replace deprecated capybara only_path option for ignore_query 2018-01-11 00:07:56 +01:00
Bertocq
1fee0eb2aa Update unreleased section of changelog 2018-01-10 23:48:13 +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
Bertocq
db051beabc Fix to_not to not_to on spec 2018-01-10 22:43:52 +01:00
decabeza
e819da5556 improve i18n for budgets notices 2018-01-10 22:27:22 +01:00
decabeza
4c272a0e3a fixes specs 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