decidim-accountability 0.29.2 → 0.30.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43f35b21e55effc7e92ab2e3b8a285df1df272b48dd9c4ea7ca06319a39edc26
-  data.tar.gz: a552464f9116bec684aed401a7a36a42b70aff5b9cc4e4e55d65612f5fb71e02
+  metadata.gz: ee1c81f532c4c5934094ba4cb1f70a9a573da7aa9b697ebfc1eabb69377c8ef2
+  data.tar.gz: d081e74e8cf51ba5a8298c998c0d5a18eb39888897fcfd74834e1a33963f423b
 SHA512:
-  metadata.gz: f854c1286bf9af4b4d91a3fac03510876b2daa53348a8691895c56badb8c5ee56cb5d0f1cd60c9ba66326e1dd6caf6b72161ad0838832a9bddb72076b7611c57
-  data.tar.gz: '09a99fabed41149b2ad409ff3858049410c8128b1f678cc196f2baa78a9904c42b249876a7d3442e655de0351b6c96d1f11ecda125b350c95b835570b60e4cfa'
+  metadata.gz: d6f2bbadda6bf327b89d8a7c0ef96476759ee48580e041d6be3766c302cd23e7876d62212f70e4b589cc47714d23a59d547aba299a9d2c6c351ffbd1c61c3113
+  data.tar.gz: a5679d380a08c830b265d241409b1d3e3e862da22d317b45db17324a3c1d6244c714fc69e355564862a9ade0253225fa38b27631f6403f23ed5ca51100f9110e

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

@@ -8,4 +8,10 @@
   </div>
 </section>
 
+<% if component_settings.geocoding_enabled? && result.geocoded? %>
+  <div class="static-map__container py-6">
+    <%= render partial: "decidim/shared/static_map", formats: [:html], locals: { icon_name: "proposals", geolocalizable: result } %>
+  </div>
+<% end %>
+
 <%= cell "decidim/tab_panels", tab_panel_items %>

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

@@ -7,6 +7,7 @@ module Decidim
     # This cell renders a project
     class ProjectCell < Decidim::ViewModel
       include Decidim::Accountability::ApplicationHelper
+      include Cell::ViewModel::Partial
       delegate :children, :timeline_entries, to: :model
 
       alias result model
@@ -15,26 +16,16 @@ module Decidim
         render template
       end
 
-      private
-
-      def template
-        @template ||= options[:template] || :show
-      end
-
-      def title
-        decidim_escape_translated result.title
-      end
-
-      def description
-        decidim_sanitize_admin translated_attribute(result.description)
-      end
-
-      def scope
-        current_scope.presence
-      end
-
       def tab_panel_items
         [
+          {
+            enabled: ResultHistoryCell.new(result).render?,
+            id: "included_history",
+            text: t("decidim.history", scope: "activerecord.models", count: 2),
+            icon: resource_type_icon_key("history"),
+            method: :cell,
+            args: ["decidim/accountability/result_history", result]
+          },
           {
             enabled: timeline_entries.any?,
             id: "timeline_entries",
@@ -50,33 +41,23 @@ module Decidim
             icon: "briefcase-2-line",
             method: :cell,
             args: ["decidim/accountability/results", result.children]
-          },
-          {
-            enabled: result.linked_resources(:proposals, "included_proposals").present?,
-            id: "included_proposals",
-            text: t("activemodel.attributes.result.proposals"),
-            icon: "chat-new-line",
-            method: :cell,
-            args: ["decidim/linked_resources_for", result, { type: :proposals, link_name: "included_proposals" }]
-          },
-          {
-            enabled: result.linked_resources(:projects, "included_projects").present?,
-            id: "included_projects",
-            text: t("activemodel.attributes.result.project_ids"),
-            icon: "git-pull-request-line",
-            method: :cell,
-            args: ["decidim/linked_resources_for", result, { type: :projects, link_name: "included_projects" }]
-          },
-          {
-            enabled: result.linked_resources(:meetings, "meetings_through_proposals").present?,
-            id: "included_meetings",
-            text: t("activemodel.attributes.result.meetings_ids"),
-            icon: "treasure-map-line",
-            method: :cell,
-            args: ["decidim/linked_resources_for", result, { type: :meetings, link_name: "meetings_through_proposals" }]
           }
         ] + attachments_tab_panel_items(result)
       end
+
+      private
+
+      def template
+        @template ||= options[:template] || :show
+      end
+
+      def title
+        decidim_escape_translated result.title
+      end
+
+      def description
+        decidim_sanitize_admin translated_attribute(result.description)
+      end
     end
   end
 end

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

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    # This cell is used to render a result history panel of a resource
+    # inside a tab of a show view
+    #
+    # The `model` must be an accountability result resource to get the history from.
+    #
+    # Example:
+    #
+    #   cell(
+    #     "decidim/result_history",
+    #     result
+    #   )
+    class ResultHistoryCell < Decidim::ResourceHistoryCell
+      include Decidim::Accountability::ApplicationHelper
+
+      def linked_resources_items
+        [
+          {
+            resources: @model.linked_resources(:proposals, "included_proposals"),
+
+            link_name: "included_proposals",
+            text_key: "decidim.accountability.result.proposal_ids",
+            icon_key: "Decidim::Proposals::Proposal"
+          },
+          {
+            resources: @model.linked_resources(:projects, "included_projects"),
+            link_name: "included_projects",
+            text_key: "decidim.accountability.result.project_ids",
+            icon_key: "Decidim::Budgets::Project"
+          },
+          {
+            resources: @model.linked_resources(:meetings, "meetings_through_proposals"),
+            link_name: "meetings_through_proposals",
+            text_key: "decidim.accountability.result.meetings_ids",
+            icon_key: "Decidim::Meetings::Meeting"
+          }
+        ]
+      end
+
+      def creation_item
+        {
+          id: "result_creation",
+          date: @model.created_at,
+          text: t("decidim.accountability.creation.text"),
+          icon: resource_type_icon_key("Decidim::Accountability::Result")
+        }
+      end
+
+      def history_cell_id
+        "result"
+      end
+    end
+  end
+end

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

@@ -6,7 +6,7 @@ module Decidim
     class ResultMetadataCell < Decidim::CardMetadataCell
       include Decidim::Accountability::Engine.routes.url_helpers
 
-      delegate :start_date, :end_date, :status, :category, :parent, :reference, to: :model
+      delegate :start_date, :end_date, :status, :parent, :reference, to: :model
 
       alias result model
 
@@ -26,7 +26,7 @@ module Decidim
         return [dates_item, status_item, status_description] if template == :project_aside
         return [reference, versions] if template == :show_footer
 
-        [dates_item_compact, status_item_compact, category_item]
+        [dates_item_compact, status_item_compact] + taxonomy_items
       end
 
       def template
@@ -56,15 +56,6 @@ module Decidim
         { partial: :versions }
       end
 
-      def category_item
-        return if inherited_category.blank?
-
-        {
-          text: translated_attribute(inherited_category.name),
-          icon: resource_type_icon_key(category.class)
-        }
-      end
-
       def status_item_compact
         return if status.blank?
 
@@ -74,12 +65,6 @@ module Decidim
         }
       end
 
-      def inherited_category
-        return category if category.present?
-
-        parent&.category
-      end
-
       def dates_item
         return if start_date.blank?
 
@@ -122,6 +107,21 @@ module Decidim
         }
       end
 
+      def percentage_item
+        {
+          text: display_percentage(result.progress)
+        }
+      end
+
+      def items_for_map
+        [percentage_item].compact_blank.map do |item|
+          {
+            text: item[:text].to_s.html_safe,
+            icon: item[:icon].present? ? icon(item[:icon]).html_safe : nil
+          }
+        end
+      end
+
       def has_dates?
         start_date.present? && end_date.present?
       end

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

@@ -4,7 +4,7 @@ require "cell/partial"
 
 module Decidim
   module Accountability
-    # This cell renders the status of a category
+    # This cell renders the status of a taxonomy or a result.
     class StatusCell < Decidim::ViewModel
       include Decidim::Accountability::ApplicationHelper
       include Decidim::Accountability::BreadcrumbHelper
@@ -26,16 +26,12 @@ module Decidim
 
       private
 
-      def scope
-        current_scope.presence
-      end
-
       def url
         options[:url]
       end
 
       def title
-        if model.is_a? Decidim::Category
+        if model.is_a? Decidim::Taxonomy
           decidim_escape_translated(model.name)
         else
           options[:title]
@@ -43,20 +39,20 @@ module Decidim
       end
 
       def results_count
-        @results_count ||= if model.is_a? Decidim::Category
-                             count_calculator(scope, model.id)
+        @results_count ||= if model.is_a? Decidim::Taxonomy
+                             count_calculator(model.id)
                            else
                              options[:count]
                            end
       end
 
       def progress
-        if model.is_a? Decidim::Category
-          progress_calculator(scope, model.id).presence
+        if model.is_a? Decidim::Taxonomy
+          progress_calculator(model.id).presence
         elsif model.respond_to?(:progress)
           model.progress
         else
-          options[:progress] || progress_calculator(scope, nil).presence
+          options[:progress] || progress_calculator(nil).presence
         end
       end
 
@@ -84,8 +80,8 @@ module Decidim
         options[:render_count]
       end
 
-      def count_calculator(scope_id, category_id)
-        Decidim::Accountability::ResultsCalculator.new(current_component, scope_id, category_id).count
+      def count_calculator(taxonomy_id)
+        Decidim::Accountability::ResultsCalculator.new(current_component, taxonomy_id).count
       end
 
       def decidim

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

@@ -8,7 +8,7 @@ module Decidim
       class CreateImportedResult < Decidim::Commands::CreateResource
         include Decidim::Accountability::Admin::HasResultCommand
 
-        fetch_form_attributes :scope, :component, :category, :parent_id, :title, :description, :start_date,
+        fetch_form_attributes :taxonomizations, :component, :parent_id, :title, :description, :start_date,
                               :end_date, :progress, :decidim_accountability_status_id, :external_id, :weight
 
         def initialize(form, parent_id = nil)

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

@@ -8,8 +8,9 @@ module Decidim
       class CreateResult < Decidim::Commands::CreateResource
         include Decidim::Accountability::Admin::HasResultCommand
 
-        fetch_form_attributes :scope, :component, :category, :parent_id, :title, :description, :start_date,
-                              :end_date, :progress, :decidim_accountability_status_id, :external_id, :weight
+        fetch_form_attributes :component, :taxonomizations, :parent_id, :title, :description, :start_date,
+                              :end_date, :progress, :decidim_accountability_status_id, :external_id, :weight,
+                              :address, :latitude, :longitude
 
         private
 

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # A command with all the business logic when an admin imports projects from
+      # one component to accountability.
+      class ImportComponentToAccountability < Decidim::Command
+        attr_reader :form
+
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        def initialize(form)
+          @form = form
+        end
+
+        def call
+          return broadcast(:invalid) unless form.valid?
+
+          job_class.perform_later(selected_items.pluck(:id), form.current_component, form.current_user)
+          broadcast(:ok, selected_items.count)
+        end
+
+        private
+
+        def selected_items
+          form.filtered_items
+        end
+
+        def manifest_name
+          form.origin_component.manifest_name
+        end
+
+        def job_class
+          if manifest_name == "budgets"
+            ImportProjectsJob
+          elsif manifest_name == "proposals"
+            ImportProposalsJob
+          else
+            raise "Invalid component"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module Decidim
       class UpdateImportedResult < Decidim::Commands::UpdateResource
         include Decidim::Accountability::Admin::HasResultCommand
 
-        fetch_form_attributes :scope, :category, :title, :description, :start_date, :end_date, :progress,
+        fetch_form_attributes :taxonomizations, :title, :description, :start_date, :end_date, :progress,
                               :decidim_accountability_status_id, :external_id, :weight
 
         # Initializes an UpdateImportedResult Command.

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

@@ -8,8 +8,9 @@ module Decidim
       class UpdateResult < Decidim::Commands::UpdateResource
         include Decidim::Accountability::Admin::HasResultCommand
 
-        fetch_form_attributes :scope, :category, :parent_id, :title, :description, :start_date, :end_date,
-                              :progress, :decidim_accountability_status_id, :external_id, :weight
+        fetch_form_attributes :taxonomizations, :parent_id, :title, :description, :start_date, :end_date,
+                              :progress, :decidim_accountability_status_id, :external_id, :weight,
+                              :address, :latitude, :longitude
 
         private
 

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # A command with all the business logic when an admin batch updates results dates.
+      class UpdateResultDates < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # start_date - the start date to update
+        # end_date - the end date to update
+        # result_ids - the results ids to update
+        # current_user - the user performing the action
+        def initialize(start_date, end_date, result_ids, current_user)
+          @start_date = start_date
+          @end_date = end_date
+          @result_ids = result_ids
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if (start_date.blank? && end_date.blank?) || result_ids.blank?
+
+          update_results_dates
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :start_date, :end_date, :result_ids, :current_user
+
+        def update_results_dates
+          Decidim::Accountability::Result.where(id: result_ids).find_each do |result|
+            next if result.start_date == start_date && result.end_date == end_date
+
+            result.update!(start_date:, end_date:)
+
+            # Trace the action to keep track of changes
+            Decidim.traceability.perform_action!(
+              "update",
+              result,
+              current_user
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # A command with all the business logic when an admin batch updates results status.
+      class UpdateResultStatus < Decidim::Command
+        # Public: Initializes the command.
+        #
+        # status_id - the status id to update
+        # result_ids - the results ids to update
+        # current_user - the user performing the action
+        def initialize(status_id, result_ids, current_user)
+          @status_id = status_id
+          @result_ids = result_ids
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid
+        # - :invalid if the form was not valid and we could not proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if status_id.blank? || result_ids.blank?
+
+          update_results_status
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :status_id, :result_ids, :current_user
+
+        def update_results_status
+          Decidim::Accountability::Result.where(id: result_ids).find_each do |result|
+            next if result.decidim_accountability_status_id == status_id
+
+            status = Decidim::Accountability::Status.find_by(id: status_id)
+
+            next if status.blank?
+
+            result.update!(
+              decidim_accountability_status_id: status_id,
+              progress: status.progress
+            )
+
+            # Trace the action to keep track of changes
+            Decidim.traceability.perform_action!(
+              "update",
+              result,
+              current_user
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # A command with all the business logic when an admin batch updates results taxonomies.
+      class UpdateResultTaxonomies < UpdateResourcesTaxonomies
+        # Public: Initializes the command.
+        #
+        # taxonomy_ids - the taxonomy ids to update
+        # result_ids - the results ids to update.
+        def initialize(taxonomy_ids, result_ids, organization)
+          super(taxonomy_ids, Decidim::Accountability::Result.where(id: result_ids), organization)
+        end
+      end
+    end
+  end
+end

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

@@ -16,7 +16,11 @@ module Decidim
           private
 
           def base_query
-            collection
+            return collection unless taxonomy_order_or_search?
+
+            # this is a trick to avoid duplicates when using search in associations as suggested in:
+            # https://activerecord-hackery.github.io/ransack/going-further/other-notes/#problem-with-distinct-selects
+            collection.includes(:taxonomies).joins(:taxonomies)
           end
 
           def search_field_predicate
@@ -25,16 +29,14 @@ module Decidim
 
           def filters
             [
-              :scope_id_eq,
-              :category_id_eq,
+              :taxonomies_part_of_contains,
               :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),
+              taxonomies_part_of_contains: taxonomy_ids_hash(available_root_taxonomies),
               status_id_eq: status_ids_hash(statuses)
             }
           end
@@ -42,7 +44,7 @@ module Decidim
           # Cannot 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]
+            [:taxonomies_part_of_contains, :status_id_eq]
           end
 
           def status_ids_hash(statuses)

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    module Admin
+      # This controller allows an admin to import results from a component
+      class ImportComponentsController < Admin::ApplicationController
+        def new
+          enforce_permission_to :create, :import_component
+          @form = form(Admin::ImportComponentForm).from_params(params, accountability_component: current_component)
+        end
+
+        def create
+          enforce_permission_to :create, :import_component
+          @form = form(Admin::ImportComponentForm).from_params(params, accountability_component: current_component)
+
+          ImportComponentToAccountability.call(@form) do
+            on(:ok) do |projects|
+              flash[:notice] = I18n.t("import_components.new.success", scope: "decidim.accountability.admin", count: projects)
+              redirect_to results_path
+            end
+
+            on(:invalid) do
+              flash[:alert] = I18n.t("import_components.create.invalid", scope: "decidim.accountability.admin")
+              render action: "new"
+            end
+          end
+        end
+
+        def results_import_params
+          params[:results_import] || {}
+        end
+      end
+    end
+  end
+end