consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,370 Commits 1 Branch 0 Tags
59fb0b562c2a436d9dfd914af2f8e9d74feec643
Commit Graph

5079 Commits

Author SHA1 Message Date
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
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
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
María Checa
bc363289ad Added translations to link text 2018-01-10 12:19:48 +01:00
María Checa
a06abf7650 Removed unnecessary code 2018-01-10 11:57:23 +01:00
María Checa
eda673a85d Restored missing code 2018-01-10 11:57:13 +01:00
decabeza
27c4abf552 improve i18n for budgets notices 2018-01-10 11:37:05 +01:00
Bertocq
334091710c Refactor price & explanation showing logic at Investment model 2018-01-10 11:26:16 +01:00
Bertocq
21d6ce57c5 Add published_prices? helper method and phases constant at Budget model 2018-01-10 01:15:07 +01:00
Bertocq
f3a7de55ea Rename should_show_price_info? to should_show_price_explanation? at Budget::Investment & usage 2018-01-10 01:13:34 +01:00
Bertocq
922318b978 Add publishing prices phase to budget model, plus translation texts 2018-01-10 01:10:57 +01:00
Bertocq
d8ceff1a53 Refactor Budget's on hold phases to constant, plus alignments 2018-01-10 01:09:13 +01:00
decabeza
13ea6bdd6b add i18n and fix layout for download current selection 2018-01-09 19:39:51 +01:00
decabeza
65d682901b fixes vertical align on support/price on index list 2018-01-09 19:32:40 +01:00
decabeza
952869b5b6 fixes typo 2018-01-09 19:32:40 +01:00
decabeza
271c6869cd hide budget investment table heading if no results 2018-01-09 19:32:40 +01:00
decabeza
3c8ec4169f improves messages on header 2018-01-09 19:29:36 +01:00
decabeza
5fb49c7adf reorders elements like proposals/show 2018-01-09 19:29:36 +01:00
decabeza
c44a1c57af shows supports number on bold 2018-01-09 19:29:36 +01:00