decidim-accountability 0.27.9 → 0.28.0.rc4

data/lib/decidim/api/result_type.rb

@@ -3,6 +3,7 @@
 module Decidim
   module Accountability
     class ResultType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
       implements Decidim::Core::CategorizableInterface
       implements Decidim::Comments::CommentableInterface
       implements Decidim::Core::ScopableInterface

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.27.9
+  version: 0.28.0.rc4
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-10 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,126 +18,126 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.9
+        version: 0.28.0.rc4
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -149,24 +149,34 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/cells/decidim/accountability/content_blocks/highlighted_results/elements.erb
-- app/cells/decidim/accountability/content_blocks/highlighted_results/heading.erb
 - app/cells/decidim/accountability/content_blocks/highlighted_results_cell.rb
 - app/cells/decidim/accountability/highlighted_results/show.erb
 - app/cells/decidim/accountability/highlighted_results_cell.rb
 - app/cells/decidim/accountability/highlighted_results_for_component/show.erb
 - app/cells/decidim/accountability/highlighted_results_for_component_cell.rb
+- app/cells/decidim/accountability/project/show.erb
+- app/cells/decidim/accountability/project/timeline.erb
+- app/cells/decidim/accountability/project_cell.rb
 - app/cells/decidim/accountability/result_activity_cell.rb
+- app/cells/decidim/accountability/result_card_cell.rb
 - app/cells/decidim/accountability/result_cell.rb
-- app/cells/decidim/accountability/result_m/data.erb
-- app/cells/decidim/accountability/result_m/footer.erb
-- app/cells/decidim/accountability/result_m/tags.erb
-- app/cells/decidim/accountability/result_m_cell.rb
+- app/cells/decidim/accountability/result_l/extra_data.erb
+- app/cells/decidim/accountability/result_l_cell.rb
+- app/cells/decidim/accountability/result_metadata/project_aside.erb
+- app/cells/decidim/accountability/result_metadata/show_footer.erb
+- app/cells/decidim/accountability/result_metadata/versions.erb
+- app/cells/decidim/accountability/result_metadata_cell.rb
+- app/cells/decidim/accountability/results/show.erb
+- app/cells/decidim/accountability/results_cell.rb
+- app/cells/decidim/accountability/status/show.erb
+- app/cells/decidim/accountability/status/status.erb
+- app/cells/decidim/accountability/status_cell.rb
 - app/commands/decidim/accountability/admin/create_imported_result.rb
 - app/commands/decidim/accountability/admin/create_result.rb
 - app/commands/decidim/accountability/admin/create_status.rb
 - app/commands/decidim/accountability/admin/create_timeline_entry.rb
 - app/commands/decidim/accountability/admin/destroy_result.rb
+- app/commands/decidim/accountability/admin/import_projects_to_accountability.rb
 - app/commands/decidim/accountability/admin/update_imported_result.rb
 - app/commands/decidim/accountability/admin/update_result.rb
 - app/commands/decidim/accountability/admin/update_status.rb
@@ -176,16 +186,18 @@ files:
 - app/controllers/decidim/accountability/admin/attachment_collections_controller.rb
 - app/controllers/decidim/accountability/admin/attachments_controller.rb
 - app/controllers/decidim/accountability/admin/import_results_controller.rb
+- app/controllers/decidim/accountability/admin/projects_import_controller.rb
 - app/controllers/decidim/accountability/admin/results_controller.rb
 - app/controllers/decidim/accountability/admin/statuses_controller.rb
 - app/controllers/decidim/accountability/admin/timeline_entries_controller.rb
 - app/controllers/decidim/accountability/application_controller.rb
 - app/controllers/decidim/accountability/results_controller.rb
 - app/controllers/decidim/accountability/versions_controller.rb
-- app/events/decidim/accountability/base_result_event.rb
 - app/events/decidim/accountability/proposal_linked_event.rb
 - app/events/decidim/accountability/result_progress_updated_event.rb
+- app/forms/decidim/accountability/admin/import_results_form.rb
 - app/forms/decidim/accountability/admin/result_form.rb
+- app/forms/decidim/accountability/admin/result_import_projects_form.rb
 - app/forms/decidim/accountability/admin/status_form.rb
 - app/forms/decidim/accountability/admin/timeline_entry_form.rb
 - app/helpers/decidim/accountability/admin/application_helper.rb
@@ -193,23 +205,24 @@ files:
 - app/helpers/decidim/accountability/application_helper.rb
 - app/helpers/decidim/accountability/breadcrumb_helper.rb
 - app/jobs/application_job.rb
+- app/jobs/decidim/accountability/admin/import_projects_job.rb
 - app/jobs/decidim/accountability/admin/import_results_csv_job.rb
 - app/mailers/decidim/accountability/import_mailer.rb
+- app/mailers/decidim/accountability/import_projects_mailer.rb
 - app/models/decidim/accountability/application_record.rb
 - app/models/decidim/accountability/result.rb
 - app/models/decidim/accountability/status.rb
 - app/models/decidim/accountability/timeline_entry.rb
 - app/packs/entrypoints/decidim_accountability.js
 - app/packs/entrypoints/decidim_accountability_admin.js
+- app/packs/entrypoints/decidim_accountability_admin_imports.js
+- app/packs/images/decidim/accountability/breadcrumb_arrow.svg
 - app/packs/images/decidim/accountability/decidim_accountability.svg
+- app/packs/src/decidim/accountability/admin/imports.js
 - app/packs/src/decidim/accountability/admin/index.js
 - app/packs/src/decidim/accountability/index.js
 - app/packs/src/decidim/accountability/version_diff.js
-- app/packs/stylesheets/decidim/accountability/_accountability.scss
-- app/packs/stylesheets/decidim/accountability/accountability/_cards.scss
-- app/packs/stylesheets/decidim/accountability/accountability/_categories.scss
-- app/packs/stylesheets/decidim/accountability/accountability/_lines_breadcrumb.scss
-- app/packs/stylesheets/decidim/accountability/accountability/_results.scss
+- app/packs/stylesheets/accountability.scss
 - app/permissions/decidim/accountability/admin/permissions.rb
 - app/permissions/decidim/accountability/permissions.rb
 - app/presenters/decidim/accountability/admin_log/result_presenter.rb
@@ -222,11 +235,11 @@ files:
 - app/services/decidim/accountability/results_calculator.rb
 - app/services/decidim/accountability/results_csv_importer.rb
 - app/views/decidim/accountability/admin/import_results/new.html.erb
+- app/views/decidim/accountability/admin/projects_import/new.html.erb
 - app/views/decidim/accountability/admin/results/_form.html.erb
 - app/views/decidim/accountability/admin/results/edit.html.erb
 - app/views/decidim/accountability/admin/results/index.html.erb
 - app/views/decidim/accountability/admin/results/new.html.erb
-- app/views/decidim/accountability/admin/results/proposals_picker.html.erb
 - app/views/decidim/accountability/admin/shared/_subnav.html.erb
 - app/views/decidim/accountability/admin/statuses/_form.html.erb
 - app/views/decidim/accountability/admin/statuses/edit.html.erb
@@ -237,25 +250,19 @@ files:
 - app/views/decidim/accountability/admin/timeline_entries/index.html.erb
 - app/views/decidim/accountability/admin/timeline_entries/new.html.erb
 - app/views/decidim/accountability/import_mailer/import.html.erb
-- app/views/decidim/accountability/result_widgets/show.html.erb
+- app/views/decidim/accountability/import_projects_mailer/import.html.erb
 - app/views/decidim/accountability/results/_home_categories.html.erb
-- app/views/decidim/accountability/results/_home_header.html.erb
 - app/views/decidim/accountability/results/_linked_results.html.erb
 - app/views/decidim/accountability/results/_nav_breadcrumb.html.erb
-- app/views/decidim/accountability/results/_results_leaf.html.erb
-- app/views/decidim/accountability/results/_results_parent.html.erb
+- app/views/decidim/accountability/results/_project.html.erb
+- app/views/decidim/accountability/results/_projects_aside.html.erb
 - app/views/decidim/accountability/results/_scope_filters.html.erb
 - app/views/decidim/accountability/results/_search.html.erb
-- app/views/decidim/accountability/results/_show_leaf.html.erb
-- app/views/decidim/accountability/results/_show_parent.html.erb
-- app/views/decidim/accountability/results/_stats.html.erb
 - app/views/decidim/accountability/results/_stats_box.html.erb
-- app/views/decidim/accountability/results/_timeline.html.erb
 - app/views/decidim/accountability/results/home.html.erb
 - app/views/decidim/accountability/results/index.html.erb
 - app/views/decidim/accountability/results/index.js.erb
 - app/views/decidim/accountability/results/show.html.erb
-- app/views/decidim/accountability/versions/index.html.erb
 - app/views/decidim/accountability/versions/show.html.erb
 - app/views/decidim/participatory_spaces/_result.html.erb
 - config/assets.rb
@@ -291,7 +298,6 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
-- config/locales/he-IL.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -353,7 +359,6 @@ files:
 - db/migrate/20200827154103_add_commentable_counter_cache_to_results.rb
 - db/migrate/20220331150008_add_title_to_timeline_entries.rb
 - db/migrate/20220331150155_move_legacy_description_to_title_of_timeline_entries.rb
-- decidim-accountability.gemspec
 - lib/decidim/accountability.rb
 - lib/decidim/accountability/admin.rb
 - lib/decidim/accountability/admin_engine.rb
@@ -361,32 +366,38 @@ files:
 - lib/decidim/accountability/component.rb
 - lib/decidim/accountability/engine.rb
 - lib/decidim/accountability/result_serializer.rb
+- lib/decidim/accountability/seeds.rb
 - lib/decidim/accountability/test/factories.rb
 - lib/decidim/accountability/version.rb
 - lib/decidim/api/accountability_type.rb
 - lib/decidim/api/result_type.rb
 - lib/decidim/api/status_type.rb
 - lib/decidim/api/timeline_entry_type.rb
-homepage: https://github.com/decidim/decidim
+homepage: https://decidim.org
 licenses:
 - AGPL-3.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/decidim/decidim/issues
+  documentation_uri: https://docs.decidim.org/
+  funding_uri: https://opencollective.com/decidim
+  homepage_uri: https://decidim.org
+  source_code_uri: https://github.com/decidim/decidim
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Decidim accountability module

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

@@ -1,5 +0,0 @@
-<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

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

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

@@ -1,23 +0,0 @@
-<% 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

@@ -1,22 +0,0 @@
-<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

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

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

@@ -1,37 +0,0 @@
-# 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/events/decidim/accountability/base_result_event.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    class BaseResultEvent < Decidim::Events::SimpleEvent
-      i18n_attributes :proposal_title, :proposal_path
-
-      def resource_text
-        translated_attribute(resource.description)
-      end
-
-      def proposal_title
-        @proposal_title ||= decidim_sanitize_translated(proposal.title)
-      end
-
-      def proposal_path
-        @proposal_path ||= Decidim::ResourceLocatorPresenter.new(proposal).path
-      end
-
-      def proposal
-        @proposal ||= resource.linked_resources(:proposals, "included_proposals").find_by(id: extra[:proposal_id])
-      end
-
-      def hidden_resource?
-        super || (proposal.respond_to?(:hidden?) && proposal.hidden?)
-      end
-    end
-  end
-end

data/app/packs/stylesheets/decidim/accountability/_accountability.scss

@@ -1,4 +0,0 @@
-@import "stylesheets/decidim/accountability/accountability/cards";
-@import "stylesheets/decidim/accountability/accountability/categories";
-@import "stylesheets/decidim/accountability/accountability/lines_breadcrumb";
-@import "stylesheets/decidim/accountability/accountability/results";

data/app/packs/stylesheets/decidim/accountability/accountability/_cards.scss

@@ -1,11 +0,0 @@
-.accountability{
-  .card__link--block{
-    display: block;
-  }
-
-  .card--meta{
-    span{
-      margin-right: .5rem;
-    }
-  }
-}

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

@@ -1,121 +0,0 @@
-.accountability{
-  .categories{
-    a:hover{
-      text-decoration: underline;
-    }
-
-    a:focus{
-      outline: $anchor-outline-focus;
-    }
-
-    .categories--header{
-      border-bottom: 1px solid $medium-gray;
-      padding-bottom: 1rem;
-      margin-bottom: 1rem;
-
-      .icon--arrow-bottom{
-        fill: lighten($dark-gray, 50);
-      }
-
-      span{
-        font-size: 1.15rem;
-        color: lighten($dark-gray, 50);
-      }
-    }
-
-    .categories--group{
-      margin-bottom: 2rem;
-
-      @include breakpoint(medium){
-        display: flex;
-        margin-bottom: 4rem;
-      }
-
-      .category--title{
-        background: $white;
-        padding: 1.5rem 2rem;
-        min-height: 9rem;
-
-        @include breakpoint(medium){
-          height: calc(100% - 1.875rem);
-        }
-
-        p{
-          font-weight: 600;
-          margin-bottom: .75rem;
-        }
-
-        .progress{
-          margin-bottom: .5rem;
-        }
-
-        .progress-info{
-          position: relative;
-          margin-bottom: 1.5rem;
-
-          .progress-figure{
-            display: inline-block;
-          }
-
-          .category--count{
-            position: absolute;
-            right: 0;
-            top: .5rem;
-            color: lighten($dark-gray, 50);
-          }
-        }
-      }
-
-      .card__link{
-        .category--line{
-          background-color: $light-gray-dark;
-          border-radius: 4px;
-          min-height: 9rem;
-          padding: 1rem;
-          margin-bottom: 1.875rem;
-          position: relative;
-
-          strong{
-            font-weight: 600;
-            color: var(--secondary);
-          }
-
-          .progress-figure{
-            position: absolute;
-            bottom: 1rem;
-          }
-
-          .category--count{
-            color: lighten($secondary, 50);
-            position: absolute;
-            right: 1rem;
-            bottom: 1rem;
-            font-size: 80%;
-          }
-        }
-
-        &:hover{
-          .category--count{
-            color: lighten($secondary, 50);
-          }
-
-          strong{
-            color: scale-color($anchor-color, $lightness: -14%);
-          }
-        }
-      }
-    }
-
-    .category--elements.active{
-      display: block !important;
-
-      .medium-4:first-child{
-        margin-top: 1rem;
-      }
-    }
-
-    .progress-figure{
-      color: lighten($dark-gray, 50);
-    }
-  }
-}

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

@@ -1,37 +0,0 @@
-.lines-breadcrumb{
-  margin-bottom: 2rem;
-
-  .breadcrumb--separator{
-    color: darken($light-gray, 40);
-    padding: 0 .25rem;
-  }
-
-  div{
-    display: inline-block;
-  }
-
-  a{
-    font-weight: 600;
-    color: $dark-gray;
-
-    &:hover{
-      text-decoration: underline;
-    }
-
-    &:focus{
-      outline: 2px solid $secondary;
-    }
-  }
-
-  ul{
-    list-style: none;
-    margin-left: 0;
-  }
-
-  .percentage{
-    color: darken($light-gray, 40);
-    font-weight: 400;
-    padding-left: .15rem;
-    display: inline-block;
-  }
-}