decidim-accountability 0.23.6 → 0.24.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ce96ae91a720e16bcb00ef08ecc591f3c2b745e9477899e6dcba1e047368cb4
-  data.tar.gz: d38b8df3a202df3b02f4d5e365de1b3cdaeeb4555bc9a46b571adec17d46086f
+  metadata.gz: 3aeeb3df403af11940179f41c281ae20360e99256bff59af649ffaf4fd948831
+  data.tar.gz: '0688c728710710d6f8d71e6d9616dff24ba1db42f228872d690d062b114581e7'
 SHA512:
-  metadata.gz: 62f51bb0508d85a6edc40caf4431fb7b48829185c8e1af97da084228de8fe246729f52068228ec69f21309e75b64855742f066d9d7f5dffd3d8e5a19a0018fd1
-  data.tar.gz: 83c8ae56abdd69e06d9dac23df6e4407c0c42c6bfa583f394371fb3bc06084dcab9f0a51639d26e43e1941fbe9b9555c483c1147512791741d5f48ffb811cb11
+  metadata.gz: 951f9469d7fa1f1fbed9305f5e98738753909f0b6f26922863d7403760d787353fb764cecf304bcfaaea35d2e1ad317a0c79c63c9817b8be1994f328bb1fbc9f
+  data.tar.gz: e972cfaad10fd5858ebec98f457e92ddda0e862f3057a9385cafa320881dd4314f21714c4d3e16d04a0dd4ff261cca3ae5b8afc05099e9aff830b7718aa5223f

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

@@ -1,6 +1,7 @@
 .accountability{
   .categories{
     a:hover{
+      background-color: var(--secondary);
       text-decoration: underline;
     }
 
@@ -68,7 +69,7 @@
 
       .card__link{
         .category--line{
-          background: $light-gray-dark;
+          background-color: var(--secondary);
           border-radius: 4px;
           min-height: 9rem;
           padding: 1rem;
@@ -77,7 +78,7 @@
 
           strong{
             font-weight: 600;
-            color: $secondary;
+            color: var(--secondary);
           }
 
           .progress-figure{
@@ -86,7 +87,7 @@
           }
 
           .category--count{
-            color: lighten($dark-gray, 50);
+            color: lighten($secondary, 50);
             position: absolute;
             right: 1rem;
             bottom: 1rem;
@@ -96,7 +97,7 @@
 
         &:hover{
           .category--count{
-            color: lighten($dark-gray, 50);
+            color: lighten($secondary, 50);
           }
 
           strong{

data/app/cells/decidim/accountability/content_blocks/highlighted_results/elements.erb

@@ -0,0 +1,5 @@
+<div class="row small-up-1 medium-up-2 mediumlarge-up-3 large-up-3 card-grid">
+  <% elements.each do |element| %>
+    <%= card_for element, context: { show_space: true } %>
+  <% end %>
+</div>

data/app/cells/decidim/accountability/content_blocks/highlighted_results/heading.erb

@@ -0,0 +1 @@
+<h2 class="section-heading"><%= t("decidim.accountability.content_blocks.highlighted_results.results") %></h2>

data/app/cells/decidim/accountability/content_blocks/highlighted_results_cell.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module ContentBlocks
+      class HighlightedResultsCell < Decidim::ContentBlocks::HighlightedElementsCell
+        include Cell::ViewModel::Partial
+        include Decidim::IconHelper
+        include Decidim::Accountability::ApplicationHelper
+        include ActiveSupport::NumberHelper
+
+        def base_relation
+          @base_relation ||= Decidim::Accountability::Result.where(component: published_components)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Accountability
+    # This cell renders the result card for an instance of a Result
+    # the default size is the Medium Card (:m)
+    class ResultCell < Decidim::ViewModel
+      def show
+        cell card_size, model, options
+      end
+
+      private
+
+      def card_size
+        "decidim/accountability/result_m"
+      end
+    end
+  end
+end

data/app/cells/decidim/accountability/result_m/data.erb

@@ -0,0 +1,23 @@
+<% if has_dates? %>
+  <div class="card__icondata">
+    <ul class="card-data">
+      <li class="card-data__item">
+        <%= icon "datetime", class: "icon--big", role: "img", aria_label: t("decidim.accountability.content_blocks.highlighted_results.dates") %>
+      </li>
+      <li class="card-data__item">
+        <div class="card-data__item--centerblock">
+          <strong><%= t("activemodel.attributes.result.start_date") %></strong>
+          <br>
+          <%= start_date ? l(start_date, format: :decidim_short) : t("decidim.accountability.content_blocks.highlighted_results.unspecified") %>
+        </div>
+      </li>
+      <li class="card-data__item">
+        <div class="card-data__item--centerblock">
+          <strong><%= t("activemodel.attributes.result.end_date") %></strong>
+          <br>
+          <%= end_date ? l(end_date, format: :decidim_short) : t("decidim.accountability.content_blocks.highlighted_results.unspecified") %>
+        </div>
+      </li>
+    </ul>
+  </div>
+<% end %>

data/app/cells/decidim/accountability/result_m/footer.erb

@@ -0,0 +1,22 @@
+<div class="card__footer">
+  <div class="card__support">
+    <% if progress.present? %>
+      <div id="<%= "accountability-result-#{model.id}-progress" %>" class="progress__bar">
+        <div class="progress__bar__title">
+          <span class="progress__bar__number"><%= progress_text %></span>
+          <span class="progress__bar__text"><%= t("decidim.accountability.result_m.executed") %></span>
+        </div>
+        <div class="progress progress__bar__bar" role="progressbar" tabindex="0" aria-valuenow="<%= progress %>" aria-valuemin="0" aria-valuetext="<%= progress %> percent" aria-valuemax="100">
+          <div class="progress-meter progress__bar__bar--complete" style="width: <%= progress %>%"></div>
+          <div class="progress__bar__bar--incomplete" style="width:calc(100% - <%= progress %>%);"></div>
+        </div>
+      </div>
+    <% end %>
+
+    <%= link_to(
+      t("decidim.accountability.result_m.view"),
+      resource_path,
+      class: "card__button button button--sc secondary light small"
+    ) %>
+  </div>
+</div>

data/app/cells/decidim/accountability/result_m/tags.erb

@@ -0,0 +1 @@
+<%= cell "decidim/tags", model, context: { extra_classes: ["tags--result"] } %>

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Accountability
+    # This cell renders the Medium (:m) result card
+    # for an instance of a Result
+    class ResultMCell < Decidim::CardMCell
+      include Decidim::SanitizeHelper
+      include Decidim::TranslationsHelper
+      include ActiveSupport::NumberHelper
+
+      delegate :start_date, :end_date, :progress, to: :model
+
+      private
+
+      def resource_path
+        resource_locator(model).path
+      end
+
+      def progress_text
+        return if progress.blank?
+
+        number_to_percentage(progress, precision: 1, strip_insignificant_zeros: true, locale: I18n.locale, format: "%n%")
+      end
+
+      def statuses
+        []
+      end
+
+      def has_dates?
+        start_date.present? && end_date.present?
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/accountability/admin/filterable.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require "active_support/concern"
+
+module Decidim
+  module Accountability
+    module Admin
+      module Filterable
+        extend ActiveSupport::Concern
+
+        included do
+          include Decidim::Admin::Filterable
+
+          helper Decidim::Accountability::Admin::FilterableHelper
+
+          private
+
+          def base_query
+            collection
+          end
+
+          def search_field_predicate
+            :id_string_or_title_cont
+          end
+
+          def filters
+            [
+              :scope_id_eq,
+              :category_id_eq,
+              :status_id_eq
+            ]
+          end
+
+          def filters_with_values
+            {
+              scope_id_eq: scope_ids_hash(scopes.top_level),
+              category_id_eq: category_ids_hash(categories.first_class),
+              status_id_eq: status_ids_hash(statuses)
+            }
+          end
+
+          # Can't user `super` here, because it does not belong to a superclass
+          # but to a concern.
+          def dynamically_translated_filters
+            [:scope_id_eq, :category_id_eq, :status_id_eq]
+          end
+
+          def status_ids_hash(statuses)
+            statuses.each_with_object({}) { |status, hash| hash[status.id] = status.id }
+          end
+
+          def translated_status_id_eq(id)
+            translated_attribute(statuses.find_by(id: id).name)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # Controller that allows managing all the attachment collections for an
+      # accountability result.
+      #
+      class AttachmentCollectionsController < Admin::ApplicationController
+        include Decidim::Admin::Concerns::HasAttachmentCollections
+
+        def after_destroy_path
+          result_attachment_collections_path(result, result.component, current_participatory_space)
+        end
+
+        def collection_for
+          result
+        end
+
+        def result
+          @result ||= results.find(params[:result_id])
+        end
+
+        private
+
+        def results
+          @results ||= Result.where(component: current_component)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # Controller that allows managing all the attachments for an
+      # accountability result.
+      #
+      class AttachmentsController < Admin::ApplicationController
+        include Decidim::Admin::Concerns::HasAttachments
+
+        def after_destroy_path
+          results_path
+        end
+
+        def attached_to
+          result
+        end
+
+        def result
+          @result ||= results.find(params[:result_id])
+        end
+
+        private
+
+        def results
+          @results ||= Result.where(component: current_component)
+        end
+      end
+    end
+  end
+end

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

@@ -8,9 +8,15 @@ module Decidim
         include Decidim::ApplicationHelper
         include Decidim::SanitizeHelper
         include Decidim::Proposals::Admin::Picker
+        include Decidim::Accountability::Admin::Filterable
 
         helper_method :results, :parent_result, :parent_results, :statuses, :present
 
+        def collection
+          parent_id = params[:parent_id].presence
+          @collection ||= Result.where(component: current_component, parent_id: parent_id).page(params[:page]).per(15)
+        end
+
         def new
           enforce_permission_to :create, :result
 
@@ -75,8 +81,7 @@ module Decidim
         private
 
         def results
-          parent_id = params[:parent_id].presence
-          @results ||= Result.where(component: current_component, parent_id: parent_id).page(params[:page]).per(15)
+          @results ||= filtered_collection
         end
 
         def result

data/app/helpers/decidim/accountability/admin/filterable_helper.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      module FilterableHelper
+      end
+    end
+  end
+end

data/app/helpers/decidim/accountability/breadcrumb_helper.rb

@@ -18,7 +18,9 @@ module Decidim
       end
 
       def category
-        current_participatory_space.categories.find(params[:filter][:category_id]) if params[:filter] && params[:filter][:category_id].present?
+        return if (category_id = params.dig(:filter, :category_id)).blank?
+
+        @category ||= current_participatory_space.categories.find(category_id.is_a?(Array) ? category_id.first : category_id)
       end
     end
   end

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

@@ -6,6 +6,8 @@ module Decidim
     # title, description and any other useful information to render a custom result.
     class Result < Accountability::ApplicationRecord
       include Decidim::Resourceable
+      include Decidim::HasAttachments
+      include Decidim::HasAttachmentCollections
       include Decidim::HasComponent
       include Decidim::ScopableResource
       include Decidim::HasCategory
@@ -23,13 +25,15 @@ module Decidim
       translatable_fields :title, :description
 
       has_many :children, foreign_key: "parent_id", class_name: "Decidim::Accountability::Result", inverse_of: :parent, dependent: :destroy
-      belongs_to :parent, foreign_key: "parent_id", class_name: "Decidim::Accountability::Result", inverse_of: :children, optional: true, counter_cache: :children_count
+      belongs_to :parent, class_name: "Decidim::Accountability::Result", inverse_of: :children, optional: true, counter_cache: :children_count
 
       belongs_to :status, foreign_key: "decidim_accountability_status_id", class_name: "Decidim::Accountability::Status", inverse_of: :results, optional: true
 
       has_many :timeline_entries, -> { order(:entry_date) }, foreign_key: "decidim_accountability_result_id",
                                                              class_name: "Decidim::Accountability::TimelineEntry", inverse_of: :result, dependent: :destroy
 
+      scope :order_by_most_recent, -> { order(created_at: :desc) }
+
       after_save :update_parent_progress, if: -> { parent_id.present? }
 
       searchable_fields(
@@ -87,6 +91,15 @@ module Decidim
         can_participate_in_space?(user)
       end
 
+      ransacker :id_string do
+        Arel.sql(%{cast("decidim_accountability_results"."id" as text)})
+      end
+
+      # Allow ransacker to search for a key in a hstore column (`title`.`en`)
+      ransacker :title do |parent|
+        Arel::Nodes::InfixOperation.new("->>", parent.table[:title], Arel::Nodes.build_quoted(I18n.locale.to_s))
+      end
+
       private
 
       # Private: When a row uses weight 1 and there's more than one, weight shouldn't be considered
@@ -94,7 +107,7 @@ module Decidim
       def children_use_weighted_progress?
         return false if children.pluck(:weight).all?(&:nil?)
 
-        children.length == 1 || children.pluck(:weight).none? { |weight| weight == 1.0 }
+        children.length == 1 || children.pluck(:weight).none? { |weight| weight&.to_d == 1.0.to_d }
       end
     end
   end

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

@@ -16,6 +16,11 @@ module Decidim
 
       validates :key, presence: true, uniqueness: { scope: :decidim_component_id }
       validates :name, presence: true
+
+      # Allow ransacker to search for a key in a hstore column (`name`.`en`)
+      ransacker :name do |parent|
+        Arel::Nodes::InfixOperation.new("->>", parent.table[:name], Arel::Nodes.build_quoted(I18n.locale.to_s))
+      end
     end
   end
 end

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

@@ -12,23 +12,65 @@
     </h2>
   </div>
 
+  <%= admin_filter_selector(:results) %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
         <thead>
           <tr>
-            <th><%= t("models.result.fields.title", scope: "decidim.accountability") %></th>
-            <%= th_resource_scope_label %>
+            <th>
+              <%= sort_link(query, :id, t("models.result.fields.id", scope: "decidim.accountability"), default_order: :desc ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :title, t("models.result.fields.title", scope: "decidim.accountability")) %>
+            </th>
+            <th>
+              <%= sort_link(query, :category_name, t("models.result.fields.category", scope: "decidim.accountability") ) %>
+            </th>
+            <% if resource_with_scopes_enabled? %>
+              <th>
+                <%= sort_link(query, :scope_name, t("models.result.fields.scope", scope: "decidim.accountability") ) %>
+              </th>
+            <% end %>
+            <th>
+              <%= sort_link(query, :status_name, t("models.result.fields.status", scope: "decidim.accountability") ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :progress, t("models.result.fields.progress", scope: "decidim.accountability") ) %>
+            </th>
+            <th>
+              <%= sort_link(query, :created_at, t("models.result.fields.created_at", scope: "decidim.accountability") ) %>
+            </th>
             <th class="actions"><%= t("actions.title", scope: "decidim.accountability") %></th>
           </tr>
         </thead>
         <tbody>
           <% results.each do |result| %>
             <tr data-id="<%= result.id %>">
+              <td>
+                <%= result.id %><br>
+              </td>
               <td>
                 <%= link_to translated_attribute(result.title), results_path(parent_id: result.id) %><br>
               </td>
+              <td>
+                <% if result.category %>
+                  <%= translated_attribute result.category.name %>
+                <% end %>
+              </td>
               <%= td_resource_scope_for(result.scope) %>
+              <td>
+                <% if result.status %>
+                  <%= translated_attribute result.status.name %>
+                <% end %>
+              </td>
+              <td>
+                <%= result.progress&.to_i %>
+              </td>
+              <td>
+                <%= l result.created_at, format: :decidim_short %>
+              </td>
+
               <td class="table-list__actions">
                 <%= icon_link_to "eye", resource_locator(result).path, t("actions.preview", scope: "decidim.accountability"), class: "action-icon--preview", target: :blank %>
 
@@ -44,6 +86,14 @@
                   <%= icon_link_to "pencil", edit_result_path(result), t("actions.edit", scope: "decidim.accountability"), class: "action-icon--edit" %>
                 <% end %>
 
+                <% if allowed_to? :update, :result, result: result %>
+                    <%= icon_link_to "folder", result_attachment_collections_path(result), t("actions.attachment_collections", scope: "decidim.accountability"), class: "action-icon--attachment_collections" %>
+                <% end %>
+
+                <% if allowed_to? :update, :result, result: result %>
+                  <%= icon_link_to "paperclip", result_attachments_path(result), t("actions.attachments", scope: "decidim.accountability"), class: "action-icon--attachments" %>
+                <% end %>
+
                 <% if allowed_to? :destroy, :result, result: result %>
                   <%= icon_link_to "circle-x", result_path(result), t("actions.destroy", scope: "decidim.accountability"), class: "action-icon--remove", method: :delete, data: { confirm: t("actions.confirm_destroy", scope: "decidim.accountability", name: t("models.result.name", scope: "decidim.accountability.admin")) } %>
                 <% end %>