decidim-proposals 0.20.1 → 0.23.1

data/app/cells/decidim/proposals/proposal_tags/show.erb

@@ -1,25 +1,33 @@
 <figure>
-  <figcaption class="text-uppercase">
-    <strong>
-      <%= t("filed_as", scope: "decidim.proposals.proposals.tags") %>
-    </strong>
-  </figcaption>
-
-  <ul>
+  <ul class="tags tags--proposal tags--list">
     <% if category.present? %>
       <li>
-        <%= link_to translated_attribute(category.name), resource_locator(model).index(filter: { category_id: category.id }) %>
+        <%= link_to resource_locator(model).index(filter: { category_id: [category.id.to_s] }), title: t("decidim.tags.filter_results_for_category", resource: translated_attribute(category.name)) do %>
+          <span class="show-for-sr"><%= t "decidim.tags.filter_results_for_category", resource: translated_attribute(category.name) %></span>
+          <span aria-hidden="true"><%= translated_attribute(category.name) %></span>
+        <% end %>
         <% if previous_category.present? && show_previous_category? %>
           &nbsp;
           <small class="text-small">
-            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_category: "#{previous_category.translated_name}").html_safe %>
+            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_name: "#{previous_category.translated_name}").html_safe %>
           </small>
         <% end %>
       </li>
     <% end %>
 
     <% if has_visible_scopes?(model) %>
-      <li><%= link_to translated_attribute(scope.name), resource_locator(model).index(filter: { scope_id: [scope.id] }) %></li>
+      <li>
+        <%= link_to resource_locator(model).index(filter: { scope_id: [scope.id] }), title: t("decidim.tags.filter_results_for_scope", resource: translated_attribute(scope.name)) do %>
+          <span class="show-for-sr"><%= t "decidim.tags.filter_results_for_scope", resource: translated_attribute(scope.name) %></span>
+          <span aria-hidden="true"><%= translated_attribute(scope.name) %></span>
+        <% end %>
+        <% if previous_scope.present? && show_previous_scope? %>
+          &nbsp;
+          <small class="text-small">
+            <%= t("changed_from", scope: "decidim.proposals.proposals.tags", previous_name: "#{translated_attribute(previous_scope.name)}").html_safe %>
+          </small>
+        <% end %>
+      </li>
     <% end %>
   </ul>
 </figure>

data/app/cells/decidim/proposals/proposal_tags_cell.rb

@@ -11,6 +11,7 @@ module Decidim
       property :category
       property :previous_category
       property :scope
+      property :previous_scope
 
       def show
         render if has_category_or_scopes?
@@ -22,6 +23,10 @@ module Decidim
         options[:show_previous_category].to_s != "false"
       end
 
+      def show_previous_scope?
+        options[:show_previous_scope].to_s != "false"
+      end
+
       def has_category_or_scopes?
         category.present? || has_visible_scopes?(model)
       end

data/app/cells/decidim/proposals/proposals_picker/proposals.erb

@@ -0,0 +1,12 @@
+<ul id="proposals_list">
+  <% decorated_proposals do |proposal| %>
+    <li>
+      <label><input type="checkbox" data-picker-text="<%= proposal.id_and_title(html_escape: true) %>" data-picker-url="<%= picker_path %>" value="<%= proposal.id %>" data-picker-choose> <%= proposal.id_and_title(html_escape: true) %> (<%= proposal.reference %>)</label>
+    </li>
+  <% end %>
+  <% if more_proposals? %>
+    <li><div class="callout warning"><%= t("proposals_picker.more_proposals", scope: "decidim.proposals", number: more_proposals_count) %></div>
+    </li>
+  <% end %>
+</ul>
+<div id="no_proposals" class="callout warning"><%= t("proposals_picker.no_proposals", scope: "decidim.proposals") %></div>

data/app/cells/decidim/proposals/proposals_picker/show.erb

@@ -0,0 +1,14 @@
+<div class="picker-header">
+  <h1><%= t("proposals_picker.choose_proposals", scope: "decidim.proposals") %></h1>
+  <input type="text" name="proposals-filter" id="proposals_filter" placeholder="<%= t("decidim.admin.filters.search_placeholder.id_string_or_title_cont", collection: proposals_collection_name) %>">
+</div>
+<div class="picker-content picker-list" data-picker-path="<%= picker_path %>" data-picker-more="<%= more_proposals? %>">
+  <%= render :proposals %>
+</div>
+<div class="picker-footer">
+  <div class="buttons button--double">
+    <a class="button" data-close=""><%= t("proposals_picker.close", scope: "decidim.proposals") %></a>
+  </div>
+</div>
+
+<%= javascript_include_tag "decidim/proposals/admin/proposals_picker" %>

data/app/cells/decidim/proposals/proposals_picker_cell.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Proposals
+    # This cell renders a proposals picker.
+    class ProposalsPickerCell < Decidim::ViewModel
+      MAX_PROPOSALS = 1000
+
+      def show
+        if filtered?
+          render :proposals
+        else
+          render
+        end
+      end
+
+      alias component model
+
+      def filtered?
+        !search_text.nil?
+      end
+
+      def picker_path
+        request.path
+      end
+
+      def search_text
+        params[:q]
+      end
+
+      def more_proposals?
+        @more_proposals ||= more_proposals_count.positive?
+      end
+
+      def more_proposals_count
+        @more_proposals_count ||= proposals_count - MAX_PROPOSALS
+      end
+
+      def proposals_count
+        @proposals_count ||= filtered_proposals.count
+      end
+
+      def decorated_proposals
+        filtered_proposals.limit(MAX_PROPOSALS).each do |proposal|
+          yield Decidim::Proposals::ProposalPresenter.new(proposal)
+        end
+      end
+
+      def filtered_proposals
+        @filtered_proposals ||= if filtered?
+                                  proposals.where("title ILIKE ?", "%#{search_text}%")
+                                           .or(proposals.where("reference ILIKE ?", "%#{search_text}%"))
+                                           .or(proposals.where("id::text ILIKE ?", "%#{search_text}%"))
+                                else
+                                  proposals
+                                end
+      end
+
+      def proposals
+        @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, component)
+                       &.published
+                       &.order(id: :asc)
+      end
+
+      def proposals_collection_name
+        Decidim::Proposals::Proposal.model_name.human(count: 2)
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/admin/answer_proposal.rb

@@ -23,16 +23,19 @@ module Decidim
         def call
           return broadcast(:invalid) if form.invalid?
 
-          answer_proposal
-          notify_followers
-          increment_score
+          store_initial_proposal_state
+
+          transaction do
+            answer_proposal
+            notify_proposal_answer
+          end
 
           broadcast(:ok)
         end
 
         private
 
-        attr_reader :form, :proposal
+        attr_reader :form, :proposal, :initial_has_state_published, :initial_state
 
         def answer_proposal
           Decidim.traceability.perform_action!(
@@ -40,55 +43,30 @@ module Decidim
             proposal,
             form.current_user
           ) do
-            proposal.update!(
-              state: @form.state,
-              answer: @form.answer,
-              answered_at: Time.current
-            )
-          end
-        end
+            attributes = {
+              state: form.state,
+              answer: form.answer,
+              answered_at: Time.current,
+              cost: form.cost,
+              cost_report: form.cost_report,
+              execution_period: form.execution_period
+            }
 
-        def notify_followers
-          return if (proposal.previous_changes.keys & %w(state)).empty?
+            attributes[:state_published_at] = Time.current if !initial_has_state_published && form.publish_answer?
 
-          if proposal.accepted?
-            publish_event(
-              "decidim.events.proposals.proposal_accepted",
-              Decidim::Proposals::AcceptedProposalEvent
-            )
-          elsif proposal.rejected?
-            publish_event(
-              "decidim.events.proposals.proposal_rejected",
-              Decidim::Proposals::RejectedProposalEvent
-            )
-          elsif proposal.evaluating?
-            publish_event(
-              "decidim.events.proposals.proposal_evaluating",
-              Decidim::Proposals::EvaluatingProposalEvent
-            )
+            proposal.update!(attributes)
           end
         end
 
-        def publish_event(event, event_class)
-          Decidim::EventsManager.publish(
-            event: event,
-            event_class: event_class,
-            resource: proposal,
-            affected_users: proposal.notifiable_identities,
-            followers: proposal.followers - proposal.notifiable_identities
-          )
-        end
+        def notify_proposal_answer
+          return if !initial_has_state_published && !form.publish_answer?
 
-        def increment_score
-          return unless proposal.accepted?
+          NotifyProposalAnswer.call(proposal, initial_state)
+        end
 
-          proposal.coauthorships.find_each do |coauthorship|
-            if coauthorship.user_group
-              Decidim::Gamification.increment_score(coauthorship.user_group, :accepted_proposals)
-            else
-              Decidim::Gamification.increment_score(coauthorship.author, :accepted_proposals)
-            end
-          end
+        def store_initial_proposal_state
+          @initial_has_state_published = proposal.published_state?
+          @initial_state = proposal.state
         end
       end
     end

data/app/commands/decidim/proposals/admin/assign_proposals_to_valuator.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command with all the business logic to assign proposals to a given
+      # valuator.
+      class AssignProposalsToValuator < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) unless form.valid?
+
+          assign_proposals
+          broadcast(:ok)
+        rescue ActiveRecord::RecordInvalid
+          broadcast(:invalid)
+        end
+
+        private
+
+        attr_reader :form
+
+        def assign_proposals
+          transaction do
+            form.proposals.flat_map do |proposal|
+              find_assignment(proposal) || assign_proposal(proposal)
+            end
+          end
+        end
+
+        def find_assignment(proposal)
+          Decidim::Proposals::ValuationAssignment.find_by(
+            proposal: proposal,
+            valuator_role: form.valuator_role
+          )
+        end
+
+        def assign_proposal(proposal)
+          Decidim.traceability.create!(
+            Decidim::Proposals::ValuationAssignment,
+            form.current_user,
+            proposal: proposal,
+            valuator_role: form.valuator_role
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/proposals/admin/create_proposal.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A command with all the business logic when a user creates a new proposal.
       class CreateProposal < Rectify::Command
-        include AttachmentMethods
+        include ::Decidim::AttachmentMethods
         include GalleryMethods
         include HashtagsMethods
 
@@ -39,6 +39,7 @@ module Decidim
             create_proposal
             create_attachment if process_attachments?
             create_gallery if process_gallery?
+            link_author_meeeting if form.created_in_meeting?
             send_notification
           end
 
@@ -59,9 +60,11 @@ module Decidim
         end
 
         def attributes
+          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+          parsed_body = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.body, current_organization: form.current_organization).rewrite
           {
-            title: title_with_hashtags,
-            body: body_with_hashtags,
+            title: parsed_title,
+            body: parsed_body,
             category: form.category,
             scope: form.scope,
             component: form.component,
@@ -73,6 +76,10 @@ module Decidim
           }
         end
 
+        def link_author_meeeting
+          proposal.link_resources(form.author, "proposals_from_meeting")
+        end
+
         def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.proposals.proposal_published",

data/app/commands/decidim/proposals/admin/create_proposal_note.rb

@@ -24,6 +24,7 @@ module Decidim
           return broadcast(:invalid) if form.invalid?
 
           create_proposal_note
+          notify_admins_and_valuators
 
           broadcast(:ok, proposal_note)
         end
@@ -46,6 +47,20 @@ module Decidim
             }
           )
         end
+
+        def notify_admins_and_valuators
+          affected_users = Decidim::User.org_admins_except_me(form.current_user).all
+          affected_users += Decidim::Proposals::ValuationAssignment.includes(valuator_role: :user).where.not(id: form.current_user.id).where(proposal: proposal).map(&:valuator)
+
+          data = {
+            event: "decidim.events.proposals.admin.proposal_note_created",
+            event_class: Decidim::Proposals::Admin::ProposalNoteCreatedEvent,
+            resource: proposal,
+            affected_users: affected_users
+          }
+
+          Decidim::EventsManager.publish(data)
+        end
       end
     end
   end

data/app/commands/decidim/proposals/admin/notify_proposal_answer.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Admin
+      # A command to notify about the change of the published state for a proposal.
+      class NotifyProposalAnswer < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # proposal - The proposal to write the answer for.
+        # initial_state - The proposal state before the current process.
+        def initialize(proposal, initial_state)
+          @proposal = proposal
+          @initial_state = initial_state.to_s
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :noop when the answer is not published or the state didn't changed.
+        # - :ok when everything is valid.
+        #
+        # Returns nothing.
+        def call
+          if proposal.published_state? && state_changed?
+            transaction do
+              increment_score
+              notify_followers
+            end
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :proposal, :initial_state
+
+        def state_changed?
+          initial_state != proposal.state.to_s
+        end
+
+        def notify_followers
+          if proposal.accepted?
+            publish_event(
+              "decidim.events.proposals.proposal_accepted",
+              Decidim::Proposals::AcceptedProposalEvent
+            )
+          elsif proposal.rejected?
+            publish_event(
+              "decidim.events.proposals.proposal_rejected",
+              Decidim::Proposals::RejectedProposalEvent
+            )
+          elsif proposal.evaluating?
+            publish_event(
+              "decidim.events.proposals.proposal_evaluating",
+              Decidim::Proposals::EvaluatingProposalEvent
+            )
+          end
+        end
+
+        def publish_event(event, event_class)
+          Decidim::EventsManager.publish(
+            event: event,
+            event_class: event_class,
+            resource: proposal,
+            affected_users: proposal.notifiable_identities,
+            followers: proposal.followers - proposal.notifiable_identities
+          )
+        end
+
+        def increment_score
+          if proposal.accepted?
+            proposal.coauthorships.find_each do |coauthorship|
+              Decidim::Gamification.increment_score(coauthorship.user_group || coauthorship.author, :accepted_proposals)
+            end
+          elsif initial_state == "accepted"
+            proposal.coauthorships.find_each do |coauthorship|
+              Decidim::Gamification.decrement_score(coauthorship.user_group || coauthorship.author, :accepted_proposals)
+            end
+          end
+        end
+      end
+    end
+  end
+end