consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,128 Commits 1 Branch 0 Tags
93450dee57986086f96f2c701b570e38e00a55cf
Commit Graph

96 Commits

Author SHA1 Message Date
decabeza
a72eb380a2 Unifies styles and views for admin budgets 2018-07-31 12:52:21 +02:00
María Checa
15a07ad4eb Adds logic to show 'see results' button only for finished budgets 2018-07-26 14:31:42 +02:00
Alberto
d17b628426 Merge branch 'master' into backport-2588-fix_supports_filter 2018-07-26 13:44:20 +02:00
Alberto
7b8003dcb9 Merge pull request #2790 from wairbut-m2c/backport-1421-investments_csv_fixes 
Add visible_to_valuators and author_username to admin investments CSV
 2018-07-25 18:41:29 +02:00
Marko Lovic
c991d9e7c7 Fix typo in i18n key 2018-07-25 17:28:14 +02:00
María Checa
e9d73eb687 Fix max_per_heading filter in Admin budget investments list 
Also changed the name of the param to `min_total_supports`, which is more descriptive on what it actually does.

Backport of 75f20d5 and 07f0806 from AyuntamientoMadrid/consul fork
 2018-07-25 15:44:51 +02:00
Marko Lovic
5413c34458 Restructure and rename translations 
Based on 012e4be by María Checa from AyuntamientoMadrid/consul fork
 2018-07-25 15:10:09 +02:00
Raúl Fuentes
df899cde6e Fixed html, now it reflects the current search also added serach by name or id to the Budget::Invesment search function 2018-07-04 11:55:13 +02:00
Raúl Fuentes
c9f31b8e1e Refactor Admin::Budget::Investment search form to use one form tag 2018-07-04 11:55:13 +02:00
María Checa
a5d0c2f6c8 Changed Budget::Investment::Milestone views 2018-06-27 18:23:34 +02:00
decabeza
85efdfbf47 Restores removed columns 2018-06-08 19:00:21 +02:00
rgarcia
3e330193d4 Fix select investment specs 
The select button seems to be outside the window. Removing some columns
to make the select button visible by capybara

This is just a temporary fix, we have to find a better solution.
Playing with the css to find an appropriate length for the table
containing this select button, is probably the way to go
 2018-06-08 18:59:57 +02:00
decabeza
0858b3103a Shows always show to valuators on investments table 2018-06-08 18:48:58 +02:00
decabeza
1fb3c16efe Adds see results button on budget investment admin 2018-06-06 17:41:30 +02:00
iagirre
2821985552 Change 'Calculate Winners button' to budget_investments index. 
Move the button so that it appears in the Winners tab of the
budget_investments index.

When the budget is in "Balloting projects", "Reviewing Ballots"
or "Finished budget" phases, the button will appear as a button
(clickable). If there are no winners calculated yet, the text
will be "Calculate winner investments"; if there are, the text
will be "Recalculate winner investments".

If the budget is in another phase, the button will be
disabled and a message will appear: 'The budget has to stay on
phase "Balloting projects", "Reviewing Ballots" or
"Finished budget" in order to calculate winners projects'
 2018-05-28 15:12:28 +02:00
Alberto
1e8f4c7f32 Merge pull request #2342 from wairbut-m2c/iagirre-budgets-column-show-valuators 
Budget: add column show to valuators
 2018-04-30 17:49:15 +02:00
decabeza
1f82599380 Adds class on back link to admin budget investments show 2018-04-27 18:24:17 +02:00
Bertocq
1dc8d29f2d Add Valuator Groups list to investment csv & table 
We've added the list of valuator groups assigned to each investment at
 both admin investment list and investment csv exported file
 2018-04-11 21:12:46 +02:00
Bertocq
b364fc475e Move assigned_valuators from helper to model 
There's no good reason to call assigned_valuators(investment) when the
logic can be at the model.

Also removed the valuator_groups texts to be added in an independent
method
 2018-04-11 21:07:01 +02:00
iagirre
e2a91c6cc8 Modified the investments partial to fit the new budget_investments UI: valuating filter name has changed to under_valuation. 
Modified the specs to fit the new UI for budget_investments
 2018-04-09 15:02:35 +02:00
iagirre
b8cc10d218 Fix conflics after rebase 2018-04-09 15:02:35 +02:00
rgarcia
00c965b715 Clean up 2018-04-04 13:19:01 +02:00
rgarcia
1152f95965 Display valuator group assignments 2018-04-03 20:56:31 +02:00
rgarcia
7e839e7815 Filter by valuator group 2018-04-03 20:56:31 +02:00
decabeza
13d0b08cb4 Adds styles and missing i18n for valuator groups 👨🏻‍🎨 2018-04-03 20:56:31 +02:00
rgarcia
ab498d6d93 Assign groups to investments 2018-04-03 20:55:44 +02:00
decabeza
acebb07ddd Adds link to image and docs on admin budget investment info 2018-03-14 15:14:47 +01:00
Bertocq
b3b28e21d0 Fix translation indentation on investments partial 2018-02-10 20:44:02 +01:00
Bertocq
189fa5ba50 Fixes advanced filters link position 2018-02-10 16:42:54 +01:00
Bertocq
770086779e Use new milestone order_by_publication_date order scope 2018-02-03 19:15:59 +01:00
Bertocq
b926740a32 Show valuation comments at admin investment show page 2018-01-31 16:35:45 +01:00
Bertocq
a15e372f7e Rename written_by_authors partial to dossier 
Its more descriptive in the contexts where its rendered
 2018-01-31 16:30:39 +01:00
Angel Perez
47c9b343ee Admins can search investments by title or ID (#2401) 2018-01-31 09:52:55 -04:00
Angel Perez
1f50e284a9 'Current applied filters' message handles multiple filters in use 2018-01-31 07:21:51 -04:00
Angel Perez
a5159672d4 Investments are now aggregated when using more than 1 advanced filter 2018-01-31 07:21:51 -04:00
Angel Perez
2cee29d883 Fix: Admin investments table not showing up properly 2018-01-29 18:34:15 -04:00
Raimond Garcia
b5cb5e2563 Merge pull request #2387 from wairbut-m2c/show_only_current_budget_tags_in_admin_budget 
Show only current budget tags in admin budget
 2018-01-29 20:14:10 +01:00
Vicente Mendoza
ff5112f96b Changed the budgets helper so just search for the current budget 2018-01-26 11:30:02 +01:00
Angel Perez
716fd6a46e Persist sorting when filtering/selecting investments 2018-01-25 08:18:04 -04:00
Angel Perez
e04dc5b8f2 Add sorting options for Admin::BudgetInvestments (#2336) 2018-01-25 08:18:04 -04:00
Angel Perez
d30d2b0dd8 Arrange Admin::BudgetInvestments I18n for buttons under same namespace 2018-01-25 08:18:04 -04:00
Angel Perez
680ca46ef1 Add search form for Admin::BudgetInvestments (#2336) 2018-01-25 08:16:32 -04:00
decabeza
acfd49e5bd improves styles for budget investments advanced filters 2018-01-25 11:14:06 +01:00
Angel Perez
3f6a9187ec Add 'current applied filters' message to investments partial 2018-01-22 14:04:57 -04:00
Angel Perez
3826f040c2 Add missing 'tbody' HTML tag to investments partial 2018-01-22 14:02:29 -04:00
Angel Perez
e5c73d8f02 Add advanced filters for Admin::Budget::Investment 2018-01-22 14:02:29 -04:00
decabeza
0114286e6c adds class to improve table on mobile version 2018-01-16 12:37:03 +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
decabeza
46666c4b01 add i18n and fix layout for download current selection 2018-01-10 22:27:21 +01:00