decidim-accountability 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d108eb3f6f905e0323481b1446dce266b5df791c956d13d24964a820634a5ff
-  data.tar.gz: d0e60451edae95e5bab4b399170539c1e9b8b5a3a61c7eb4d2e3e1db72bc6e24
+  metadata.gz: fb8f10169d6b6d32051013abfb88a1db9a7d2f35907d1a41cab8aa2f13b8c90f
+  data.tar.gz: fa3789548be4955c7c6d9347358f09272369f83bd5172d1d93580a3498776cb0
 SHA512:
-  metadata.gz: fe17bf52cd5eb3670c1f16c5d19f878f91dc20d4f8454be88dacdf438b4dd7d7f48a4f6dee90931724cb5fe30a1d22d10f92fcba87362873ef22854664f2f11d
-  data.tar.gz: 6eec909ef42a7bc40196104ab854e19884833578e531829d9e741bede000121badfb031c47df0c516a6b943e275c5251995e9fd4ce3c0edb04f76b33a948854d
+  metadata.gz: d548d50caa0918336a747895c6e7c4927100e2055b4b951297566444948224aa4f4afcc2069cd3aeb5b635b4a6bf5303ce17189ae4210f60c8699e42833ee981
+  data.tar.gz: e74c3c0d2767da9680e676b63541ca458b40a4bfeca325b0324d184b434163f9ca53ec5e136f1dc849c3f160dce0436cb0706226fbf3054572b10ec22ad3addf

data/app/assets/javascripts/decidim/accountability/admin/accountability_admin.js.es6

@@ -0,0 +1,46 @@
+// = require_self
+
+$("#result_decidim_accountability_status_id").change(function () {
+  /* eslint-disable no-invalid-this */
+  const progress = $(this).find(':selected').data('progress')
+  if (progress || progress === 0) {
+    $("#result_progress").val(progress);
+  }
+});
+
+$(function() {
+  $(document).on("open.zf.reveal", "#data_picker-modal", function () {
+    let xhr = null;
+
+    $('#data_picker-autocomplete').autoComplete({
+      minChars: 2,
+      source: function(term, response) {
+        try {
+          xhr.abort();
+        } catch (exception) { xhr = null}
+
+        xhr = $.getJSON(
+          'proposals.json',
+          { term: term },
+          function(data) { response(data); }
+        );
+      },
+      renderItem: function (item, search) {
+        let sanitizedSearch = search.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+        let re = new RegExp(`(${sanitizedSearch.split(' ').join('|')})`, "gi");
+        let title = item[0]
+        let modelId = item[1]
+        let val = `#${modelId}- ${title}`;
+        return `<div class="autocomplete-suggestion" data-model-id="${modelId}" data-val ="${title}">${val.replace(re, "<b>$1</b>")}</div>`;
+      },
+      onSelect: function(event, term, item) {
+        let choose = $('#proposal-picker-choose')
+        let modelId = item.data('modelId')
+        let val = `#${modelId}- ${item.data('val')}`;
+        choose.data('picker-value', modelId)
+        choose.data('picker-text', val)
+        choose.data('picker-choose', '')
+      }
+    })
+  });
+})

data/app/assets/javascripts/decidim/accountability/version_diff.js.es6

@@ -4,12 +4,8 @@ $(() => {
   $(".diff-i18n_html, .diff-i18n").each(function(_index, element) {
     const diffElement = $(element);
     const valueElement = diffElement.find(".diff__value");
-    const oldValue = valueElement.data("old-value").
-          replace(/</g, "&lt;").
-          replace(/>/g, "&gt;");
-    const newValue = valueElement.data("new-value").
-          replace(/</g, "&lt;").
-          replace(/>/g, "&gt;");
+    const oldValue = valueElement.data("old-value").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+    const newValue = valueElement.data("new-value").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 
     const diff = JsDiff.diffChars(oldValue, newValue);
     let outputHTML = "";

data/app/commands/decidim/accountability/admin/create_result.rb

@@ -21,6 +21,7 @@ module Decidim
             link_meetings
             link_proposals
             link_projects
+            notify_proposal_followers
           end
 
           broadcast(:ok)
@@ -76,6 +77,20 @@ module Decidim
         def link_meetings
           result.link_resources(meetings, "meetings_through_proposals")
         end
+
+        def notify_proposal_followers
+          proposals.includes(:author).each do |proposal|
+            Decidim::EventsManager.publish(
+              event: "decidim.events.accountability.proposal_linked",
+              event_class: Decidim::Accountability::ProposalLinkedEvent,
+              resource: result,
+              recipient_ids: Array(proposal&.author&.id) + proposal.followers.pluck(:id),
+              extra: {
+                proposal_id: proposal.id
+              }
+            )
+          end
+        end
       end
     end
   end

data/app/commands/decidim/accountability/admin/update_status.rb

@@ -33,7 +33,7 @@ module Decidim
         attr_reader :status, :form
 
         def update_status
-          status.update_attributes!(
+          status.update!(
             key: @form.key,
             name: @form.name,
             description: @form.description,

data/app/commands/decidim/accountability/admin/update_timeline_entry.rb

@@ -33,7 +33,7 @@ module Decidim
         attr_reader :timeline_entry, :form
 
         def update_timeline_entry
-          timeline_entry.update_attributes!(
+          timeline_entry.update!(
             entry_date: @form.entry_date,
             description: @form.description
           )

data/app/controllers/decidim/accountability/admin/results_controller.rb

@@ -56,6 +56,26 @@ module Decidim
           redirect_to results_path(parent_id: result.parent_id)
         end
 
+        def proposals
+          respond_to do |format|
+            format.html do
+              render partial: "proposals"
+            end
+            format.json do
+              query = Decidim.find_resource_manifest(:proposals)
+                             .try(:resource_scope, current_feature)&.order(title: :asc)
+              term = params[:term]
+              if term&.start_with?("#")
+                term.delete!("#")
+                query = query.where("CAST(id AS TEXT) LIKE ?", "#{term}%")
+              else
+                query = query.where("title ilike ?", "%#{params[:term]}%")
+              end
+              render json: query.all.collect { |p| [p.title, p.id] }
+            end
+          end
+        end
+
         private
 
         def results

data/app/events/decidim/accountability/proposal_linked_event.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    class ProposalLinkedEvent < Decidim::Events::SimpleEvent
+      i18n_attributes :proposal_title, :proposal_path
+
+      def proposal_path
+        @proposal_path ||= Decidim::ResourceLocatorPresenter.new(proposal).path
+      end
+
+      def proposal_title
+        @proposal_title ||= proposal.title
+      end
+
+      def proposal
+        @proposal ||= resource.linked_resources(:proposals, "included_proposals").where(id: extra[:proposal_id]).first
+      end
+    end
+  end
+end

data/app/forms/decidim/accountability/admin/result_form.rb

@@ -26,11 +26,12 @@ module Decidim
 
         validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
-        validate { errors.add(:decidim_scope_id, :invalid) if current_participatory_space&.scope && !current_participatory_space&.scope&.ancestor_of?(scope) }
 
         validates :parent, presence: true, if: ->(form) { form.parent_id.present? }
         validates :status, presence: true, if: ->(form) { form.decidim_accountability_status_id.present? }
 
+        validate :scope_belongs_to_participatory_space_scope
+
         delegate :categories, to: :current_feature
 
         def map_model(model)
@@ -40,7 +41,10 @@ module Decidim
         end
 
         def proposals
-          @proposals ||= Decidim.find_resource_manifest(:proposals).try(:resource_scope, current_feature)&.order(title: :asc)&.pluck(:title, :id)
+          @proposals ||= Decidim.find_resource_manifest(:proposals)
+                                .try(:resource_scope, current_feature)
+                                &.where(id: proposal_ids)
+                                &.order(title: :asc)
         end
 
         def projects
@@ -52,7 +56,7 @@ module Decidim
         #
         # Returns a Decidim::Scope
         def scope
-          @scope ||= @decidim_scope_id ? current_feature.scopes.find_by(id: @decidim_scope_id) : current_participatory_space&.scope
+          @scope ||= @decidim_scope_id ? current_participatory_space.scopes.find_by(id: @decidim_scope_id) : current_participatory_space.scope
         end
 
         # Scope identifier
@@ -73,6 +77,12 @@ module Decidim
         def status
           @status ||= Decidim::Accountability::Status.find_by(feature: current_feature, id: decidim_accountability_status_id)
         end
+
+        private
+
+        def scope_belongs_to_participatory_space_scope
+          errors.add(:decidim_scope_id, :invalid) if current_participatory_space.out_of_scope?(scope)
+        end
       end
     end
   end

data/app/models/decidim/accountability/result.rb

@@ -7,7 +7,7 @@ module Decidim
     class Result < Accountability::ApplicationRecord
       include Decidim::Resourceable
       include Decidim::HasFeature
-      include Decidim::HasScope
+      include Decidim::ScopableFeature
       include Decidim::HasCategory
       include Decidim::HasReference
       include Decidim::Comments::Commentable
@@ -25,6 +25,13 @@ module Decidim
 
       after_save :update_parent_progress, if: -> { parent_id.present? }
 
+      def self.order_randomly(seed)
+        transaction do
+          connection.execute("SELECT setseed(#{connection.quote(seed)})")
+          order("RANDOM()").load
+        end
+      end
+
       def update_parent_progress
         return if parent.blank?
 

data/app/presenters/decidim/accountability/admin_log/result_presenter.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Accountability::Result`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    ResultPresenter.new(action_log, view_helpers).present
+      class ResultPresenter < Decidim::Log::BasePresenter
+        private
+
+        def action_string
+          case action
+          when "create"
+            "decidim.accountability.admin_log.result.create"
+          when "update"
+            "decidim.accountability.admin_log.result.update"
+          end
+        end
+
+        def diff_fields_mapping
+          {
+            start_date: :date,
+            end_date: :date,
+            description: :i18n,
+            title: :i18n,
+            decidim_scope_id: :scope,
+            progress: :percentage
+          }
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.result"
+        end
+      end
+    end
+  end
+end

data/app/views/decidim/accountability/admin/results/_form.html.erb

@@ -54,11 +54,9 @@
 
     <div class="row column">
       <% if @form.proposals %>
-        <%= form.select :proposal_ids,
-                        @form.proposals,
-                        {},
-                        { multiple: true, class: "chosen-select" }
-        %>
+        <% picker_options = { id: "decidim_accountability_proposals", class: "picker-multiple", name: 'result[proposal_ids]', multiple: true }
+        prompt_params= { url: 'proposals', text: t(".add_proposal") } %>
+        <%= form.data_picker(:proposals, picker_options, prompt_params) {|item| { url: 'proposals', text: "##{item.id}- #{item.title}" }} %>
       <% end %>
     </div>
 

data/app/views/decidim/accountability/admin/results/_proposals.html.erb

@@ -0,0 +1,12 @@
+<div class="picker-header">
+  <h1><%= t(".current_selection") %></h1>
+</div>
+<div class="picker-content">
+  <input type="text" name="proposal-search" id="data_picker-autocomplete"/>
+</div>
+<div class="picker-footer">
+  <div class="buttons button--double">
+    <a id="proposal-picker-choose" class="button mute" href="proposals" data-picker-value="" data-picker-text="" ><%= t(".select") %></a>
+    <a class="button clear" data-close=""><%= t(".close") %></a>
+  </div>
+</div>

data/app/views/decidim/accountability/results/_home_categories.html.erb

@@ -28,14 +28,14 @@
                 <p class="heading3">
                 <%= link_to translated_attribute(category.name),results_path(filter: { category_id: category, scope_id: current_scope }) %></p>
 
-                <% if progress_calculator(current_scope, category.id).present? %>
+                <% if feature_settings.display_progress_enabled? && progress_calculator(current_scope, category.id).present? %>
                   <div class="progress">
                     <div class="progress-meter" style="width:<%= progress_calculator(current_scope, category.id) %>%"></div>
                   </div>
                 <% end %>
 
                 <div class="progress-info">
-                  <% if progress_calculator(current_scope, category.id).present? %>
+                  <% if feature_settings.display_progress_enabled? && progress_calculator(current_scope, category.id).present? %>
                     <div class="progress-figure heading3">
                       <%= display_percentage progress_calculator(current_scope, category.id) %>
                     </div>
@@ -55,7 +55,7 @@
                       <div class="category--line">
                         <strong><%= translated_attribute(subcategory.name) %></strong>
 
-                        <% if progress_calculator(current_scope, subcategory.id).present? %>
+                        <% if feature_settings.display_progress_enabled? && progress_calculator(current_scope, subcategory.id).present? %>
                           <div class="progress-figure heading3">
                             <%= display_percentage progress_calculator(current_scope, subcategory.id) %>
                           </div>

data/app/views/decidim/accountability/results/_home_header.html.erb

@@ -4,7 +4,7 @@
       <%== translated_attribute feature_settings.intro %>
     </div>
 
-    <% if progress_calculator(current_scope, nil).present? %>
+    <% if feature_settings.display_progress_enabled? && progress_calculator(current_scope, nil).present? %>
       <div class="small-12 medium-5 columns">
         <div class="progress-level">
           <p><%= t(".global_status") %></p>

data/app/views/decidim/accountability/results/_nav_breadcrumb.html.erb

@@ -1,12 +1,16 @@
 <div class="lines-breadcrumb">
   <%= link_to t(".global"), root_path %>
-  <span class="percentage"><%= display_percentage progress_calculator(current_scope, nil) %></span>
+  <% if feature_settings.display_progress_enabled? %>
+    <span class="percentage"><%= display_percentage progress_calculator(current_scope, nil) %></span>
+  <% end %>
 
   <% if category.present? && category.parent.present? %>
     <span class="breadcrumb--separator">></span>
     <div>
       <%= link_to translated_attribute(category.parent.name), results_path(filter: { category_id: category.parent_id, scope_id: current_scope }) %>
-      <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.parent_id) %></span>
+      <% if feature_settings.display_progress_enabled? %>
+        <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.parent_id) %></span>
+      <% end %>
     </div>
   <% end %>
 
@@ -14,7 +18,9 @@
     <span class="breadcrumb--separator">></span>
     <div>
       <%= link_to translated_attribute(category.name), results_path(filter: { category_id: category.id, scope_id: current_scope }) %>
-      <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.id) %></span>
+      <% if feature_settings.display_progress_enabled? %>
+        <span class="percentage"><%= display_percentage progress_calculator(current_scope, category.id) %></span>
+      <% end %>
     </div>
   <% end %>
 
@@ -22,7 +28,9 @@
     <span class="breadcrumb--separator">></span>
     <div>
       <%= link_to translated_attribute(result.parent.title), result_path(result.parent, filter: { scope_id: current_scope }) %>
-      <span class="percentage"><%= display_percentage result.parent.progress %></span>
+      <% if feature_settings.display_progress_enabled? %>
+        <span class="percentage"><%= display_percentage result.parent.progress %></span>
+      <% end %>
     </div>
   <% end %>
 

data/app/views/decidim/accountability/results/_results_leaf.html.erb

@@ -34,7 +34,7 @@
             </div>
           <% end %>
 
-          <% if result.progress.present? %>
+          <% if feature_settings.display_progress_enabled? && result.progress.present? %>
             <div class="card--list__data">
               <span class="card--list__data__number"><%= display_percentage result.progress %></span>
             </div>

data/app/views/decidim/accountability/results/_results_parent.html.erb

@@ -19,7 +19,7 @@
             <span class="text-small"><%= heading_leaf_level_results(result.children.count) %></span>
           <% end %>
 
-          <% if result.progress.present? %>
+          <% if feature_settings.display_progress_enabled? && result.progress.present? %>
             <div class="card--list__data">
               <span class="card--list__data__number"><%= display_percentage result.progress %></span>
             </div>

data/app/views/decidim/accountability/results/_show_leaf.html.erb

@@ -9,7 +9,7 @@
     </div>
 
     <div class="row">
-      <% if result.progress.present? %>
+      <% if feature_settings.display_progress_enabled? && result.progress.present? %>
         <div class="columns section mediumlarge-3 mediumlarge-push-9">
           <div class="progress-level">
             <div class="progress-label">

data/app/views/decidim/accountability/results/_show_parent.html.erb

@@ -1,4 +1,4 @@
-<div class="row accountability">
+<div class="row accountability result-view">
   <div class="small-12 columns">
     <%= render partial: "decidim/accountability/results/nav_breadcrumb", locals: { category: result.try(:category) } %>
   </div>

data/app/views/decidim/accountability/results/_stats_box.html.erb

@@ -1,4 +1,20 @@
 <div class="columns section mediumlarge-4 large-3">
+
+  <% if result.children.any? && feature_settings.display_progress_enabled? && result.progress.present? %>
+    <div class="progress-level section">
+      <div class="progress-label">
+        <span class="progress-text"><%= t("models.result.fields.progress", scope: "decidim.accountability") %>:</span>
+        <span class="progress-figure">
+          <%= display_percentage result.progress %>
+        </span>
+      </div>
+
+      <div class="progress">
+        <div class="progress-meter" style="width:<%= result.progress %>%"></div>
+      </div>
+    </div>
+  <% end %>
+
   <% if result.versions.any? || result.linked_resources(:proposals, "included_proposals").any? %>
     <div class="card extra line-stats">
       <div class="definition-data">
@@ -6,7 +22,9 @@
           <div class="definition-data__item versions_count">
             <span class="definition-data__title"><%= t("results.show.stats.version_number", scope: "decidim.accountability") %></span>
             <%= result.versions.count %>
-            <%= link_to t("results.show.stats.show_all_versions", scope: "decidim.accountability"), result_versions_path(result), class: "button button--sc hollow secondary small expanded" %>
+            <div class="pr-s pl-s">
+              <%= link_to t("results.show.stats.show_all_versions", scope: "decidim.accountability"), result_versions_path(result), class: "button button--sc hollow secondary small expanded" %>
+            </div>
           </div>
           <% if result.last_editor.present? %>
             <div class="definition-data__item last_revision_by">
@@ -49,7 +67,7 @@
     </div>
   <% end %>
 
-  <%= feature_reference(result) %>
+  <%= resource_reference(result) %>
   <%= render partial: "decidim/shared/share_modal" %>
   <%= embed_modal_for result_result_widget_url(result, format: :js) %>
 </div>