consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,202 Commits 1 Branch 0 Tags
0affaaee7e194d901b0ebc1bbb032444e12ec01e
Commit Graph

1770 Commits

Author SHA1 Message Date
Anna Anks Nowak
35cebe0eef Use symbols in sorting and set direction properly 2019-01-10 15:35:54 +01:00
Anna Anks Nowak
12484ed4fd Change SORTING_OPTIONS to has 2019-01-10 15:35:54 +01:00
Anna Anks Nowak
9786b0bf7d Rewrite sorting to support direction param [#2931] 2019-01-10 15:34:33 +01:00
Javier Martín
90a66239a5 Merge pull request #3151 from consul/backport-fix_admin_investments_default_order 
Add default order for admin budget investments list
 2019-01-09 15:46:52 +01:00
María Checa
650fe2553e Add default order for admin budget investments list 
When there's no sorting option selected, by default it orders the investment list by supports and, for those with the same number of supports, by ID.
 2019-01-02 12:52:28 +01:00
decabeza
dd8e2d6311 Shows participation phases only if there is a phase enabled 2018-12-28 18:23:08 +01:00
Raimond Garcia
a8de5306c8 Merge pull request #3091 from dpgigorro/2791-homepage-for-legislation-process 
add homepage for legislation processes
 2018-12-19 11:14:24 +01:00
Javier Martín
4782ca37d6 Merge pull request #3111 from consul/backport-customize_toda_la_ciudad 
Remove custom "toda la ciudad" code
 2018-12-18 13:03:51 +01:00
Julian Nicolas Herrero
2175339609 Merge pull request #3106 from consul/2918-crud_budget_groups_headings 
Change CRUD for budget groups and headings
 2018-12-18 10:23:24 +01:00
dperez
bef404c443 add homepage for legislation processes 2018-12-15 18:04:24 +01:00
Javi Martín
e6a609e6e5 Extract method to filter investments by status 2018-12-14 18:15:51 +01:00
Javi Martín
b4b0b18a2d Extract method to get investment milestone status 2018-12-14 18:15:51 +01:00
Julian Herrero
25e1afea48 fix map rendering for budget headings 2018-12-14 15:37:22 +01:00
Alberto
b701a86c1b Merge pull request #3105 from consul/draft-processes 
[Backport] Draft phase on legislation processes
 2018-12-13 15:53:11 +01:00
Julian Nicolas Herrero
1be64a5dc3 Merge pull request #3098 from consul/backport-1742-new_most_active_algorithm 
[Backport] New algorithm for filter 'most active'
 2018-12-13 12:46:18 +01:00
Javier Martín
33ea9219ae Merge pull request #3101 from consul/backport-fix_milestone_validation 
Fix milestone validation
 2018-12-13 12:05:31 +01:00
Julian Herrero
ef835bef1c new algorithm for filter 'most active' 2018-12-13 11:42:22 +01:00
decabeza
534ef9c492 Hides process on index if draft dates match with date current 2018-12-12 18:23:17 +01:00
decabeza
df221b43a0 Fixes hound warnings on legislation processes 2018-12-12 18:23:11 +01:00
Javier Martín
8bcf713d10 Merge pull request #3100 from consul/backport-2743-add_milestones_to_legislation_processes 
Add milestones to legislation processes
 2018-12-12 15:12:36 +01:00
Javi Martín
dca95d608f Display description validation error in milestones 
We had a validation rule for milestones which made sure either the
status or the description was present. However, since the description is
now translatable, the validation error wasn't being displayed in the
admin form.

Moving the validation rule to the translation object fixes the problem.
However, the translation object needs to check an attribute in the
milestone object in order to know whether the description is required or
not. This is tricky because by default it loads the milestone object
from the database, meaning it doesn't work with new records and it
ignores params sent by the browser.

The solution is to manually assign the globalized model before
validating the object. It's a hack, but apparently Rails doesn't provide
a better way to handle this case [1].

[1] https://github.com/rails/rails/issues/32024
 2018-12-11 20:25:38 +01:00
Javi Martín
a42f5fab37 Add milestones summary to legislation processes 2018-12-11 20:19:48 +01:00
Javi Martín
b95ca9df8a Add milestones to legislation process view 2018-12-11 20:18:53 +01:00
Javi Martín
03dc43a500 Manage legislation process milestones 2018-12-11 20:18:53 +01:00
Javi Martín
7891efee32 Add milestones to proposals 2018-12-11 20:09:30 +01:00
Javi Martín
6f342baf7d Move milestones scope to milestoneable concern 2018-12-11 19:22:55 +01:00
Julian Nicolas Herrero
6aa54d6c62 Merge branch 'master' into content_blocks_for_headings 2018-12-11 16:40:25 +01:00
Julian Nicolas Herrero
9aab3ddd7b Merge pull request #3038 from MatheusMiranda/add_map_to_heading_page 
Add map to sidebar on Heading's page
 2018-12-11 16:32:35 +01:00
Javier Martín
bd363466a8 Merge pull request #3089 from consul/backport-polls-show 
Polls voted by
 2018-12-10 20:19:26 +01:00
Julian Nicolas Herrero
6ee8b328ef Merge pull request #3067 from microweb10/issue-3051 
Fix failing spec: Budget::Investment Reclassification store_reclassified_votes stores the votes for a reclassified investment
 2018-12-05 17:21:38 +01:00
rgarcia
b601f6c33f adds method voted_by?(user) to polls 2018-12-05 14:31:58 +01:00
Julian Herrero
0fc1e0503e store reclassified votes in order 
Make sure we create Budget::ReclassifiedVotes for an investment in the
same order that the previous Budget::Ballot:Lines were previously created.
 2018-12-05 13:13:49 +01:00
Javier Martín
4f9ca04a84 Merge pull request #3057 from consul/backport-make-milestones-polymorphic 
[Backport] Make milestones polymorphic
 2018-12-05 12:12:04 +01:00
Julian Nicolas Herrero
ec152a9d4f Merge pull request #3061 from microweb10/issue-3060 
Fix failing spec: Poll::Shift officer_assignments creates and destroy corresponding officer_assignments
 2018-12-02 19:22:07 +01:00
Marko Lovic
c0f6fa182f Make Milestones general, and not specific to Budget Investments 
Generalize the Budget::Investment::Milestone model to a
polymorphic Milestone model so it can be used for entities
other than Budget::Investment.
 2018-11-30 14:15:21 +01:00
Marko Lovic
81f516efd7 Change BudgetInvestmentStatus to Milestone::Status 
Generalize the BudgetInvestmentStatus model to Milestone::Status so it
is not specific to budget investments, but can be used for any entity
which has milestones. This is in preparation to make the Milestone
model polymorphic and usable by entities other than budget investments.
 2018-11-30 14:15:21 +01:00
Milber Champutiz Burbano
9f455b9165 Added feature to add content block to headings in sidebar -- rebase 2018-11-27 09:37:35 -05:00
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
ed9e501ae7 Merge branch 'master' into add_map_to_heading_page 2018-11-27 11:07:16 +01:00
Julian Herrero
c563f73189 create officer assignments in order 
Make sure we create the Poll::OfficerAssignments in the same order the
booth_assignments where previously created. So the spec "Poll::Shift
officer_assignments creates and destroy corresponding
officer_assignments does" not fail.
 2018-11-23 18:15:47 +01:00
João Lutz
34b58a5208 Adds draft phase functionality in legislation processes 2018-11-19 22:18:50 -02:00
Matheus Miranda
06f07b1139 Add map to sidebar on Heading's page 
Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com>
 2018-11-16 09:05:23 +01:00
Juanjo Bazán
4cccb93677 fix poll accuracy results using floats 2018-11-11 14:54:35 +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
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
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
Angel Perez
3574bf867c Add default image for investments without picture 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
decabeza
884580206a Fixes houndci-bot warnings 2018-10-31 14:22:10 +01:00