decidim-proposals 0.14.4 → 0.15.0

data/app/presenters/decidim/proposals/admin_log/proposal_presenter.rb

@@ -15,6 +15,10 @@ module Decidim
       class ProposalPresenter < Decidim::Log::BasePresenter
         private
 
+        def resource_presenter
+          @resource_presenter ||= Decidim::Proposals::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
+        end
+
         def diff_fields_mapping
           {
             title: "Decidim::Proposals::AdminLog::ValueTypes::ProposalTitleBodyPresenter",
@@ -27,7 +31,7 @@ module Decidim
 
         def action_string
           case action
-          when "answer", "create"
+          when "answer", "create", "update"
             "decidim.proposals.admin_log.proposal.#{action}"
           else
             super

data/app/presenters/decidim/proposals/log/resource_presenter.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Log
+      class ResourcePresenter < Decidim::Log::ResourcePresenter
+        private
+
+        # Private: Presents resource name.
+        #
+        # Returns an HTML-safe String.
+        def present_resource_name
+          Decidim::Proposals::ProposalPresenter.new(resource).title
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/proposals/official_author_presenter.rb

@@ -29,6 +29,10 @@ module Decidim
       def deleted?
         false
       end
+
+      def can_be_contacted?
+        false
+      end
     end
   end
 end

data/app/queries/decidim/proposals/metrics/accepted_proposals_metric_manage.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Metrics
+      class AcceptedProposalsMetricManage < Decidim::Proposals::Metrics::ProposalsMetricManage
+        def metric_name
+          "accepted_proposals"
+        end
+
+        private
+
+        def query
+          return @query if @query
+
+          spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
+            manifest.participatory_spaces.call(@organization).public_spaces
+          end
+          components = Decidim::Component.where(participatory_space: spaces).published
+          @query = Decidim::Proposals::Proposal.where(component: components).joins(:component)
+                                               .left_outer_joins(:category)
+          @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).accepted
+          @query = @query.group("decidim_categorizations.id", :participatory_space_type, :participatory_space_id)
+          @query
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Metrics
+      class ProposalsMetricManage < Decidim::MetricManage
+        def metric_name
+          "proposals"
+        end
+
+        def save
+          return @registry if @registry
+
+          @registry = []
+          cumulative.each do |key, cumulative_value|
+            next if cumulative_value.zero?
+            quantity_value = quantity[key] || 0
+            category_id, space_type, space_id = key
+            record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
+                                                           organization: @organization, decidim_category_id: category_id,
+                                                           participatory_space_type: space_type, participatory_space_id: space_id)
+            record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
+            @registry << record
+          end
+          @registry.each(&:save!)
+          @registry
+        end
+
+        private
+
+        def query
+          return @query if @query
+
+          spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
+            manifest.participatory_spaces.call(@organization).public_spaces
+          end
+          components = Decidim::Component.where(participatory_space: spaces).published
+          @query = Decidim::Proposals::Proposal.where(component: components).joins(:component)
+                                               .left_outer_joins(:category)
+          @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).except_withdrawn
+          @query = @query.group("decidim_categorizations.decidim_category_id",
+                                :participatory_space_type,
+                                :participatory_space_id)
+          @query
+        end
+
+        def quantity
+          @quantity ||= query.where("decidim_proposals_proposals.published_at >= ?", start_time).count
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/proposals/metrics/votes_metric_manage.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Metrics
+      class VotesMetricManage < Decidim::MetricManage
+        def metric_name
+          "votes"
+        end
+
+        def save
+          return @registry if @registry
+
+          @registry = []
+          cumulative.each do |key, cumulative_value|
+            next if cumulative_value.zero?
+            quantity_value = quantity[key] || 0
+            category_id, space_type, space_id, proposal_id = key
+            record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
+                                                           organization: @organization, decidim_category_id: category_id,
+                                                           participatory_space_type: space_type, participatory_space_id: space_id,
+                                                           related_object_type: "Decidim::Proposals::Proposal", related_object_id: proposal_id)
+            record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
+            @registry << record
+          end
+          @registry.each(&:save!)
+          @registry
+        end
+
+        private
+
+        def query
+          return @query if @query
+
+          spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
+            manifest.participatory_spaces.call(@organization).public_spaces
+          end
+          components = Decidim::Component.where(participatory_space: spaces).published
+          proposals = Decidim::Proposals::Proposal.where(component: components).except_withdrawn
+          @query = Decidim::Proposals::ProposalVote.joins(proposal: :component)
+                                                   .left_outer_joins(proposal: :category)
+                                                   .where(proposal: proposals)
+          @query = @query.where("decidim_proposals_proposal_votes.created_at <= ?", end_time)
+          @query = @query.group("decidim_categorizations.id",
+                                :participatory_space_type,
+                                :participatory_space_id,
+                                :decidim_proposal_id)
+          @query
+        end
+
+        def quantity
+          @quantity ||= query.where("decidim_proposals_proposal_votes.created_at >= ?", start_time).count
+        end
+      end
+    end
+  end
+end

data/app/services/decidim/proposals/proposal_builder.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    # A factory class to ensure we always create Proposals the same way since it involves some logic.
+    module ProposalBuilder
+      # Public: Creates a new Proposal.
+      #
+      # attributes        - The Hash of attributes to create the Proposal with.
+      # author            - An Authorable the will be the first coauthor of the Proposal.
+      # user_group_author - A User Group to, optionally, set it as the author too.
+      # action_user       - The User to be used as the user who is creating the proposal in the traceability logs.
+      #
+      # Returns a Proposal.
+      def create(attributes:, author:, action_user:, user_group_author: nil)
+        Decidim.traceability.perform_action!(:create, Proposal, action_user, visibility: "all") do
+          proposal = Proposal.new(attributes)
+          proposal.add_coauthor(author, user_group: user_group_author)
+          proposal.save!
+          proposal
+        end
+      end
+
+      module_function :create
+
+      # Public: Creates a new Proposal by copying the attributes from another one.
+      #
+      # original_proposal - The Proposal to be used as base to create the new one.
+      # author            - An Authorable the will be the first coauthor of the Proposal.
+      # user_group_author - A User Group to, optionally, set it as the author too.
+      # action_user       - The User to be used as the user who is creating the proposal in the traceability logs.
+      # extra_attributes  - A Hash of attributes to create the new proposal, will overwrite the original ones.
+      # skip_link         - Whether to skip linking the two proposals or not (default false).
+      #
+      # Returns a Proposal
+      #
+      # rubocop:disable Metrics/ParameterLists
+      def copy(original_proposal, author:, action_user:, user_group_author: nil, extra_attributes: {}, skip_link: false)
+        origin_attributes = original_proposal.attributes.except(
+          "id",
+          "created_at",
+          "updated_at",
+          "state",
+          "answer",
+          "answered_at",
+          "decidim_component_id",
+          "reference",
+          "proposal_votes_count",
+          "proposal_endorsements_count",
+          "proposal_notes_count"
+        ).merge(
+          "category" => original_proposal.category
+        ).merge(
+          extra_attributes
+        )
+
+        proposal = create(
+          attributes: origin_attributes,
+          author: author,
+          user_group_author: user_group_author,
+          action_user: action_user
+        )
+
+        proposal.link_resources(original_proposal, "copied_from_component") unless skip_link
+        proposal
+      end
+      # rubocop:enable Metrics/ParameterLists
+
+      module_function :copy
+    end
+  end
+end

data/app/services/decidim/proposals/proposal_search.rb

@@ -24,9 +24,9 @@ module Decidim
       # The 'official' proposals doesn't have an author id
       def search_origin
         if origin == "official"
-          query.where(coauthorships_count: 0)
+          query.where.not(coauthorships_count: 0).joins(:coauthorships).where(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
         elsif origin == "citizens"
-          query.where.not(coauthorships_count: 0)
+          query.where.not(coauthorships_count: 0).joins(:coauthorships).where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
         else # Assume 'all'
           query
         end

data/app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb

@@ -0,0 +1,13 @@
+<div class="grid-x">
+  <div class="cell">
+    <%= form.hidden_field :position, class: "position" %>
+    <%= form.text_field :title, optional: false %>
+  </div>
+</div>
+<% if proposal.article? %>
+<div class="grid-x">
+  <div class="cell">
+    <%= form.text_area :body, optional: true %>
+  </div>
+</div>
+<% end %>

data/app/views/decidim/proposals/admin/participatory_texts/_bulk-actions.html.erb

@@ -0,0 +1 @@
+<%= link_to t(".import_doc"), new_import_participatory_texts_path, id: "import-doc", class: "button tiny button--title" %>

data/app/views/decidim/proposals/admin/participatory_texts/index.html.erb

@@ -0,0 +1,43 @@
+<%= decidim_form_for(@preview_form, url: publish_participatory_texts_path, class: "form grid-container") do |form| %>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t(".title") %>
+      <%= render partial: "bulk-actions" %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <% if @drafts.any? %>
+      <p><%= t(".info_1") %></p>
+      <ul id="participatory-text" class="accordion js-sortable mb-m"
+        data-accordion
+        data-multi-expand="true"
+        data-allow-all-closed="true">
+        <%= form.fields_for(:proposals) do |prop_form| %>
+        <% proposal= @drafts[prop_form.index] %>
+          <li class="accordion-item" data-accordion-item>
+            <a href="#" class="accordion-title flex--sbc"><%= preview_participatory_text_section_title(proposal) %><span class="mr-m"><%= icon "menu", class: "icon--small" %></span></a>
+            <div class="accordion-content" data-tab-content>
+              <%= render "article-preview", { form: prop_form, proposal: proposal } %>
+            </div>
+          </li>
+        <% end %>
+      </ul>
+    <% end -%>
+  </div>
+</div>
+<div class="grid-x align-center mt-sm">
+  <%= form.submit t(".publish_document") %>
+</div>
+<% end -%>
+<script>
+$(window).on("load", function() {
+  $( "#participatory-text" ).on( "sortupdate",
+    function( event, ui ) {
+      $('#participatory-text li').each(function(idx, li) {
+        input= $(li).find("input.position").val(idx+1)
+      })
+    }
+  )
+})
+</script>

data/app/views/decidim/proposals/admin/participatory_texts/new_import.html.erb

@@ -0,0 +1,39 @@
+<%= decidim_form_for(@import, url: import_participatory_texts_path, class: "form grid-container") do |form| %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title"><%= t(".title") %></h2>
+    </div>
+    <div class="card-section">
+      <div class="grid-x">
+        <div class="cell">
+          <div id="import-title" class="row column">
+            <%= form.translated :text_field, :title, autofocus: true %>
+          </div>
+        </div>
+      </div>
+      <div class="grid-x">
+        <div class="cell">
+          <div id="import-desc" class="row column">
+            <%= form.translated :text_area, :description %>
+          </div>
+        </div>
+      </div>
+      <div class="grid-x">
+        <div class="cell">
+          <fieldset>
+            <legend><%= t(".document_legend") %></legend>
+              <div class="row column">
+                <%= form.upload :document, optional: false %>
+              </div>
+          </fieldset>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="grid-x align-center mt-sm">
+    <%= form.submit t(".upload_document") %>
+  </div>
+  <div class="grid-x align-center">
+    <%= t(".bottom_hint") %>
+  </div>
+<% end -%>

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -1,7 +1,10 @@
 <div class="flex--cc flex-gap--1">
-  <%= bulk_actions_dropdown %>
+  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/dropdown" %>
 
   <div id="js-other-actions-wrapper">
+    <% if component_settings.participatory_texts_enabled? %>
+      <%= link_to t("actions.participatory_texts", scope: "decidim.proposals"), participatory_texts_path, id: "participatory_texts", class: "button tiny button--simple" %>
+    <% end %>
     <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path, class: "button tiny button--simple" if allowed_to? :import, :proposals %>
 
     <% if allowed_to? :create, :proposal %>
@@ -11,5 +14,7 @@
     <%= export_dropdown %>
   </div>
 
-  <%= bulk_action_recategorize %>
+  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/recategorize" %>
+  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/merge" %>
+  <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/split" %>
 </div>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -51,6 +51,10 @@
   </td>
 
   <td class="table-list__actions">
+    <% if allowed_to? :edit, :proposal, proposal: proposal %>
+      <%= icon_link_to "pencil", edit_proposal_path(proposal), t("actions.edit_proposal", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
+    <% end %>
+
     <% if allowed_to? :create, :proposal_note %>
       <%= icon_link_to "chat", proposal_proposal_notes_path(proposal_id: proposal.id), t("actions.private_notes", scope: "decidim.proposals"), class: "action-icon--index-notes" %>
     <% end %>

data/app/views/decidim/proposals/admin/proposals/bulk_actions/_dropdown.html.erb

@@ -0,0 +1,36 @@
+<div id="js-bulk-actions-wrapper">
+  <button
+    id="js-bulk-actions-button"
+    class="button button--nomargin tiny success light dropdown"
+    type="button"
+    data-toggle="js-bulk-actions-dropdown">
+    <%= t("decidim.proposals.admin.proposals.index.actions") %>
+  </button>
+
+  <div
+    id="js-bulk-actions-dropdown"
+    class="dropdown-pane"
+    data-position="bottom"
+    data-alignment="right"
+    data-dropdown="dropdown"
+    data-auto-focus="false"
+    data-events="resize">
+    <ul class="list-reset">
+      <li>
+        <button type="button" data-action="recategorize-proposals">
+          <%= t("decidim.proposals.admin.proposals.index.change_category") %>
+        </button>
+      </li>
+      <li>
+        <button type="button" data-action="merge-proposals">
+          <%= t("decidim.proposals.admin.proposals.index.merge") %>
+        </button>
+      </li>
+      <li>
+        <button type="button" data-action="split-proposals">
+          <%= t("decidim.proposals.admin.proposals.index.split") %>
+        </button>
+      </li>
+    </ul>
+  </div>
+</div>