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

8771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BertoCQ
92eac29da7 Merge branch 'master' into budget_map 2018-01-18 00:36:43 +01:00
BertoCQ
01d7b86d42 Merge pull request #2331 from consul/current-budget-polish 
Add current_budget to management controllers
 2018-01-18 00:27:56 +01:00
BertoCQ
35cb1a9973 Merge pull request #2338 from consul/budget-homepage-design 
Budget home page design
 2018-01-18 00:26:05 +01:00
decabeza
0950a98ddd fixes css class name 2018-01-18 00:24:32 +01:00
decabeza
9cfd60afc2 adds styles to budgets homepage 2018-01-18 00:24:32 +01:00
decabeza
7cbb1dd3a7 adds comments to pending content 2018-01-18 00:24:32 +01:00
decabeza
8486c183df improves name on each method 2018-01-18 00:24:32 +01:00
Bertocq
a6b06ca730 Improve Budget's homepage 
* Add budget's phases number status
* Add budget's headings and groups list
* Placeholders for future improvements
 2018-01-17 19:11:58 +01:00
María Checa
4d97d349a1 Added tests for alert 2018-01-17 19:11:48 +01:00
María Checa
4f41dc4d3a Added new translations 2018-01-17 19:11:47 +01:00
María Checa
14b62601f6 Added alerts data 2018-01-17 19:11:47 +01:00
María Checa
4e5c8f4903 Added js file for alert 2018-01-17 19:11:46 +01:00
Vicente Mendoza
c673ca2319 fix tests 2018-01-17 18:36:45 +01:00
Vicente Mendoza
d0df965487 fix some issues about test and variables name 2018-01-17 17:10:19 +01:00
Vicente Mendoza
91e10e1897 new map on budget homepage 2018-01-17 13:15:35 +01:00
Bertocq
7db0d832d9 Fix typo at budgets:phases:generate_missing rake task 2018-01-17 13:02:14 +01:00
rgarcia
952df2947a Duplicate current_budget method in management_base_controller 
This method is already existent in the application_controller but it
seems a little overkill to create a concern just for this method

Maybe when we have multiple method it makes sense to create a nice
controller. Another option would be to make the
management_base_controller extend from the application_controller
 2018-01-17 12:50:17 +01:00
Bertocq
2fb1112066 Replace existing Time.zone.today.to_date for just Date.current 2018-01-17 00:45:30 +01:00
Bertocq
a2b950d8de Fix to_not to not_to on rspec expectations 2018-01-17 00:03:23 +01:00
BertoCQ
367a960c49 Merge pull request #2323 from consul/feature/budget_phases 
Create Budget::Phases backend
 2018-01-16 23:11:15 +01:00
rgarcia
21cdddcbae Order budgets by created_at instead of by id 
This is a preventive change which will be useful once the rake to
migrate from `spending_proposals` to `budget_investments` is complete

As after running that migration, old `spending_proposal` budgets will
have a newer `id` than the existing budgets. And therefore the last
budget will be one of those migrated from the old `spending_proposal`
model

By ordering by `created_at` and probably updating the `created_at`
attribute in the rake that migrates `spending_proposals` to
`budget_investments`, we will have a coherent order for budgets
 2018-01-16 19:44:11 +01:00
rgarcia
eca971a648 Use current_budget instead of Budget.current 2018-01-16 19:34:21 +01:00
Bertocq
8b469c5d98 Fix conflicts with merged branch, Budget::PHASES have moved, and described_class usage is a must 2018-01-16 18:44:21 +01:00
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