Add historic fields to participatory budget #3514

Germangalia · 2019-05-20T16:20:25Z

References

Objectives

To be able to have diferent settings in diferent budgets.

Administrators will be able to set which administrators, valuators and trackers will be able to be assigned to budget investments.

Valuation and milestone default tags can also be added.

The help link could also be edited.

Visual Changes

Edit budget:

Select administrators:

Select trackers:

There are no trackers in the system:

Valuators tags:

Notes

Migrations are needed to add assignments tables, between users and budgets, and add new fields to budgets.

houndci-bot · 2019-05-20T16:20:48Z

spec/features/tracking/budgets_spec.rb

+feature "Tracking budgets" do
+
+  background do
+    @tracker = create(:tracker, user: create(:user, username: "Rachel", email: "rachel@trackers.org"))


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

houndci-bot · 2019-05-20T16:20:49Z

spec/features/tracking/budget_investments_spec.rb

+    end
+
+    scenario "edit" do
+      primary_progress_bar = create(:progress_bar, progressable: investment)


Lint/UselessAssignment: Useless assignment to variable - primary_progress_bar. (https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars)

houndci-bot · 2019-05-20T16:20:49Z

spec/features/tracking/budget_investments_spec.rb

+    end
+
+    scenario "delete" do
+      primary_progress_bar = create(:progress_bar, progressable: investment)


Lint/UselessAssignment: Useless assignment to variable - primary_progress_bar. (https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars)

houndci-bot · 2019-05-20T16:20:49Z

spec/features/tracking/budget_investments_spec.rb

+      investment2 = create(:budget_investment,
+                           budget: budget, title: "investment 2",
+                           heading: create(:budget_heading, name: "last_heading"))
+      investment3 = create(:budget_investment,


Lint/UselessAssignment: Useless assignment to variable - investment3. Did you mean investment1? (https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars)

houndci-bot · 2019-05-20T16:20:50Z

app/views/admin/budgets/_form.html.erb

@@ -2,6 +2,9 @@

 <%= translatable_form_for [:admin, @budget] do |f| %>

+


Extra blank line detected.

houndci-bot · 2019-05-20T16:20:52Z

app/models/budget.rb

+  has_many :budget_valuators
+  has_many :valuators, through: :budget_valuators
+  # has_many :administrators, -> { where rol: "Administrator" }, through: :budget_rol_assignments, source: :user
+  # has_many :valuators, -> { where rol: "Valuators" }, through: :budget_rol_assignments, source: :user


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

houndci-bot · 2019-05-20T16:20:53Z

app/models/budget.rb

+  has_many :administrators, through: :budget_administrators
+  has_many :budget_valuators
+  has_many :valuators, through: :budget_valuators
+  # has_many :administrators, -> { where rol: "Administrator" }, through: :budget_rol_assignments, source: :user


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

houndci-bot · 2019-05-20T16:20:53Z

app/models/abilities/tracker.rb

+    include CanCan::Ability
+
+    def initialize(user)
+      tracker = user.tracker


Lint/UselessAssignment: Useless assignment to variable - tracker. (https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars)

houndci-bot · 2019-05-20T16:20:53Z

app/models/abilities/administrator.rb

@@ -60,7 +60,7 @@ def initialize(user)
      can :manage, Dashboard::Action

      can [:read, :update, :valuate, :destroy, :summary], SpendingProposal
-      can [:index, :read, :new, :create, :update, :destroy, :calculate_winners], Budget
+      can [:index, :read, :new, :create, :update, :destroy, :calculate_winners, :assigned_users_translation], Budget


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

houndci-bot · 2019-05-20T16:20:54Z

app/helpers/users_helper.rb

  def show_admin_menu?(user = nil)
-    current_administrator? || current_moderator? || current_valuator? || current_manager? || (user && user.administrator?)
+    current_administrator? || current_moderator? || current_valuator? || current_manager? || current_tracker? || (user && user.administrator?)


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

houndci-bot · 2019-05-21T07:46:32Z

app/assets/javascripts/budget_edit_associations.js.coffee

+        tracker_count = $(".js-budget-list-checkbox-trackers:checkbox:checked").length
+        budget = $(".js-budget-id").attr("id")
+        url = "/admin/budgets/" + budget + "/assigned_users_translation.json"
+        params = {administrators: admin_count, valuators: valuator_count, trackers: tracker_count}


Curly braces must have the proper spacing. There should be 1 space inside "{".
Curly braces must have the proper spacing. There should be 1 space inside "}".

houndci-bot · 2019-05-21T07:46:32Z

app/assets/javascripts/budget_edit_associations.js.coffee

@@ -0,0 +1,25 @@
+App.BudgetEditAssociations =
+
+  set_text: (response)->


Function arrows (-> and =>) must be spaced properly.

houndci-bot · 2019-05-21T07:46:48Z

app/helpers/budgets_helper.rb

+
+  def investment_milestone_tags_select_options(budget)
+    tags = Budget::Investment.by_budget(budget).tags_on(:milestone).order(:name).pluck(:name)
+    tags = tags.concat budget.budget_milestone_tags.split(",") if budget.budget_milestone_tags.present?


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

houndci-bot · 2019-05-21T07:46:48Z

app/helpers/budgets_helper.rb

@@ -54,7 +54,15 @@ def current_ballot
  end

  def investment_tags_select_options(budget)
-    Budget::Investment.by_budget(budget).tags_on(:valuation).order(:name).select(:name).distinct
+    tags = Budget::Investment.by_budget(budget).tags_on(:valuation).order(:name).pluck(:name)
+    tags = tags.concat budget.budget_valuation_tags.split(",") if budget.budget_valuation_tags.present?


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

houndci-bot · 2019-05-21T07:46:48Z

app/controllers/tracking/base_controller.rb

+  private
+
+    def verify_tracker
+      raise CanCan::AccessDenied unless current_user.try(:tracker?) || current_user.try(:administrator?)


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

houndci-bot · 2019-05-21T07:46:49Z

app/controllers/admin/budgets_controller.rb

@@ -57,12 +69,39 @@ def destroy
    end
  end

+  def assigned_users_translation
+    render json: { administrators: t("admin.budgets.edit.administrators", count: params[:administrators].to_i),


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

houndci-bot · 2019-06-03T01:52:49Z

app/models/budget/investment.rb

@@ -122,6 +127,7 @@ def self.scoped_filter(params, current_filter)
                              params[:max_total_supports])                 if params[:max_total_supports].present?
      results = results.where(group_id: params[:group_id])                 if params[:group_id].present?
      results = results.by_tag(params[:tag_name])                          if params[:tag_name].present?
+      results = results.by_tag(params[:milestone_tag_name])                if params[:milestone_tag_name].present?


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

houndci-bot · 2019-06-03T01:52:49Z

app/models/abilities/administrator.rb

@@ -59,7 +59,7 @@ def initialize(user)

      can :manage, Dashboard::Action

-      can [:index, :read, :new, :create, :update, :destroy, :calculate_winners], Budget
+      can [:index, :read, :new, :create, :update, :destroy, :calculate_winners, :assigned_users_translation], Budget


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

houndci-bot · 2019-06-03T01:52:50Z

app/controllers/admin/budgets_controller.rb

@@ -58,12 +70,39 @@ def destroy
    end
  end

+  def assigned_users_translation
+    render json: { administrators: t("admin.budgets.edit.administrators", count: params[:administrators].to_i),


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

houndci-bot reviewed May 20, 2019

View reviewed changes

houndci-bot reviewed May 21, 2019

View reviewed changes

houndci-bot reviewed Jun 3, 2019

View reviewed changes

Add historic fields to participatory budget

74083df

javierm merged commit c505fd3 into consuldemocracy:master Jun 12, 2019

javierm added this to Release 1.1.0 in Roadmap Sep 10, 2019

javierm mentioned this pull request Oct 18, 2019

Add historic settings to participatory budget #3481

Closed

This was referenced Oct 30, 2019

Fix assigning staff members to budgets #3807

Merged

Simplify JavaScript to pluralize translations #3809

Merged

javierm added the Budgets label Nov 1, 2019

javierm mentioned this pull request Sep 8, 2020

Filter investments only by assigned staff #4125

Merged

javierm mentioned this pull request May 23, 2021

Fix crash destroying budgets with admins/valuators #4528

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add historic fields to participatory budget #3514

Add historic fields to participatory budget #3514

Germangalia commented May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 20, 2019

houndci-bot May 21, 2019

houndci-bot May 21, 2019

houndci-bot May 21, 2019

houndci-bot May 21, 2019

houndci-bot May 21, 2019

houndci-bot May 21, 2019

houndci-bot Jun 3, 2019

houndci-bot Jun 3, 2019

houndci-bot Jun 3, 2019

		@@ -2,6 +2,9 @@

		<%= translatable_form_for [:admin, @budget] do \|f\| %>

		@@ -0,0 +1,25 @@
		App.BudgetEditAssociations =

		set_text: (response)->

Add historic fields to participatory budget #3514

Add historic fields to participatory budget #3514

Conversation

Germangalia commented May 20, 2019

References

Objectives

Visual Changes

Notes

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

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