decidim-proposals 0.15.2 → 0.16.0

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

@@ -18,9 +18,22 @@ module Decidim
                     end
       end
 
+      def collaborative_draft
+        __getobj__
+      end
+
       def collaborative_draft_path
-        draft = __getobj__
-        Decidim::ResourceLocatorPresenter.new(draft).path
+        Decidim::ResourceLocatorPresenter.new(collaborative_draft).path
+      end
+
+      def title(links: false, extras: true)
+        renderer = Decidim::ContentRenderers::HashtagRenderer.new(collaborative_draft.title)
+        renderer.render(links: links, extras: extras).html_safe
+      end
+
+      def body(links: false, extras: true)
+        renderer = Decidim::ContentRenderers::HashtagRenderer.new(collaborative_draft.body)
+        renderer.render(links: links, extras: extras).html_safe
       end
     end
   end

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

@@ -33,6 +33,10 @@ module Decidim
       def can_be_contacted?
         false
       end
+
+      def has_tooltip?
+        false
+      end
     end
   end
 end

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

@@ -34,24 +34,20 @@ module Decidim
         link_to title, proposal_path
       end
 
-      def title
+      # Render the proposal title
+      #
+      # links - should render hashtags as links?
+      # extras - should include extra hashtags?
+      #
+      # Returns a String.
+      def title(links: false, extras: true)
         renderer = Decidim::ContentRenderers::HashtagRenderer.new(proposal.title)
-        renderer.render_without_link.html_safe
+        renderer.render(links: links, extras: extras).html_safe
       end
 
-      def html_title
-        renderer = Decidim::ContentRenderers::HashtagRenderer.new(proposal.title)
-        renderer.render.html_safe
-      end
-
-      def body
-        renderer = Decidim::ContentRenderers::HashtagRenderer.new(proposal.body)
-        renderer.render_without_link.html_safe
-      end
-
-      def html_body
+      def body(links: false, extras: true)
         renderer = Decidim::ContentRenderers::HashtagRenderer.new(proposal.body)
-        renderer.render.html_safe
+        renderer.render(links: links, extras: extras).html_safe
       end
     end
   end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Metrics
+      class EndorsementsMetricManage < Decidim::MetricManage
+        def metric_name
+          "endorsements"
+        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
+
+          components = Decidim::Component.where(participatory_space: retrieve_participatory_spaces).published
+          proposals = Decidim::Proposals::Proposal.where(component: components).except_withdrawn
+          @query = Decidim::Proposals::ProposalEndorsement.joins(proposal: :component)
+                                                          .left_outer_joins(proposal: :category)
+                                                          .where(proposal: proposals)
+          @query = @query.where("decidim_proposals_proposal_endorsements.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_endorsements.created_at >= ?", start_time).count
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Metrics
+      # Searches for unique Users following the next objects
+      #  - Proposals
+      #  - CollaborativeDrafts
+      class ProposalFollowersMetricMeasure < Decidim::MetricMeasure
+        def valid?
+          super && @resource.is_a?(Decidim::Component)
+        end
+
+        def calculate
+          cumulative_users = []
+          cumulative_users |= retrieve_proposals_followers.pluck(:decidim_user_id)
+          cumulative_users |= retrieve_drafts_followers.pluck(:decidim_user_id)
+
+          quantity_users = []
+          quantity_users |= retrieve_proposals_followers(true).pluck(:decidim_user_id)
+          quantity_users |= retrieve_drafts_followers(true).pluck(:decidim_user_id)
+
+          {
+            cumulative_users: cumulative_users.uniq,
+            quantity_users: quantity_users.uniq
+          }
+        end
+
+        private
+
+        def retrieve_proposals_followers(from_start = false)
+          @proposals_followers ||= Decidim::Follow.where(followable: retrieve_proposals).joins(:user)
+                                                  .where("decidim_follows.created_at <= ?", end_time)
+
+          return @proposals_followers.where("decidim_follows.created_at >= ?", start_time) if from_start
+          @proposals_followers
+        end
+
+        def retrieve_drafts_followers(from_start = false)
+          @drafts_followers ||= Decidim::Follow.where(followable: retrieve_collaborative_drafts).joins(:user)
+                                               .where("decidim_follows.created_at <= ?", end_time)
+          return @drafts_followers.where("decidim_follows.created_at >= ?", start_time) if from_start
+          @drafts_followers
+        end
+
+        def retrieve_proposals
+          Decidim::Proposals::Proposal.where(component: @resource).except_withdrawn
+        end
+
+        def retrieve_collaborative_drafts
+          Decidim::Proposals::CollaborativeDraft.where(component: @resource).except_withdrawn
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Metrics
+      # Searches for Participants in the following actions
+      #  - Create a proposal (Proposals)
+      #  - Give support to a proposal (Proposals)
+      #  - Endorse (Proposals)
+      class ProposalParticipantsMetricMeasure < Decidim::MetricMeasure
+        def valid?
+          super && @resource.is_a?(Decidim::Component)
+        end
+
+        def calculate
+          cumulative_users = []
+          cumulative_users |= retrieve_votes.pluck(:decidim_author_id)
+          cumulative_users |= retrieve_endorsements.pluck(:decidim_author_id)
+          cumulative_users |= retrieve_proposals.pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguosity must be called this way
+
+          quantity_users = []
+          quantity_users |= retrieve_votes(true).pluck(:decidim_author_id)
+          quantity_users |= retrieve_endorsements(true).pluck(:decidim_author_id)
+          quantity_users |= retrieve_proposals(true).pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguosity must be called this way
+
+          {
+            cumulative_users: cumulative_users.uniq,
+            quantity_users: quantity_users.uniq
+          }
+        end
+
+        private
+
+        def retrieve_proposals(from_start = false)
+          @proposals ||= Decidim::Proposals::Proposal.where(component: @resource).joins(:coauthorships)
+                                                     .includes(:votes, :endorsements)
+                                                     .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
+                                                     .where("decidim_proposals_proposals.published_at <= ?", end_time)
+                                                     .except_withdrawn
+
+          return @proposals.where("decidim_proposals_proposals.published_at >= ?", start_time) if from_start
+          @proposals
+        end
+
+        def retrieve_votes(from_start = false)
+          @votes ||= Decidim::Proposals::ProposalVote.joins(:proposal).where(proposal: retrieve_proposals).joins(:author)
+                                                     .where("decidim_proposals_proposal_votes.created_at <= ?", end_time)
+
+          return @votes.where("decidim_proposals_proposal_votes.created_at >= ?", start_time) if from_start
+          @votes
+        end
+
+        def retrieve_endorsements(from_start = false)
+          @endorsements ||= Decidim::Proposals::ProposalEndorsement.joins(:proposal).where(proposal: retrieve_proposals)
+                                                                   .where("decidim_proposals_proposal_endorsements.created_at <= ?", end_time)
+                                                                   .where(decidim_author_type: "Decidim::UserBaseEntity")
+
+          return @endorsements.where("decidim_proposals_proposal_endorsements.created_at >= ?", start_time) if from_start
+          @endorsements
+        end
+      end
+    end
+  end
+end

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

@@ -21,12 +21,29 @@ module Decidim
       end
 
       # Handle the origin filter
-      # The 'official' proposals doesn't have an author id
       def search_origin
-        if origin == "official"
-          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).joins(:coauthorships).where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
+        case origin
+        when "official"
+          query
+            .where.not(coauthorships_count: 0)
+            .joins(:coauthorships)
+            .where(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
+        when "citizens"
+          query
+            .where.not(coauthorships_count: 0)
+            .joins(:coauthorships)
+            .where.not(decidim_coauthorships: { decidim_author_type: "Decidim::Organization" })
+        when "user_group"
+          query
+            .where.not(coauthorships_count: 0)
+            .joins(:coauthorships)
+            .where(decidim_coauthorships: { decidim_author_type: "Decidim::UserBaseEntity" })
+            .where.not(decidim_coauthorships: { decidim_user_group_id: nil })
+        when "meeting"
+          query
+            .where.not(coauthorships_count: 0)
+            .joins(:coauthorships)
+            .where(decidim_coauthorships: { decidim_author_type: "Decidim::Meetings::Meeting" })
         else # Assume 'all'
           query
         end
@@ -63,6 +80,18 @@ module Decidim
         end
       end
 
+      # Handle the amendment type filter
+      def search_type
+        case type
+        when "proposals"
+          query.where.not(id: query.joins(:amendable).pluck(:id))
+        when "amendments"
+          query.where(id: query.joins(:amendable).pluck(:id))
+        else
+          query
+        end
+      end
+
       # Filters Proposals by the name of the classes they are linked to. By default,
       # returns all Proposals. When a `related_to` param is given, then it camelcases item
       # to find the real class name and checks the links for the Proposals.
@@ -85,6 +114,18 @@ module Decidim
 
         query.where(id: from).or(query.where(id: to))
       end
+
+      # We overwrite the `results` method to ensure we only return unique
+      # results. We can't use `#uniq` because it returns an Array and we're
+      # adding scopes in the controller, and `#distinct` doesn't work here
+      # because in the later scopes we're ordering by `RANDOM()` in a DB level,
+      # and `SELECT DISTINCT` doesn't work with `RANDOM()` sorting, so we need
+      # to perform two queries.
+      #
+      # The correct behaviour is backed by tests.
+      def results
+        Proposal.where(id: super.pluck(:id))
+      end
     end
   end
 end

data/app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_proposals.html.erb

@@ -5,7 +5,7 @@
       <%= cell(
         "decidim/collapsible_list",
         proposals,
-        cell_options: { context: { current_user: current_user } },
+        cell_options: {},
         list_class: "row small-up-1 medium-up-2 large-up-3 card-grid",
         size: proposals.count
         ) %>

data/app/views/decidim/proposals/admin/proposals/_form.html.erb

@@ -5,13 +5,52 @@
 
   <div class="card-section">
     <div class="row column hashtags__container">
-      <%= form.text_field :title, class: "js-hashtags", hashtaggable: true %>
+      <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title(extras: false).strip %>
     </div>
 
     <div class="row column hashtags__container">
-      <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true %>
+      <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true, value: form_presenter.body(extras: false).strip %>
     </div>
 
+    <% if @form.component_automatic_hashtags.any? %>
+      <div class="field">
+        <%= form.label :automatic_hashtags %>
+        <div class="checkboxes hashtags">
+          <% @form.component_automatic_hashtags.each do |hashtag| %>
+            <label>
+              <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
+            </label>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+
+    <% if @form.component_suggested_hashtags.any? %>
+      <div class="field">
+        <%= form.label :suggested_hashtags %>
+        <div class="checkboxes hashtags">
+          <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map {|hashtag| [hashtag.downcase, "##{hashtag}"]}, :first, :last do |option|
+            option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
+          end %>
+        </div>
+      </div>
+    <% end %>
+
+    <% if @form.meetings %>
+      <div class="meeting-fields">
+        <div class="row column">
+          <%= form.check_box :created_in_meeting, label: t(".created_in_meeting") %>
+        </div>
+
+        <div class="row column" id="proposal_meeting">
+          <%= form.select :meeting_id,
+                          options_for_select(@form.meetings&.map { |meeting| [present(meeting).title, meeting.id] }, selected: meetings_as_authors_selected ),
+                          { include_blank: true, label: t(".select_a_meeting") },
+                          { multiple: false, class: "chosen-select" } %>
+        </div>
+      </div>
+    <% end %>
+
     <% if component_settings.geocoding_enabled? %>
       <div class="row column">
         <%= form.text_field :address %>
@@ -48,3 +87,5 @@
     <% end %>
   </div>
 </div>
+
+<%= javascript_include_tag "decidim/proposals/admin/proposals_form" %>

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

@@ -23,7 +23,9 @@
     </td>
   <% end %>
   <td>
+    <%= t("decidim/amendment", scope: "activerecord.models", count: 1) if proposal.emendation? %>
     <strong class="<%= proposal_state_css_class proposal.state %>">
+      <%= t("decidim/amendment", scope: "activerecord.models", count: 1) if proposal.emendation? %>
       <%= humanize_proposal_state proposal.state %>
     </strong>
   </td>
@@ -59,8 +61,10 @@
       <%= 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 %>
 
-    <% if allowed_to? :create, :proposal_answer %>
-     <%= icon_link_to "comment-square", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: "action-icon--edit-answer" %>
+    <% if allowed_to? :create, :proposal_answer and !proposal.emendation? %>
+      <%= icon_link_to "comment-square", edit_proposal_proposal_answer_path(proposal_id: proposal.id, id: proposal.id), t("actions.answer", scope: "decidim.proposals"), class: " icon--small" %>
+    <% else %>
+      <%= icon "comment-square", scope: "decidim.proposals.admin", class: "action-icon action-icon--disabled" %>
     <% end %>
 
     <%= resource_permissions_link(proposal) %>

data/app/views/decidim/proposals/admin/proposals/edit.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, html: { class: "form edit_proposal" })  do |f| %>
+<%= decidim_form_for(@form, html: { class: "form edit_proposal proposal_form_admin" })  do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
     <div class="button--double form-general-submit">

data/app/views/decidim/proposals/admin/proposals/new.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, html: { class: "form new_proposal" }) do |f| %>
+<%= decidim_form_for(@form, html: { class: "form new_proposal proposal_form_admin" }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t(".title") } %>
 
   <div class="button--double form-general-submit">

data/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb

@@ -0,0 +1,81 @@
+<div class="field hashtags__container">
+  <%= form.text_field :title, class: "js-hashtags", hashtaggable: true, value: form_presenter.title %>
+</div>
+
+<div class="field hashtags__container">
+  <%= form.text_area :body, rows: 10, class: "js-hashtags", hashtaggable: true, value: form_presenter.body(extras: false).strip %>
+</div>
+
+<% if @form.component_automatic_hashtags.any? %>
+  <div class="field">
+    <%= form.label :automatic_hashtags %>
+    <div class="checkboxes hashtags">
+      <% @form.component_automatic_hashtags.each do |hashtag| %>
+        <label>
+          <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
+        </label>
+      <% end %>
+    </div>
+  </div>
+<% end %>
+
+<% if @form.component_suggested_hashtags.any? %>
+  <div class="field">
+    <%= form.label :suggested_hashtags %>
+    <div class="checkboxes hashtags">
+      <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map {|hashtag| [hashtag.downcase, "##{hashtag}"]}, :first, :last do |option|
+        option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
+      end %>
+    </div>
+  </div>
+<% end %>
+
+<% if component_settings.geocoding_enabled? %>
+  <div class="field">
+    <%= form.check_box :has_address, checked: form_has_address? %>
+  </div>
+
+  <div class="field" id="address_input">
+    <%= form.text_field :address %>
+  </div>
+<% end %>
+
+<% if @form.categories&.any? %>
+  <div class="field">
+    <%= form.categories_select :category_id, @form.categories, prompt: t("decidim.proposals.collaborative_drafts.edit.select_a_category") %>
+  </div>
+<% end %>
+
+<% if current_participatory_space.has_subscopes? %>
+  <div class="field">
+    <%= scopes_picker_field form, :scope_id %>
+  </div>
+<% end %>
+
+<% if  current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+  <div class="field">
+    <%= user_group_select_field form, :user_group_id %>
+  </div>
+<% end %>
+
+<% if component_settings.attachments_allowed? %>
+  <fieldset>
+    <legend><%= t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit") %></legend>
+    <%= form.fields_for :attachment, @form.attachment do |nested_form| %>
+      <div class="field">
+        <%= nested_form.text_field :title %>
+      </div>
+
+      <div class="field">
+        <%= nested_form.upload :file, optional: false %>
+        <% if @form.errors[:attachment].present? %>
+          <% @form.errors[:attachment].each do |message| %>
+            <small class="form-error is-visible">
+              <%= message %>
+            </small>
+          <% end %>
+        <% end %>
+      </div>
+    <% end %>
+  </fieldset>
+<% end %>