Commit Graph

3708 Commits

Author SHA1 Message Date
Raimond Garcia
1b7a2adf56 Merge pull request #3034 from behraaang/bugfix/pagination-after-select
Fix pagination after selecting/unselecting budget investment
2018-11-27 11:04:41 +01:00
Raimond Garcia
2ef83619c3 Merge pull request #3048 from jaflutz/2930-draft-phase-processes
Adds draft phase functionality in legislation processes
2018-11-27 11:01:27 +01:00
Alberto
1bb50cbe47 Merge pull request #3056 from consul/administrator-id
[Backport] Administrator ID
2018-11-26 15:05:11 +01:00
Alberto
f535a90826 Merge pull request #3055 from consul/admin-poll-officers
[Backport] Admin poll officers
2018-11-26 15:03:55 +01:00
Alberto
1a89e52931 Merge pull request #3054 from consul/globalize-tabs
[Backport] Globalize tabs
2018-11-26 14:58:38 +01:00
decabeza
6d7c5f1b78 Refactors admin administrators spec
This refactoring avoids "Use let instead of an instance variable" rubocop warning
2018-11-22 11:41:59 +01:00
decabeza
ae3a2ed3f3 Adds administrator id on admin administrators index page 2018-11-22 11:41:54 +01:00
decabeza
3670859fa3 Removes unused admin poll officers views, routes and controller 2018-11-22 11:40:11 +01:00
decabeza
8f27398bd1 Fixes globalize tabs when there is a lot of available locales 2018-11-22 11:37:26 +01:00
decabeza
2c06008370 Improves social share message to budget investments 2018-11-22 11:35:09 +01:00
João Lutz
34b58a5208 Adds draft phase functionality in legislation processes 2018-11-19 22:18:50 -02:00
decabeza
46671fe447 Removes unnecessary pages 2018-11-15 11:52:57 +01:00
decabeza
b364e0ec38 Improves pages markup 2018-11-15 11:05:50 +01:00
decabeza
315ed77618 Removes unnecessary condition 2018-11-14 13:56:14 +01:00
decabeza
3a718d88c0 Shows help link only if feature is enabled 2018-11-14 12:45:52 +01:00
decabeza
dfa7148406 Shows unselected message only on balloting or later phase 2018-11-12 17:23:58 +01:00
Alberto
06969e0ec7 Merge pull request #3027 from microweb10/issue-3026
Improve action buttons aspect for small screens
2018-11-12 15:38:13 +01:00
behraaang
3278b35729 partial added, render an investment 2018-11-10 23:08:11 +03:30
Julian Herrero
085a01a493 improve action buttons aspect for small screens 2018-11-08 16:45:50 +01:00
Julian Herrero
3975e5145a improve action buttons aspect for small screens 2018-11-08 16:45:36 +01:00
Julian Herrero
bb81a4dad4 improve action buttons aspect for small screens 2018-11-08 16:45:07 +01:00
Julian Herrero
62a4fe985e improve action buttons aspect for small screens 2018-11-08 16:44:09 +01:00
decabeza
7dd530dad7 Adds missing for to budget exections status label tag 2018-11-07 18:25:18 +01:00
decabeza
ba1a6b4cc8 Display first image available for milestones 2018-11-07 18:09:23 +01:00
decabeza
d698a724ac Moves milestone image to a partial 2018-11-07 18:09:20 +01:00
decabeza
7d55f64aac Adds link to milestones on budgets index page 2018-11-07 18:08:03 +01:00
Alberto
0209957fb4 Merge pull request #3020 from consul/legislation-key-dates
[Backport] Fixes legislation processes key dates active class
2018-11-07 17:42:24 +01:00
Javier Martín
bad750a896 Merge pull request #2864 from consul/backport_1543-budget_execution_list
Budget execution list
2018-11-07 15:44:57 +01:00
decabeza
04ea068f90 Fixes legislation processes key dates active class 2018-11-07 13:14:41 +01:00
decabeza
c049be6dae Improves message when there are no budgets 2018-11-06 18:11:13 +01:00
Javi Martín
9bacf39647 Fix link to create a new budget investment 2018-11-06 13:19:34 +01:00
Angel Perez
810bdae37a Move 'budget_execution_no_image' file to app/assets/images/ folder 2018-11-06 13:02:35 +01:00
María Checa
b6fdf732f2 Add total Investments in the execution list 2018-11-06 13:02:35 +01:00
María Checa
d089cc14a5 Add logic to handle budget investments with an execution process 2018-11-06 13:02:35 +01:00
Marko Lovic
8376efce3f Hide headings with no investments
The page should not show any headings which don't have any
winning investments. The "no content" message should only be
shown when there are no headings with investments to avoid an
otherwise blank page.

__Note:__ in the main @headings query, _both_ #includes and #joins
are needed to:
 1. eager load all necessary data (#includes)
and
 2. to perform an INNER JOIN on milestones to filter out investments
with no milestones (#joins).
2018-11-06 13:02:35 +01:00
Angel Perez
62b99f01bc Show message for headings without winner investments 2018-11-06 13:02:34 +01:00
Angel Perez
99e4e7ef8a Limit milestones to 1 per investment and sort them by publication date 2018-11-06 13:02:34 +01:00
Angel Perez
448ac7a158 Restore filtering investments by milestone status query
This commit makes 3 changes:

1. Extracts a query into a helper for clarity and DRYness

2. Adds a `.where` clause to filter investments based on their
(current) milestone status

3. Fixes a bug where investments would be rendered as many times as
milestones associated to an investment
2018-11-06 13:02:34 +01:00
decabeza
689b25c977 Adds tab-milestones anchor to link and milestone image 2018-11-06 13:02:34 +01:00
decabeza
eb76f644b7 Adds link to heading name on sidebar 2018-11-06 13:02:34 +01:00
decabeza
c7936bacae Adds styles to budgets execution 2018-11-06 13:02:34 +01:00
Angel Perez
2a3ce0b182 Render winner investments under 'Executions' tab 2018-11-06 13:02:34 +01:00
Angel Perez
5de74ea6f1 Load budget headings on budgets/executions#show action 2018-11-06 13:02:34 +01:00
Angel Perez
0a95abc30d Replace budget execution heading route with anchor link 2018-11-06 13:02:34 +01:00
Angel Perez
6559c7212b Add prompt & label for milestones filters under budgets/executions#show 2018-11-06 13:02:34 +01:00
Angel Perez
97809db1b7 Enable filtering of investments by their milestones statuses 2018-11-05 18:04:38 +01:00
Angel Perez
3e6cbc9505 Add basic frontend for budget executions list 2018-11-05 18:04:38 +01:00
Angel Perez
b483ca7f7e Add 'Execution' tab to a finished Budget
This new tab will show all winner investments projects with milestones
2018-11-05 16:33:32 +01:00
Alberto
d1e40adcbc Merge pull request #2994 from consul/social-meta-tags
[Backport] Social meta tags
2018-10-31 15:01:19 +01:00
decabeza
ab70872a7d Adds new social share partial for proposals 2018-10-31 11:42:00 +01:00