decidim-accountability 0.21.0 → 0.22.0

data/app/jobs/application_job.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class ApplicationJob < ActiveJob::Base
+end

data/app/jobs/decidim/accountability/admin/import_results_csv_job.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      class ImportResultsCSVJob < ApplicationJob
+        queue_as :default
+
+        def perform(current_user, current_component, csv_file)
+          importer = Decidim::Accountability::ResultsCSVImporter.new(current_component, csv_file, current_user)
+
+          errors = importer.import!
+
+          Decidim::Accountability::ImportMailer.import(current_user, errors).deliver_now
+        end
+      end
+    end
+  end
+end

data/app/mailers/decidim/accountability/import_mailer.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    # This mailer sends a notification email containing the result of importing a
+    # CSV of results.
+    class ImportMailer < Decidim::ApplicationMailer
+      # Public: Sends a notification email with the result of a CSV import
+      # of results.
+      #
+      # user   - The user to be notified.
+      # errors - The list of errors generated by the import
+      #
+      # Returns nothing.
+      def import(user, errors)
+        @user = user
+        @organization = user.organization
+        @errors = errors
+
+        with_user(user) do
+          mail(to: "#{user.name} <#{user.email}>", subject: I18n.t("decidim.accountability.import_mailer.import.subject"))
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/accountability/metrics/results_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           cumulative.each do |key, cumulative_value|
             next if cumulative_value.zero?
 
@@ -26,10 +23,8 @@ module Decidim
                                                            related_object_type: "Decidim::Component",
                                                            related_object_id: related_object_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private
@@ -40,9 +35,8 @@ module Decidim
           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::Accountability::Result.select(:decidim_component_id)
-                                                  .where(component: components)
+                                                  .where(component: visible_component_ids_from_spaces(spaces))
                                                   .joins(:component)
                                                   .left_outer_joins(:category)
           @query = @query.where("decidim_accountability_results.created_at <= ?", end_time)

data/app/services/decidim/accountability/results_csv_importer.rb

@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+require "csv"
+
+module Decidim
+  module Accountability
+    # This class handles importing results from a CSV file.
+    # Needs a `current_component` param with a `Decidim::component`
+    # in order to import the results in that component.
+    class ResultsCSVImporter
+      include Decidim::FormFactory
+
+      # Public: Initializes the service.
+      # component     - A Decidim::component to import the results into.
+      # csv_file      - The contents of the CSV to read.
+      def initialize(component, csv_file, current_user)
+        @component = component
+        @csv_file = csv_file
+
+        @extra_context = {
+          current_component: component,
+          current_organization: component.organization,
+          current_user: current_user,
+          current_participatory_space: component.participatory_space
+        }
+        @matches_ids = []
+      end
+
+      def import!
+        errors = []
+
+        ActiveRecord::Base.transaction do
+          i = 1
+          csv = CSV.new(@csv_file, headers: true, col_sep: ";")
+          while (row = csv.shift).present?
+            i += 1
+            next if row.empty?
+
+            params = set_params_for_import_result_form(row, @component)
+            existing_result = Decidim::Accountability::Result.find_by(id: row["id"], component: @component) if row["id"].present?
+            params["result"].merge!(parse_date_params(row, "start_date"))
+            params["result"].merge!(parse_date_params(row, "end_date"))
+            @form = form(Decidim::Accountability::Admin::ResultForm).from_params(params, @extra_context)
+            errors << [i, @form.errors.full_messages] if @form.errors.any?
+
+            if existing_result.present?
+              Decidim::Accountability::Admin::UpdateImportedResult.call(@form, existing_result, params["result"]["parent/id"]) do
+                on(:invalid) do
+                  errors << [i, @form.errors.full_messages]
+                end
+              end
+            else
+              Decidim::Accountability::Admin::CreateImportedResult.call(@form, params["result"]["parent/id"]) do
+                on(:invalid) do
+                  errors << [i, @form.errors.full_messages]
+                end
+              end
+              add_match_id(row["id"])
+            end
+
+          end
+
+          raise ActiveRecord::Rollback if errors.any?
+
+          update_parents
+          remove_invalid_results
+
+          Rails.logger.info "Processed: #{i}"
+        end
+
+        errors
+      end
+
+      private
+
+      def set_params_for_import_result_form(row, component)
+        params = {}
+        params["result"] = row.to_hash
+        default_locale = component.participatory_space.organization.default_locale
+        available_locales = component.participatory_space.organization.available_locales
+        params["result"].merge!(get_locale_attributes(default_locale, available_locales, :title, row))
+        params["result"].merge!(get_locale_attributes(default_locale, available_locales, :description, row))
+        params["result"]["decidim_category_id"] = row["category/id"] if row["category/id"].present?
+        params["result"]["decidim_accountability_status_id"] = row["status/id"] if row["status/id"].present?
+        params["result"].merge!(get_proposal_ids(row["proposal_urls"]))
+        params
+      end
+
+      def get_locale_attributes(default_locale, available_locales, field, row)
+        array_field_localized = available_locales.map do |locale|
+          if row["#{field}/#{locale}"].present?
+            ["#{field}_#{locale}", row["#{field}/#{locale}"]]
+          else
+            ["#{field}_#{locale}", row["#{field}/#{default_locale}"]]
+          end
+        end
+
+        Hash[*array_field_localized.flatten]
+      end
+
+      def parse_date_params(row, field)
+        begin
+          return { field => Date.parse(row[field]) } if row[field].present?
+        rescue ArgumentError
+          @form.errors.add(field.to_sym, :invalid_date)
+        end
+        {}
+      end
+
+      def get_proposal_ids(proposal_urls)
+        if proposal_urls.present?
+          proposal_urls = proposal_urls.split(";")
+          { "proposal_ids" => proposal_urls.map { |proposal_url| proposal_url.scan(/\d$/).first.to_i } }
+        else
+          {}
+        end
+      end
+
+      def add_match_id(id)
+        last_created_result = Decidim::Accountability::Result.last
+        @matches_ids << [id, Decidim::Accountability::Result.last.id] if id.present? && last_created_result.present?
+      end
+
+      def update_parents
+        @matches_ids.each do |match|
+          Decidim::Accountability::Result.where(component: @component, parent_id: match.first).find_each { |result| result.update(parent_id: match.last) }
+        end
+      end
+
+      def remove_invalid_results
+        Decidim::Accountability::Result.includes(:parent).references(:parent)
+                                       .where(parents_decidim_accountability_results: { id: nil })
+                                       .where.not(parent_id: nil).each do |result|
+          DestroyResult.call(result, @extra_context[:current_user])
+        end
+      end
+    end
+  end
+end

data/app/views/decidim/accountability/admin/import_results/new.html.erb

@@ -0,0 +1,22 @@
+<%= form_tag(import_results_path, multipart: true, class: "form new_import") do %>
+  <div class="card">
+    <div class="card-divider">
+      <h2 class="card-title">
+        <%= t(".title") %>
+      </h2>
+    </div>
+
+    <div class="card-section">
+      <div class="row column">
+        <%= file_field_tag :csv_file %>
+      </div>
+    </div>
+  </div>
+
+  <div class="button--double form-general-submit">
+    <%= submit_tag t(".import"), class: "button" %>
+  </div>
+  <div class="import-process-info">
+    <%= t(".info", link_new_status: new_status_path, link_new_result: new_result_path, link_export_csv: link_to(t(".link"), exports_path(@current_component, id: "results", format: "CSV"), method: :post)).try("html_safe") %>
+  </div>
+<% end %>

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

@@ -53,11 +53,7 @@
     </div>
 
     <div class="row column">
-      <% if @form.proposals %>
-        <% picker_options = { id: "decidim_accountability_proposals", class: "picker-multiple", name: "result[proposal_ids]", multiple: true }
-        prompt_params= { url: proposals_results_path(current_component, format: :html), text: t(".add_proposal") } %>
-        <%= form.data_picker(:proposals, picker_options, prompt_params) {|item| { url:proposals_results_path(current_component, format: :json), text: "##{item.id}- #{present(item).title}" }} %>
-      <% end %>
+      <%= proposals_picker(form, :proposals, proposals_picker_results_path) %>
     </div>
 
     <div class="row column">

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

@@ -7,6 +7,7 @@
         <%= link_to t("actions.new", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")), new_result_path(parent_id: parent_result), class: "button tiny button--simple" if allowed_to? :create, :result %>
         <%= render partial: "decidim/accountability/admin/shared/subnav" unless parent_result %>
         <%= export_dropdown %>
+        <%= link_to t("actions.import_csv", scope: "decidim.accountability"), import_results_path, class: "button tiny button--simple" if allowed_to? :create, :result %>
       </div>
     </h2>
   </div>

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

@@ -0,0 +1 @@
+<%= cell "decidim/proposals/proposals_picker", current_component %>

data/app/views/decidim/accountability/import_mailer/import.html.erb

@@ -0,0 +1,25 @@
+<% if @errors.empty? %>
+  <p><%= t(".success") %></p>
+<% else %>
+  <p><%= t(".errors_present") %>:</p>
+  <table>
+    <thead>
+      <tr>
+        <th><%= t(".row_number") %></th>
+        <th><%= t(".errors") %></th>
+      </tr>
+    </thead>
+    <% @errors.each do |error| %>
+      <tr>
+        <td><%= error.first %></td>
+        <td>
+          <ul>
+            <% error.last.each do |error_message| %>
+              <li><%= error_message %></li>
+            <% end %>
+          </ul>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>

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

@@ -1,7 +1,7 @@
 <div class="card card--action card--list">
   <% resources.each do |result| %>
     <div class="card--list__item">
-      <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
+      <%= icon "actions", class: "card--list__icon", role: "img", "aria-hidden": true, remove_icon_class: true %>
       <%= link_to resource_locator(result).path, class: "card--list__text card__link card__link--block" do %>
         <h5 class="card--list__heading">
           <%= translated_attribute(result.title) %>

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

@@ -1,7 +1,7 @@
 <div class="title-action">
-  <h2 id="results-count" class="title-action__title section-heading">
+  <h3 id="results-count" class="title-action__title section-heading">
     <%= heading_leaf_level_results(total_count) %>
-  </h2>
+  </h3>
 </div>
 
 <div class="row">
@@ -9,12 +9,12 @@
     <div class="card card--action card--list">
       <% results.each do |result| %>
         <div class="card--list__item">
-          <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
+          <%= icon "actions", class: "card--list__icon", role: "img", "aria-hidden": true, remove_icon_class: true %>
 
           <%= link_to result_path(result), class: "card--list__text card__link card__link--block" do %>
-            <h5 class="card--list__heading">
+            <h4 class="card--list__heading">
               <%= translated_attribute(result.title) %>
-            </h5>
+            </h4>
 
             <div class="text-small card--meta">
               <% if result.start_date %>

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

@@ -12,9 +12,9 @@
           <%= icon "proposals", class: "card--list__icon", remove_icon_class: true %>
 
           <%= link_to result, class: "card--list__text card__link card__link--block" do %>
-            <h5 class="card--list__heading">
+            <h3 class="card--list__heading">
               <%= translated_attribute result.title %>
-            </h5>
+            </h3>
 
             <span class="text-small"><%= heading_leaf_level_results(result.children.count) %></span>
           <% end %>

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

@@ -3,15 +3,28 @@
     <div><%= t("results.filters.scopes", scope: "decidim.accountability") %></div>
 
     <ul class="tags tags--action">
-      <li <%= active_class_if_current(nil) %>><%= link_to t("results.filters.all", scope: "decidim.accountability"), url_for(filter: { category_id: category.try(:id) }) %></li>
+      <li <%= active_class_if_current(nil) %>>
+          <%= link_to url_for(filter: { category_id: category.try(:id) }) do %>
+            <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 2) %></span>
+            <%= t("results.filters.all", scope: "decidim.accountability") %>
+          <% end %>
+      </li>
 
       <% if current_participatory_space.scope %>
         <li <%= active_class_if_current(current_participatory_space.scope.id) %>>
-          <%= link_to translated_attribute(current_participatory_space.scope.name), url_for(filter: { scope_id: current_participatory_space.scope.id, category_id: category.try(:id) }) %>
+          <%= link_to url_for(filter: { scope_id: current_participatory_space.scope.id, category_id: category.try(:id) }) do %>
+            <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 1) %></span>
+            <%= translated_attribute(current_participatory_space.scope.name) %>
+          <% end %>
         </li>
       <% end %>
       <% current_participatory_space.subscopes.each do |scope| %>
-        <li <%= active_class_if_current(scope.id) %>><%= link_to translated_attribute(scope.name), url_for(filter: { scope_id: scope.id, category_id: category.try(:id) }) %></li>
+        <li <%= active_class_if_current(scope.id) %>>
+          <%= link_to url_for(filter: { scope_id: scope.id, category_id: category.try(:id) }) do %>
+            <span class="show-for-sr"><%= Decidim::Scope.model_name.human(count: 1) %></span>
+            <%= translated_attribute(scope.name) %>
+          <% end %>
+        </li>
       <% end %>
     </ul>
   <% end %>

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

@@ -1,10 +1,10 @@
 <%= form_tag results_path, method: :get do %>
   <div class="filters__search">
     <div class="input-group">
-      <%= search_field_tag "filter[search_text]", nil, label: false, class: "input-group-field", placeholder: t(".search"), value: "" %>
+      <%= search_field_tag "filter[search_text]", nil, class: "input-group-field", placeholder: t(".search"), value: "", title:  t(".search") %>
       <div class="input-group-button">
-        <button type="submit" class="button button--muted">
-          <%= icon "magnifying-glass", aria_label: t(".search") %>
+        <button type="submit" class="button">
+          <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
         </button>
       </div>
     </div>

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

@@ -20,10 +20,17 @@
       <div class="definition-data">
         <% if result.versions.any? %>
           <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 %>
-            <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>
+              <%= resource_version_number(result.versions_count, "text-large") %>
+              <small class="text-medium">
+                <%= resource_version_of(result.versions_count) %>
+              </small>
+            </div>
+
+            <div>
+              <span class="text-medium">
+                <%= link_to_other_resource_versions(result_versions_path(result)) %>
+              </span>
             </div>
           </div>
           <% if result.last_editor.present? %>

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

@@ -12,9 +12,9 @@
               <span class="timeline__date text-small">
                 <%= timeline_entry.entry_date %>
               </span>
-              <h6 class="timeline__title">
+              <h4 class="timeline__title">
                 <%= translated_attribute timeline_entry.description %>
-              </h6>
+              </h4>
             </div>
           </div>
         </li>

data/app/views/decidim/accountability/versions/index.html.erb

@@ -1,30 +1,12 @@
 <div class="row accountability">
   <div class="small-12 columns">
-    <%= render partial: "decidim/accountability/results/nav_breadcrumb", locals: { category: result.parent.try(:category) || result.try(:category) } %>
+    <%= render partial: "decidim/accountability/results/nav_breadcrumb", locals: { category: versioned_resource.parent.try(:category) || versioned_resource.try(:category) } %>
   </div>
-  <div class="small-12 columns">
-    <h2 class="heading2"><%= t(".changes_at_title", title: translated_attribute(result.title)) %></h2>
-    <h3 class="section-heading"><%= t(".title") %></h3>
-    <div class="row">
-      <div class="mediumlarge-8 columns">
-        <div class="section">
-          <div class="card card--list">
-            <% result.versions.each_with_index do |version, index| %>
-              <%= render partial: "version", locals: { version: version, index: index } %>
-            <% end %>
-          </div>
-        </div>
-      </div>
 
-      <div class="columns section mediumlarge-4 large-3">
-        <div class="card extra definition-data">
-          <div class="definition-data__item versions_count">
-            <span class="definition-data__title"><%= t("results.show.stats.number_of_versions", scope: "decidim.accountability") %></span>
-            <%= result.versions.count %>
-            <%= link_to t("results.show.stats.back_to_result", scope: "decidim.accountability"), result_path(result), class: "button button--sc hollow secondary small expanded" %>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
+  <%= cell(
+    "decidim/versions_list",
+    versioned_resource,
+    version_path: proc { |version_index| url_for(action: :show, id: version_index) },
+    i18n_scope: "decidim.accountability.results.show.stats"
+  ) %>
 </div>