Add budget stats #3438

javierm · 2019-04-15T16:31:52Z

References

Backports commit AyuntamientoMadrid/consul@9e33689b from Polls age permissions AyuntamientoMadrid/consul#570
Backports the relevant parts of Presupuestos participativos AyuntamientoMadrid/consul#838
Backports Budgets stats AyuntamientoMadrid/consul#839
Backports commit AyuntamientoMadrid/consul@d5b7fde1
Backports the relevant parts of Budget results improvements AyuntamientoMadrid/consul#849
Backports the relevant parts of commit AyuntamientoMadrid/consul@1382b475 from Budget results urls AyuntamientoMadrid/consul#850
Backports Duplicated </thead> AyuntamientoMadrid/consul#868
Backports the relevant parts of commits AyuntamientoMadrid/consul@48b2af27 and AyuntamientoMadrid/consul@221a626a and AyuntamientoMadrid/consul@1c1aabd44 from Budget execution list AyuntamientoMadrid/consul#1543
Backports Added physical votes to stats AyuntamientoMadrid/consul#1544
Backports Public budget stats permissions and new stats data AyuntamientoMadrid/consul#1549
Backports commit AyuntamientoMadrid/consul@30d1248 from Fix Travis build AyuntamientoMadrid/consul#1553
Backports commit AyuntamientoMadrid/consul@4d29e49a636 from Budgets polls UI AyuntamientoMadrid/consul#1564
Backports the relevant parts of Keep DB clean after running budget stats spec AyuntamientoMadrid/consul#1597
Backports Order headings by name and group AyuntamientoMadrid/consul#1908

Objectives

Add stats to budgets

Visual Changes

app/views/budgets/stats/show.html.erb

app/models/budget/stats.rb

houndci-bot · 2019-04-15T16:33:55Z

app/models/budget/stats.rb

+          percentage_participants_vote_phase: participants_percent(heading_totals, groups_totals, :total_participants_vote_phase),
+          percentage_district_population_vote_phase: population_percent(population, heading_totals[:total_participants_vote_phase]),
+          percentage_participants_all_phase: participants_percent(heading_totals, groups_totals, :total_participants_all_phase),
+          percentage_district_population_all_phase: population_percent(population, heading_totals[:total_participants_all_phase])


Metrics/LineLength: Line is too long. [129/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-04-15T16:33:57Z

app/models/budget/stats.rb

+          end
+
+          groups[:total][:percentage_participants_support_phase] = groups.collect {|_k, v| v[:percentage_participants_support_phase]}.sum
+          groups[:total][:percentage_participants_vote_phase] = groups.collect {|_k, v| v[:percentage_participants_vote_phase]}.sum


Metrics/LineLength: Line is too long. [131/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-04-15T16:33:58Z

app/models/budget/stats.rb

+            groups[heading.id].merge!(calculate_heading_stats_with_totals(groups[heading.id], groups[:total], heading.population))
+          end
+
+          groups[:total][:percentage_participants_support_phase] = groups.collect {|_k, v| v[:percentage_participants_support_phase]}.sum


Metrics/LineLength: Line is too long. [137/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-04-15T16:33:58Z

app/models/budget/stats.rb

+          groups[:total][:total_participants_all_phase] = groups.collect {|_k, v| v[:total_participants_all_phase]}.sum
+
+          @budget.headings.each do |heading|
+            groups[heading.id].merge!(calculate_heading_stats_with_totals(groups[heading.id], groups[:total], heading.population))


Metrics/LineLength: Line is too long. [130/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-04-15T16:33:58Z

app/models/budget/stats.rb

+          groups[:total] = Hash.new(0)
+          groups[:total][:total_participants_support_phase] = groups.collect {|_k, v| v[:total_participants_support_phase]}.sum
+          groups[:total][:total_participants_vote_phase] = groups.collect {|_k, v| v[:total_participants_vote_phase]}.sum
+          groups[:total][:total_participants_all_phase] = groups.collect {|_k, v| v[:total_participants_all_phase]}.sum


Metrics/LineLength: Line is too long. [119/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-04-15T16:33:58Z

app/models/budget/stats.rb

+
+          groups[:total] = Hash.new(0)
+          groups[:total][:total_participants_support_phase] = groups.collect {|_k, v| v[:total_participants_support_phase]}.sum
+          groups[:total][:total_participants_vote_phase] = groups.collect {|_k, v| v[:total_participants_vote_phase]}.sum


Metrics/LineLength: Line is too long. [121/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

spec/models/budget/stats_spec.rb

spec/features/budgets/stats_spec.rb

houndci-bot · 2019-04-15T17:08:05Z

app/models/budget/stats.rb

+
+          groups[:total] = Hash.new(0)
+          groups[:total][:total_investments_count] = groups.collect {|_k, v| v[:total_investments_count]}.sum
+          groups[:total][:total_participants_support_phase] = groups.collect {|_k, v| v[:total_participants_support_phase]}.sum


Metrics/LineLength: Line is too long. [127/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

app/views/budgets/results/show.html.erb

spec/models/abilities/common_spec.rb

houndci-bot · 2019-04-15T21:09:26Z

app/models/budget/stats.rb

+      end
+
+      def supports(supportable)
+        ActsAsVotable::Vote.where(votable_type: "Budget::Investment", votable_id: supportable.investments.pluck(:id))


Metrics/LineLength: Line is too long. [117/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-04-15T21:09:26Z

app/models/budget/stats.rb

+      end
+
+      def total_participants_with_gender
+        stats_cache("total_participants_with_gender") { participants.where.not(gender: nil).distinct.count }


Metrics/LineLength: Line is too long. [108/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-04-15T21:09:27Z

app/models/budget/stats.rb

+      end
+
+      def balloters
+        stats_cache("balloters") { @budget.ballots.where("ballot_lines_count > ?", 0).pluck(:user_id) }


Metrics/LineLength: Line is too long. [103/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-04-15T21:09:27Z

app/models/budget/stats.rb

+      end
+
+      def female_percentage
+        stats_cache("female_percentage") { total_female_participants / total_participants_with_gender.to_f * 100 }


Metrics/LineLength: Line is too long. [114/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-04-15T21:09:27Z

app/models/budget/stats.rb

+      end
+
+      def male_percentage
+        stats_cache("male_percentage") { total_male_participants / total_participants_with_gender.to_f * 100 }


Metrics/LineLength: Line is too long. [110/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

houndci-bot · 2019-04-15T21:09:27Z

app/models/budget/stats.rb

+      end
+
+      def total_votes
+        stats_cache("total_votes") { @budget.ballots.pluck(:ballot_lines_count).inject(0) { |sum, x| sum + x } }


Metrics/LineLength: Line is too long. [112/100] (https://github.com/bbatsov/ruby-style-guide#80-character-limits)

voodoorai2000

🙌

…nship

…and finished budget

…nish

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.

This tab will show all winner investments projects with milestones

'Results' and 'Execution' tabs are now shown to the user regardless of the budget's current status

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] AyuntamientoMadrid#1875

javierm added the Backport label Apr 15, 2019

houndci-bot reviewed Apr 15, 2019

View reviewed changes

javierm force-pushed the backport-stats branch 4 times, most recently from 047f57b to 0c802f9 Compare April 15, 2019 21:09

houndci-bot reviewed Apr 15, 2019

View reviewed changes

javierm force-pushed the backport-stats branch 12 times, most recently from 6909b72 to b6400f3 Compare April 15, 2019 23:01

javierm changed the title ~~[WIP] Budget stats~~ Budget stats Apr 16, 2019

javierm force-pushed the backport-stats branch 2 times, most recently from 917935a to f0ff973 Compare April 16, 2019 11:53

decabeza approved these changes Apr 16, 2019

View reviewed changes

voodoorai2000 reviewed Apr 17, 2019

View reviewed changes

voodoorai2000 approved these changes Apr 17, 2019

View reviewed changes

kikito and others added 4 commits May 16, 2019 22:00

makes all users old enough to vote by default when created for the specs

71fd365

Add ballot_lines_count counter_cache to ballot -> ballot line relatio…

63631f2

…nship

Add Budgets Stats Controller, route and ability on reviewing ballots …

e0e02b4

…and finished budget

Add Budget Stats class

132397b

bertocq and others added 22 commits May 16, 2019 22:01

Order Budget headings by id when calculating heading stats

cdece48

counts votes instead of ballots

e5ec0bf

more efficient calculation of ballot lines

50c0f5f

Improve budget stats page with a new row showing each column totals

be89289

Improve percent round

4b2a2dd

Order headings by id on budget stats view

07cef9c

Remove the last totals row on Budget stats view

e5a2440

Improve budget stats investments sent text to have a breakline on spa…

4691b48

…nish

Add links between Budget stats and results routes

c5a4a42

Link to results without heading unless its on the results menu

6a46719

removes duplicated thead tag

7b2f77d

Fixes budgets stats ui for all phases

99d0ac5

Added physical votes to stats

3291b32

Simplify spec

70e108d

Add budget stats permissions for normal users and admins

c2457e3

Add web and booth participants in budget stats

fac99cf

Add 'Execution' tab to a finished Budget stats

c2b9042

This tab will show all winner investments projects with milestones

Remove conditional to render tabs on budgets/stats#show

3bbdffc

'Results' and 'Execution' tabs are now shown to the user regardless of the budget's current status

Remove unused budget I18n keys

a889f62

Moves social tags outside cache on budget stats

7b24958

Order headings by name and group

abb6eb1

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] AyuntamientoMadrid#1875

javierm force-pushed the backport-stats branch from f0ff973 to abb6eb1 Compare May 16, 2019 20:02

javierm changed the title ~~Budget stats~~ Add budget stats May 16, 2019

javierm merged commit 525eb90 into master May 16, 2019

javierm deleted the backport-stats branch May 16, 2019 20:46

javierm added the Release notes label May 29, 2019

javierm mentioned this pull request May 29, 2019

Add task to regenerate ballot_lines_count cache #3563

Merged

javierm removed the Release notes label May 29, 2019

javierm mentioned this pull request May 29, 2019

[WIP] Budget Stats generation & display #1712

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add budget stats #3438

Add budget stats #3438

javierm commented Apr 15, 2019 •

edited

Loading

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

houndci-bot Apr 15, 2019

voodoorai2000 left a comment

Add budget stats #3438

Add budget stats #3438

Conversation

javierm commented Apr 15, 2019 • edited Loading

References

Objectives

Visual Changes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

voodoorai2000 left a comment

Choose a reason for hiding this comment

javierm commented Apr 15, 2019 •

edited

Loading