Commit Graph

13369 Commits

Author SHA1 Message Date
decabeza
43dd3d2169 Include mailer header logo on custom images list 2019-05-21 11:22:04 +02:00
decabeza
30cd7ec9b2 Add help text to admin newsletter new 2019-05-17 17:43:58 +02:00
decabeza
035b11c460 Hide select text if budget finished 2019-05-17 17:42:58 +02:00
decabeza
bec550e843 Fix typo on booth unassign spanish translation 2019-05-17 17:41:46 +02:00
decabeza
625c34bac2 Add officer email on admin poll shifts table 2019-05-17 17:41:42 +02:00
decabeza
0c704c2f06 Replace i18n destroy to delete 2019-05-17 17:41:38 +02:00
decabeza
33c06ea0d3 Add help text to admin poll officers search 2019-05-17 17:41:36 +02:00
decabeza
8fda0bfb6c Add help text to slug on admin new site customization pages 2019-05-17 17:41:30 +02:00
Alberto
d845c6e973 Merge pull request #3476 from consul/delete-poll
Allow delete polls with associated questions and answers
2019-05-17 17:38:20 +02:00
Alberto
b3ec2b42d1 Merge pull request #3506 from consul/officers-redirect
Remove redirect for poll officers
2019-05-17 17:27:01 +02:00
Alberto
7c79965547 Merge pull request #3397 from consul/proposals-form
Remove question and external_url fields from proposals and legislation proposals
2019-05-17 17:08:56 +02:00
decabeza
4f1e70ea95 Remove redirect to poll officers 2019-05-17 16:30:33 +02:00
Javier Martín
525eb9034c Merge pull request #3438 from consul/backport-stats
Add budget stats
2019-05-16 22:46:38 +02:00
voodoorai2000
abb6eb18b0 Order headings by name and group
Note that we are relying on the existing `sort_by_name`[1] method in the `Budget::Heading` class.

This method sorts by DESC group name first and then ASC heading name.

[1] https://github.com/AyuntamientoMadrid/consul/pull/1875
2019-05-16 22:01:42 +02:00
decabeza
7b2495845d Moves social tags outside cache on budget stats 2019-05-16 22:01:42 +02:00
Angel Perez
a889f62f68 Remove unused budget I18n keys 2019-05-16 22:01:42 +02:00
Angel Perez
3bbdffceaf Remove conditional to render tabs on budgets/stats#show
'Results' and 'Execution' tabs are now shown to the user regardless
of the budget's current status
2019-05-16 22:01:42 +02:00
Angel Perez
c2b9042ad7 Add 'Execution' tab to a finished Budget stats
This tab will show all winner investments projects with milestones
2019-05-16 22:01:42 +02:00
María Checa
fac99cfb10 Add web and booth participants in budget stats 2019-05-16 22:01:42 +02:00
María Checa
c2457e36a5 Add budget stats permissions for normal users and admins 2019-05-16 22:01:42 +02:00
Marko Lovic
70e108d593 Simplify spec 2019-05-16 22:01:42 +02:00
Marko Lovic
0c5f801c19 Keep DB clean after running budget stats spec
This spec was leaving the DB "dirty" because it was creating
records in a before(:all) hook. These records are not cleaned up
automatically when using the :transaction strategy for DatabaseCleaner.

Using before(:each), however, causes another problem. Some of the code
depends on the heading id being 1 (see app/models/budget/ballot/line.rb#L48).
Because of SQL auto-increment, this is only the case the first time the hook
is run, as different id's are assigned on subsequent runs. This is fixed
by forcing the id to always be 1.
2019-05-16 22:01:42 +02:00
María Checa
3291b3274a Added physical votes to stats 2019-05-16 22:01:42 +02:00
decabeza
99d0ac52c0 Fixes budgets stats ui for all phases 2019-05-16 22:01:42 +02:00
decabeza
7b2f77dfbd removes duplicated thead tag 2019-05-16 22:01:42 +02:00
Bertocq
6a46719ff8 Link to results without heading unless its on the results menu 2019-05-16 22:01:42 +02:00
Bertocq
c5a4a427c4 Add links between Budget stats and results routes 2019-05-16 22:01:42 +02:00
Bertocq
4691b486b0 Improve budget stats investments sent text to have a breakline on spanish 2019-05-16 22:01:42 +02:00
Bertocq
e5a2440e91 Remove the last totals row on Budget stats view 2019-05-16 22:01:42 +02:00
Bertocq
07cef9cd78 Order headings by id on budget stats view 2019-05-16 22:01:42 +02:00
Bertocq
4b2a2dd995 Improve percent round 2019-05-16 22:01:42 +02:00
Bertocq
be89289b09 Improve budget stats page with a new row showing each column totals 2019-05-16 22:01:42 +02:00
rgarcia
50c0f5f287 more efficient calculation of ballot lines 2019-05-16 22:01:42 +02:00
rgarcia
e5ec0bf6bb counts votes instead of ballots 2019-05-16 22:01:42 +02:00
Bertocq
cdece48898 Order Budget headings by id when calculating heading stats 2019-05-16 22:01:42 +02:00
decabeza
9f6f7496c1 changes text classes on gender stats 2019-05-16 22:01:42 +02:00
Bertocq
427781a253 Reorder gender statistics to match gender image 2019-05-16 22:01:42 +02:00
Bertocq
1f3bc2c8d9 Switch from feasible to selected investments on budget stats 2019-05-16 22:01:42 +02:00
rgarcia
f9e45dc2e2 displays selected instead of feasible investments 2019-05-16 22:01:42 +02:00
rgarcia
ef958aae59 adds version to cache 2019-05-16 22:01:42 +02:00
decabeza
75dfa4c663 fixes typo 2019-05-16 22:01:42 +02:00
decabeza
eb57b5c375 adds multiplier on progress meter stats age table 2019-05-16 22:01:42 +02:00
rgarcia
51ab4a430e Load budget in stats controller 2019-05-16 22:01:42 +02:00
Bertocq
6c214c266f Correct budget stats age group id's and labels 2019-05-16 22:01:42 +02:00
decabeza
88ac17cc1b removes progress meter multiplier 2019-05-16 22:01:42 +02:00
decabeza
895c8292ab updates page title 2019-05-16 22:01:42 +02:00
decabeza
1c0c55c0fb improves texts and styles for budgets stats 2019-05-16 22:01:42 +02:00
Bertocq
fd4ea312c3 Fix budget stats translations with line breaks 2019-05-16 22:01:42 +02:00
Bertocq
6899ba9a9f Complete Budget Stats view with translations 2019-05-16 22:01:42 +02:00
decabeza
0993aaf5d1 changes budgets stats html 2019-05-16 22:01:42 +02:00