decidim-proposals 0.20.1 → 0.21.0

data/lib/decidim/proposals/engine.rb

@@ -112,7 +112,7 @@ module Decidim
           payload = data[:this]
           if payload[:from_type] == Decidim::Accountability::Result.name && payload[:to_type] == Proposal.name
             proposal = Proposal.find(payload[:to_id])
-            proposal.update(state: "accepted")
+            proposal.update(state: "accepted", state_published_at: Time.current)
           end
         end
       end

data/lib/decidim/proposals/test/factories.rb

@@ -223,6 +223,14 @@ FactoryBot.define do
       end
     end
 
+    trait :with_card_image_allowed do
+      settings do
+        {
+          allow_card_image: true
+        }
+      end
+    end
+
     trait :with_extra_hashtags do
       transient do
         automatic_hashtags { "AutoHashtag AnotherAutoHashtag" }
@@ -239,6 +247,16 @@ FactoryBot.define do
         }
       end
     end
+
+    trait :without_publish_answers_immediately do
+      step_settings do
+        {
+          participatory_space.active_step.id => {
+            publish_answers_immediately: false
+          }
+        }
+      end
+    end
   end
 
   factory :proposal, class: "Decidim::Proposals::Proposal" do
@@ -299,26 +317,41 @@ FactoryBot.define do
     trait :evaluating do
       state { "evaluating" }
       answered_at { Time.current }
+      state_published_at { Time.current }
     end
 
     trait :accepted do
       state { "accepted" }
       answered_at { Time.current }
+      state_published_at { Time.current }
     end
 
     trait :rejected do
       state { "rejected" }
       answered_at { Time.current }
+      state_published_at { Time.current }
     end
 
     trait :withdrawn do
       state { "withdrawn" }
     end
 
+    trait :accepted_not_published do
+      state { "accepted" }
+      answered_at { Time.current }
+      state_published_at { nil }
+      answer { generate_localized_title }
+    end
+
     trait :with_answer do
       state { "accepted" }
       answer { generate_localized_title }
       answered_at { Time.current }
+      state_published_at { Time.current }
+    end
+
+    trait :not_answered do
+      state { nil }
     end
 
     trait :draft do
@@ -342,6 +375,12 @@ FactoryBot.define do
         create_list(:proposal_endorsement, 5, proposal: proposal)
       end
     end
+
+    trait :with_amendments do
+      after :create do |proposal|
+        create_list(:proposal_amendment, 5, amendable: proposal)
+      end
+    end
   end
 
   factory :proposal_vote, class: "Decidim::Proposals::ProposalVote" do
@@ -354,6 +393,13 @@ FactoryBot.define do
     author { build(:user, organization: proposal.organization) }
   end
 
+  factory :proposal_amendment, class: "Decidim::Amendment" do
+    amendable { build(:proposal) }
+    emendation { build(:proposal, component: amendable.component) }
+    amender { build(:user, organization: amendable.component.participatory_space.organization) }
+    state { Decidim::Amendment::STATES.sample }
+  end
+
   factory :user_group_proposal_endorsement, class: "Decidim::Proposals::ProposalEndorsement" do
     proposal { build(:proposal) }
     author { build(:user, organization: proposal.organization) }
@@ -408,4 +454,13 @@ FactoryBot.define do
     description { "<script>alert(\"DESCRIPTION\");</script>\n" + Faker::Lorem.sentences(3).join("\n") }
     component { create(:proposal_component) }
   end
+
+  factory :valuation_assignment, class: "Decidim::Proposals::ValuationAssignment" do
+    proposal
+    valuator_role do
+      space = proposal.component.participatory_space
+      organization = space.organization
+      build :participatory_process_user_role, role: :valuator, user: build(:user, organization: organization)
+    end
+  end
 end

data/lib/decidim/proposals/valuatable.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A set of methods and features related to proposal valuations.
+    module Valuatable
+      extend ActiveSupport::Concern
+      include Decidim::Comments::Commentable
+
+      included do
+        has_many :valuation_assignments, foreign_key: "decidim_proposal_id", dependent: :destroy
+
+        def valuators
+          valuator_role_ids = valuation_assignments.where(proposal: self).pluck(:valuator_role_id)
+          user_ids = participatory_space.user_roles(:valuator).where(id: valuator_role_ids).pluck(:decidim_user_id)
+          participatory_space.organization.users.where(id: user_ids)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/proposals/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-proposals version.
   module Proposals
     def self.version
-      "0.20.1"
+      "0.21.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-proposals
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -60,42 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
-- !ruby/object:Gem::Dependency
-  name: diffy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: doc2text
   requirement: !ruby/object:Gem::Requirement
@@ -158,84 +144,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-budgets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.1
+        version: 0.21.0
 description: A proposals component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -266,6 +252,8 @@ files:
 - app/cells/decidim/proposals/collaborative_draft_m/footer.erb
 - app/cells/decidim/proposals/collaborative_draft_m/tags.erb
 - app/cells/decidim/proposals/collaborative_draft_m_cell.rb
+- app/cells/decidim/proposals/cost_report/show.erb
+- app/cells/decidim/proposals/cost_report_cell.rb
 - app/cells/decidim/proposals/endorsers_list/show.erb
 - app/cells/decidim/proposals/endorsers_list_cell.rb
 - app/cells/decidim/proposals/highlighted_proposals/show.erb
@@ -291,17 +279,22 @@ files:
 - app/cells/decidim/proposals/proposal_tags_cell.rb
 - app/commands/decidim/proposals/accept_access_to_collaborative_draft.rb
 - app/commands/decidim/proposals/admin/answer_proposal.rb
+- app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb
 - app/commands/decidim/proposals/admin/create_proposal.rb
 - app/commands/decidim/proposals/admin/create_proposal_note.rb
 - app/commands/decidim/proposals/admin/discard_participatory_text.rb
 - app/commands/decidim/proposals/admin/import_participatory_text.rb
 - app/commands/decidim/proposals/admin/import_proposals.rb
 - app/commands/decidim/proposals/admin/merge_proposals.rb
+- app/commands/decidim/proposals/admin/notify_proposal_answer.rb
+- app/commands/decidim/proposals/admin/publish_answers.rb
 - app/commands/decidim/proposals/admin/publish_participatory_text.rb
 - app/commands/decidim/proposals/admin/split_proposals.rb
+- app/commands/decidim/proposals/admin/unassign_proposals_from_valuator.rb
 - app/commands/decidim/proposals/admin/update_participatory_text.rb
 - app/commands/decidim/proposals/admin/update_proposal.rb
 - app/commands/decidim/proposals/admin/update_proposal_category.rb
+- app/commands/decidim/proposals/admin/update_proposal_scope.rb
 - app/commands/decidim/proposals/attachment_methods.rb
 - app/commands/decidim/proposals/create_collaborative_draft.rb
 - app/commands/decidim/proposals/create_proposal.rb
@@ -321,6 +314,7 @@ files:
 - app/commands/decidim/proposals/vote_proposal.rb
 - app/commands/decidim/proposals/withdraw_collaborative_draft.rb
 - app/commands/decidim/proposals/withdraw_proposal.rb
+- app/controllers/concerns/decidim/proposals/admin/filterable.rb
 - app/controllers/concerns/decidim/proposals/collaborative_orderable.rb
 - app/controllers/concerns/decidim/proposals/orderable.rb
 - app/controllers/decidim/proposals/admin/application_controller.rb
@@ -331,6 +325,7 @@ files:
 - app/controllers/decidim/proposals/admin/proposals_imports_controller.rb
 - app/controllers/decidim/proposals/admin/proposals_merges_controller.rb
 - app/controllers/decidim/proposals/admin/proposals_splits_controller.rb
+- app/controllers/decidim/proposals/admin/valuation_assignments_controller.rb
 - app/controllers/decidim/proposals/application_controller.rb
 - app/controllers/decidim/proposals/collaborative_draft_collaborator_requests_controller.rb
 - app/controllers/decidim/proposals/collaborative_drafts_controller.rb
@@ -341,6 +336,7 @@ files:
 - app/controllers/decidim/proposals/versions_controller.rb
 - app/events/decidim/proposals/accepted_proposal_event.rb
 - app/events/decidim/proposals/admin/update_proposal_category_event.rb
+- app/events/decidim/proposals/admin/update_proposal_scope_event.rb
 - app/events/decidim/proposals/collaborative_draft_access_accepted_event.rb
 - app/events/decidim/proposals/collaborative_draft_access_rejected_event.rb
 - app/events/decidim/proposals/collaborative_draft_access_request_event.rb
@@ -367,11 +363,15 @@ files:
 - app/forms/decidim/proposals/admin/proposals_import_form.rb
 - app/forms/decidim/proposals/admin/proposals_merge_form.rb
 - app/forms/decidim/proposals/admin/proposals_split_form.rb
+- app/forms/decidim/proposals/admin/valuation_assignment_form.rb
 - app/forms/decidim/proposals/collaborative_draft_form.rb
 - app/forms/decidim/proposals/proposal_form.rb
 - app/forms/decidim/proposals/proposal_wizard_create_step_form.rb
 - app/forms/decidim/proposals/reject_access_to_collaborative_draft_form.rb
 - app/forms/decidim/proposals/request_access_to_collaborative_draft_form.rb
+- app/helpers/decidim/proposals/admin/filterable_helper.rb
+- app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb
+- app/helpers/decidim/proposals/admin/proposal_rankings_helper.rb
 - app/helpers/decidim/proposals/admin/proposals_helper.rb
 - app/helpers/decidim/proposals/application_helper.rb
 - app/helpers/decidim/proposals/collaborative_draft_cells_helper.rb
@@ -394,14 +394,18 @@ files:
 - app/models/decidim/proposals/proposal_endorsement.rb
 - app/models/decidim/proposals/proposal_note.rb
 - app/models/decidim/proposals/proposal_vote.rb
+- app/models/decidim/proposals/valuation_assignment.rb
 - app/permissions/decidim/proposals/admin/permissions.rb
 - app/permissions/decidim/proposals/permissions.rb
 - app/presenters/decidim/proposals/admin_log/proposal_note_presenter.rb
 - app/presenters/decidim/proposals/admin_log/proposal_presenter.rb
+- app/presenters/decidim/proposals/admin_log/valuation_assignment_presenter.rb
 - app/presenters/decidim/proposals/admin_log/value_types/proposal_state_presenter.rb
 - app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb
+- app/presenters/decidim/proposals/admin_log/value_types/valuator_role_user_presenter.rb
 - app/presenters/decidim/proposals/collaborative_draft_presenter.rb
 - app/presenters/decidim/proposals/log/resource_presenter.rb
+- app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb
 - app/presenters/decidim/proposals/official_author_presenter.rb
 - app/presenters/decidim/proposals/proposal_presenter.rb
 - app/queries/decidim/proposals/filtered_proposals.rb
@@ -417,6 +421,8 @@ files:
 - app/services/decidim/proposals/diff_renderer.rb
 - app/services/decidim/proposals/proposal_builder.rb
 - app/services/decidim/proposals/proposal_search.rb
+- app/types/decidim/proposals/proposal_input_filter.rb
+- app/types/decidim/proposals/proposal_input_sort.rb
 - app/types/decidim/proposals/proposal_type.rb
 - app/types/decidim/proposals/proposals_type.rb
 - app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_proposals.html.erb
@@ -424,24 +430,29 @@ files:
 - app/views/decidim/proposals/admin/participatory_texts/_bulk-actions.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/index.html.erb
 - app/views/decidim/proposals/admin/participatory_texts/new_import.html.erb
-- app/views/decidim/proposals/admin/proposal_answers/edit.html.erb
+- app/views/decidim/proposals/admin/proposal_answers/_form.html.erb
 - app/views/decidim/proposals/admin/proposal_notes/_form.html.erb
 - app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb
-- app/views/decidim/proposals/admin/proposal_notes/index.html.erb
 - app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb
 - app/views/decidim/proposals/admin/proposals/_form.html.erb
 - app/views/decidim/proposals/admin/proposals/_js-callout.html.erb
 - app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb
+- app/views/decidim/proposals/admin/proposals/bulk_actions/_assign_to_valuator.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_merge.html.erb
+- app/views/decidim/proposals/admin/proposals/bulk_actions/_publish_answers.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_recategorize.html.erb
+- app/views/decidim/proposals/admin/proposals/bulk_actions/_scope-change.html.erb
 - app/views/decidim/proposals/admin/proposals/bulk_actions/_split.html.erb
+- app/views/decidim/proposals/admin/proposals/bulk_actions/_unassign_from_valuator.html.erb
 - app/views/decidim/proposals/admin/proposals/edit.html.erb
 - app/views/decidim/proposals/admin/proposals/index.html.erb
 - app/views/decidim/proposals/admin/proposals/new.html.erb
+- app/views/decidim/proposals/admin/proposals/publish_answers.js.erb
+- app/views/decidim/proposals/admin/proposals/show.html.erb
 - app/views/decidim/proposals/admin/proposals/update_category.js.erb
+- app/views/decidim/proposals/admin/proposals/update_scope.js.erb
 - app/views/decidim/proposals/admin/proposals_imports/new.html.erb
-- app/views/decidim/proposals/admin/shared/_info_proposal.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_accept_request_access_form.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_collaborative_drafts.html.erb
 - app/views/decidim/proposals/collaborative_drafts/_collaborator_requests.html.erb
@@ -464,7 +475,6 @@ files:
 - app/views/decidim/proposals/proposal_endorsements/identities.html.erb
 - app/views/decidim/proposals/proposal_endorsements/update_buttons_and_counters.js.erb
 - app/views/decidim/proposals/proposal_votes/update_buttons_and_counters.js.erb
-- app/views/decidim/proposals/proposal_widgets/show.html.erb
 - app/views/decidim/proposals/proposals/_count.html.erb
 - app/views/decidim/proposals/proposals/_edit_form_fields.html.erb
 - app/views/decidim/proposals/proposals/_endorsement_button.html.erb
@@ -508,6 +518,7 @@ files:
 - config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - config/locales/es-MX.yml
@@ -571,6 +582,11 @@ files:
 - db/migrate/20181017084221_make_author_polymorhpic_for_proposal_endorsements.rb
 - db/migrate/20181026073215_add_created_in_meeting.rb
 - db/migrate/20190215113158_use_md5_indexes.rb
+- db/migrate/20200203111239_add_proposal_valuation_assignments.rb
+- db/migrate/20200210135152_add_costs_to_proposals.rb
+- db/migrate/20200212120110_sync_proposals_state_with_amendments_state.rb
+- db/migrate/20200227175922_add_state_published_at_to_proposals.rb
+- db/migrate/20200306123652_publish_existing_proposals_state.rb
 - lib/decidim/content_parsers/proposal_parser.rb
 - lib/decidim/content_renderers/proposal_renderer.rb
 - lib/decidim/proposals.rb
@@ -586,6 +602,7 @@ files:
 - lib/decidim/proposals/participatory_text_section.rb
 - lib/decidim/proposals/proposal_serializer.rb
 - lib/decidim/proposals/test/factories.rb
+- lib/decidim/proposals/valuatable.rb
 - lib/decidim/proposals/version.rb
 homepage: https://github.com/decidim/decidim
 licenses: