Commit Graph

6005 Commits

Author SHA1 Message Date
Raimond Garcia
e23fbc8d58 Merge pull request #2970 from PierreMesure/Remove-icon-png-from-settings
Removed icon_home and fixed corresponding test
2018-11-27 11:11:51 +01:00
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
Alberto
7a76f3780b Merge pull request #3040 from consul/help-feature
[Backport] Help feature
2018-11-14 13:32:35 +01:00
decabeza
3a718d88c0 Shows help link only if feature is enabled 2018-11-14 12:45:52 +01:00
decabeza
5abeeb8588 Fixes date format on legislation helper 2018-11-14 12:41:22 +01:00
Raimond Garcia
6cfd0c2e13 Merge pull request #3030 from consul/fix-poll-results-accuracy
Fix poll results accuracy
2018-11-13 14:03:49 +01:00
Alberto
56a2978b87 Merge pull request #3033 from consul/budgets-unselected-message
[Backport] Budgets unselected message
2018-11-12 18:22:54 +01:00
decabeza
dfa7148406 Shows unselected message only on balloting or later phase 2018-11-12 17:23:58 +01:00
decabeza
13b3d9cebc Fixes admin menu link when create a new widget 2018-11-12 17:11:17 +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
Juanjo Bazán
4cccb93677 fix poll accuracy results using floats 2018-11-11 14:54:35 +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
3817f59f25 Improves styles to show budgets executions images 2018-11-08 11:57:07 +01:00
decabeza
7dd530dad7 Adds missing for to budget exections status label tag 2018-11-07 18:25:18 +01:00
decabeza
1d5335c782 Display last milestones image
Also adds a second order to ensure the order to display milestones with same publication date is always the same
2018-11-07 18:25:02 +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
voodoorai2000
5856af03a5 Fix exception when no available milestones
We were getting an exception when quering[1] for milestones which were not present, due to for example having a publication date later than today

Adding a `try` statement and spec to avoid this situation

[1] 82efc3dd66/app/controllers/budgets/executions_controller.rb (L16)
2018-11-07 18:08:10 +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
Javi Martín
ab870c756a Use Date.current to find published milestones
Using `Date.today` caused some milestones to be published before/after
the date defined by `Rails.application.config.time_zone`.

See also commit AyuntamientoMadird/consul@088c76d for a more detailed
explanation.
2018-11-06 13:02:35 +01:00
María Checa
126941a335 Change headings reorder method 2018-11-06 13:02:35 +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
997db67104 Refactor how headings are ordered 2018-11-06 13:02:35 +01:00
Marko Lovic
375fbf775f Order non-city headings by alphabetical order 2018-11-06 13:02:35 +01:00
Marko Lovic
4758c1b91a Show city heading in first position on executions list 2018-11-06 13:02:35 +01:00
rgarcia
685927116c Query for all investments, not only winner investment
Spending proposals did not have a winner attribute, instead winners
where calculated dynamically looking at votes

Removing this condition, so that we can see investment for the 2016
participatory budget which used spending proposals
2018-11-06 13:02:35 +01:00