decidim-accountability 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e9e9da0373bafcee830512c9e911e0176767832d826719ccae2a52b441f2f2
-  data.tar.gz: 6cd880e63873b91f6a0dbdd79e066bbd9e04e9a235aacc895a2cb0bc9f0a483c
+  metadata.gz: 5aa01ab3845ef9d564662b490d22e56aaf88d857de85adfb06f3a58d8bd827a8
+  data.tar.gz: 44725f2f514ebc97eb45725e26d067406b24b5d6e71affd3aa5f6978ba92260b
 SHA512:
-  metadata.gz: 04a259f346030214c5963d31cfd3240ecc58cd6c4d0f222b52b4b20a215475043faa6a430370e285e48aba86d8582fbcf7c7b1246af885fb88e76782470a26c7
-  data.tar.gz: cd0f61547ca931bf560d0f1a5d9393c1c5548c8d220a86bad841e1ff64a6d07f0a52987919d137af4236dd40a815a723e2ed39dd84d8a99fff0854497be36178
+  metadata.gz: 591653254ddaa34353fd6f010b51bfa122675f9abae01e027ee0d3dfedae70837e4f230c01549e68d181025d71d36f4d5458030f12857d556b63a3363d684513
+  data.tar.gz: 66c9eb1f5bbf2b68d4a4ae82d5f49161b83e1cef65a435d4e923d20c7e0dba61060dbae6031b484e6ed1915e9baf834153af075bc259b1ef25ef6cbe3e88722d

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

@@ -1,47 +1,11 @@
 // = 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}
-
-        let url = $("#proposal-picker-choose").attr("href")
-        xhr = $.getJSON(
-          url,
-          { 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", "")
-      }
-    })
+  $("#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);
+    }
   });
 })

data/app/assets/stylesheets/decidim/accountability/accountability/_categories.scss

@@ -1,5 +1,13 @@
 .accountability{
   .categories{
+    a:hover{
+      text-decoration: underline;
+    }
+
+    a:focus{
+      outline: $anchor-outline-focus;
+    }
+
     .categories--header{
       border-bottom: 1px solid $medium-gray;
       padding-bottom: 1rem;
@@ -10,7 +18,6 @@
       }
 
       span{
-        text-transform: uppercase;
         font-size: 1.15rem;
         color: lighten($dark-gray, 50);
       }

data/app/assets/stylesheets/decidim/accountability/accountability/_lines_breadcrumb.scss

@@ -13,6 +13,14 @@
   a{
     font-weight: 600;
     color: $dark-gray;
+
+    &:hover{
+      text-decoration: underline;
+    }
+
+    &:focus{
+      outline: 2px solid $secondary;
+    }
   }
 
   ul{

data/app/assets/stylesheets/decidim/accountability/accountability/_results.scss

@@ -10,7 +10,6 @@
 
       p{
         font-weight: 600;
-        text-transform: uppercase;
         margin-bottom: .25rem;
         display: inline-block;
         margin-right: .5rem;
@@ -44,7 +43,6 @@
   .scope-filters{
     div{
       color: lighten($dark-gray, 50);
-      text-transform: uppercase;
       margin-bottom: .15rem;
     }
 
@@ -107,7 +105,6 @@
       margin-bottom: .5rem;
 
       .progress-text{
-        text-transform: uppercase;
         color: lighten($dark-gray, 30);
       }
 

data/app/cells/decidim/accountability/highlighted_results_for_component/show.erb

@@ -1,7 +1,7 @@
 <section class="section row collapse highlighted_results">
-  <h4 class="section-heading">
+  <h3 class="section-heading">
     <%= translated_attribute(model.name) %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_results.see_all", count: results_count) %></a>
-  </h4>
+  </h3>
 
   <div class="row">
     <div class="columns accountability">
@@ -16,6 +16,6 @@
   <%= link_to(
     t("decidim.participatory_spaces.highlighted_results.see_all", count: results_count),
     main_component_path(model),
-    class: "button button--sc light secondary button--right"
+    class: "button button--sc hollow button--right"
   ) %>
 </section>

data/app/cells/decidim/accountability/highlighted_results_for_component_cell.rb

@@ -25,7 +25,7 @@ module Decidim
       end
 
       def results_to_render
-        @results_to_render ||= results.limit(4)
+        @results_to_render ||= results.includes(:component, :status).limit(4)
       end
 
       def results_count

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

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # This command is executed when the user creates a Result from the admin
+      # panel.
+      class CreateImportedResult < Rectify::Command
+        def initialize(form, parent_id = nil)
+          @form = form
+          @parent_id = parent_id
+        end
+
+        # Creates the result if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if @form.invalid?
+
+          transaction do
+            create_result
+            link_meetings
+            link_proposals
+            link_projects
+            notify_proposal_followers
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :result
+
+        def create_result
+          params = {
+            component: @form.current_component,
+            scope: @form.scope,
+            category: @form.category,
+            parent_id: @parent_id,
+            title: @form.title,
+            description: @form.description,
+            start_date: @form.start_date,
+            end_date: @form.end_date,
+            progress: @form.progress,
+            decidim_accountability_status_id: @form.decidim_accountability_status_id,
+            external_id: @form.external_id.presence,
+            weight: @form.weight
+          }
+
+          @result = Decidim.traceability.create!(
+            Result,
+            @form.current_user,
+            params,
+            visibility: "all"
+          )
+        end
+
+        def proposals
+          @proposals ||= result.sibling_scope(:proposals).where(id: @form.proposal_ids)
+        end
+
+        def projects
+          @projects ||= result.sibling_scope(:projects).where(id: @form.project_ids)
+        end
+
+        def meeting_ids
+          @meeting_ids ||= proposals.flat_map do |proposal|
+            proposal.linked_resources(:meetings, "proposals_from_meeting").pluck(:id)
+          end.uniq
+        end
+
+        def meetings
+          @meetings ||= result.sibling_scope(:meetings).where(id: meeting_ids)
+        end
+
+        def link_proposals
+          result.link_resources(proposals, "included_proposals")
+        end
+
+        def link_projects
+          result.link_resources(projects, "included_projects")
+        end
+
+        def link_meetings
+          result.link_resources(meetings, "meetings_through_proposals")
+        end
+
+        def notify_proposal_followers
+          proposals.each do |proposal|
+            Decidim::EventsManager.publish(
+              event: "decidim.events.accountability.proposal_linked",
+              event_class: Decidim::Accountability::ProposalLinkedEvent,
+              resource: result,
+              affected_users: proposal.notifiable_identities,
+              followers: proposal.followers - proposal.notifiable_identities,
+              extra: {
+                proposal_id: proposal.id
+              }
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # This command is executed when the user changes a Result from the admin
+      # panel.
+      class UpdateImportedResult < Rectify::Command
+        # Initializes an UpdateResult Command.
+        #
+        # form - The form from which to get the data.
+        # result - The current instance of the result to be updated.
+        def initialize(form, result, parent_id = nil)
+          @form = form
+          @result = result
+          @parent_id = parent_id
+        end
+
+        # Updates the result if valid.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          transaction do
+            update_result
+            link_proposals
+            link_meetings
+            link_projects
+            send_notifications if should_notify_followers?
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :result, :form
+
+        def update_result
+          Decidim.traceability.update!(
+            result,
+            form.current_user,
+            scope: @form.scope,
+            category: @form.category,
+            parent_id: @parent_id,
+            title: @form.title,
+            description: @form.description,
+            start_date: @form.start_date,
+            end_date: @form.end_date,
+            progress: @form.progress,
+            decidim_accountability_status_id: @form.decidim_accountability_status_id,
+            external_id: @form.external_id.presence,
+            weight: @form.weight
+          )
+        end
+
+        def proposals
+          @proposals ||= result.sibling_scope(:proposals).where(id: form.proposal_ids)
+        end
+
+        def projects
+          @projects ||= result.sibling_scope(:projects).where(id: form.project_ids)
+        end
+
+        def meeting_ids
+          @meeting_ids ||= proposals.flat_map do |proposal|
+            proposal.linked_resources(:meetings, "proposals_from_meeting").pluck(:id)
+          end.uniq
+        end
+
+        def meetings
+          @meetings ||= result.sibling_scope(:meetings).where(id: meeting_ids)
+        end
+
+        def link_proposals
+          result.link_resources(proposals, "included_proposals")
+        end
+
+        def link_projects
+          result.link_resources(projects, "included_projects")
+        end
+
+        def link_meetings
+          result.link_resources(meetings, "meetings_through_proposals")
+        end
+
+        def send_notifications
+          result.linked_resources(:proposals, "included_proposals").each do |proposal|
+            Decidim::EventsManager.publish(
+              event: "decidim.events.accountability.result_progress_updated",
+              event_class: Decidim::Accountability::ResultProgressUpdatedEvent,
+              resource: result,
+              affected_users: proposal.notifiable_identities,
+              followers: proposal.followers - proposal.notifiable_identities,
+              extra: {
+                progress: result.progress,
+                proposal_id: proposal.id
+              }
+            )
+          end
+        end
+
+        def should_notify_followers?
+          result.previous_changes["progress"].present?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # This controller allows an admin to import results from a csv file for the Accountability component
+      class ImportResultsController < Admin::ApplicationController
+        def new
+          @errors = []
+        end
+
+        def create
+          @csv_file = params[:csv_file]
+          redirect_to(new_import_path) && return if @csv_file.blank?
+
+          Decidim::Accountability::Admin::ImportResultsCSVJob.perform_later(current_user, current_component, @csv_file.read.force_encoding("utf-8").encode("utf-8"))
+
+          flash[:notice] = I18n.t("imports.create.success", scope: "decidim.accountability.admin")
+          redirect_to import_results_path(current_participatory_process, current_component)
+        end
+
+        private
+
+        def current_component
+          @current_component ||= current_participatory_process.components.find(params[:component_id])
+        end
+
+        def current_participatory_process
+          @current_participatory_process ||= ParticipatoryProcess.find_by(slug: params[:participatory_process_slug])
+        end
+      end
+    end
+  end
+end

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

@@ -7,6 +7,8 @@ module Decidim
       class ResultsController < Admin::ApplicationController
         include Decidim::ApplicationHelper
         include Decidim::SanitizeHelper
+        include Decidim::Proposals::Admin::Picker
+
         helper_method :results, :parent_result, :parent_results, :statuses, :present
 
         def new
@@ -70,26 +72,6 @@ module Decidim
           end
         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_component)&.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| [decidim_html_escape(present(p).title), p.id] }
-            end
-          end
-        end
-
         private
 
         def results

data/app/controllers/decidim/accountability/versions_controller.rb

@@ -5,20 +5,19 @@ module Decidim
     # Exposes result versions so users can see how a result
     # has been updated through time.
     class VersionsController < Decidim::Accountability::ApplicationController
-      helper Decidim::TraceabilityHelper
       helper Decidim::Accountability::BreadcrumbHelper
-      helper_method :current_version, :result
+      helper_method :result
 
-      private
+      include Decidim::ResourceVersionsConcern
 
-      def result
-        @result ||= Result.includes(:timeline_entries).where(component: current_component).find(params[:result_id])
+      def versioned_resource
+        result
       end
 
-      def current_version
-        return nil if params[:id].to_i < 1
+      private
 
-        @current_version ||= result.versions[params[:id].to_i - 1]
+      def result
+        @result ||= Result.includes(:timeline_entries).where(component: current_component).find(params[:result_id])
       end
     end
   end