decidim-accountability 0.27.10 → 0.28.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd9f641e05c7075e579bc2e3e2e13c5af2a256d93d60a04684984dc254c139c8
-  data.tar.gz: c04aedcc93fbb03a02570be10b3a076474f72de61a94eca703b6bf4eaf0164cf
+  metadata.gz: 53d0e9219637a9369c6b8ffca3060c9c11cc4127ad6b3588e5caeb35eb415778
+  data.tar.gz: 767f052eb960ba0e461a7864b121f410db02cb0da5981f9aa277762928a68cbf
 SHA512:
-  metadata.gz: 5d82f023a1c07fd04d21d822a9a65731110ecc48d4f18519f139111d8de0ba1ddad89670eb6b9adf3efc41b13a3a84d56def4cc3ec79d192cc3448916179e752
-  data.tar.gz: 2dca06941f608c754e000b775d54d26717dec39ecf80553c49725f646dfaf90d23f756fbb10ef0a214c64f2d8d8471de39dd1983040f7d53d5f494af65d5c6c7
+  metadata.gz: e82ced7fbbacd1dfbb756a514fe506fdfa66b281b891313bde90c460bdf67243705224703d5c4c66cae7a82c3fc49b03fbd77cd3425e4fda135da28dba264cd9
+  data.tar.gz: d8189bdc78ceeaef893356c262eba1d32269a4a976f9b6c4d4e38cd4617181c064d106f1820e38559fc697ba7e3b199891b1e099651bf7913f5b66688dc7cbd3

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

@@ -3,15 +3,10 @@
 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
+      class HighlightedResultsCell < Decidim::ContentBlocks::HighlightedElementsWithCellForListCell
+        private
 
-        def base_relation
-          @base_relation ||= Decidim::Accountability::Result.where(component: published_components)
-        end
+        def list_cell_path = "decidim/accountability/highlighted_results_for_component"
       end
     end
   end

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

@@ -1,3 +1,5 @@
 <% published_components.each do |component| %>
-  <%= cell "decidim/accountability/highlighted_results_for_component", component %>
+  <section class="content-block">
+    <%= cell "decidim/accountability/highlighted_results_for_component", component %>
+  </section>
 <% end %>

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

@@ -1,21 +1,21 @@
-<section class="section row collapse highlighted_results">
-  <h3 class="section-heading">
-    <%= decidim_escape_translated(model.name) %> <a href="<%= main_component_path(model) %>" class="text-small"><%= t("decidim.participatory_spaces.highlighted_results.see_all", count: results_count) %></a>
-  </h3>
+<%# NOTE: Since this call can be called from outside decidim-accountability, frontend assets are required %>
+<%= apply_accountability_pack_tags %>
 
-  <div class="row">
-    <div class="columns accountability">
-      <div class="card card--action card--list">
-        <% results_to_render.each do |result| %>
-          <%= render partial: "decidim/participatory_spaces/result.html", locals: { result: result } %>
-        <% end %>
-      </div>
-    </div>
-  </div>
+<div class="content-block__title">
+  <h2 class="h2 decorator">
+    <%= single_component? ? translated_attribute(model.name) : t("decidim.accountability.content_blocks.highlighted_results.results") %>
+  </h2>
+  <div class="label text-lg"><%= results_count %></div>
+  <% if single_component? %>
+    <%= link_to main_component_path(model), class: "button button__sm button__text-secondary" do %>
+      <span><%= t("decidim.participatory_spaces.highlighted_results.see_all") %></span>
+      <%= icon "arrow-right-line" %>
+    <% end %>
+  <% end %>
+</div>
 
-  <%= link_to(
-    t("decidim.participatory_spaces.highlighted_results.see_all", count: results_count),
-    main_component_path(model),
-    class: "button button--sc hollow button--right"
-  ) %>
-</section>
+<div>
+  <% results_to_render.each do |result| %>
+    <%= cell "decidim/accountability/result_l", result, title_tag: :h3, **options.slice(:show_space) %>
+  <% end %>
+</div>

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

@@ -14,22 +14,37 @@ module Decidim
       include Decidim::LayoutHelper
       include Cell::ViewModel::Partial
 
+      delegate :snippets, to: :controller
+
       def show
-        render unless results_count.zero?
+        render unless items_blank?
+      end
+
+      def items_blank?
+        results_count.zero?
       end
 
       private
 
+      def results_count
+        @results_count ||= results.size
+      end
+
       def results
-        @results ||= Decidim::Accountability::Result.where(component: model).order_randomly((rand * 2) - 1)
+        @results ||= case options[:order]
+                     when "recent"
+                       Decidim::Accountability::Result.where(component: model).order_by_most_recent
+                     else
+                       Decidim::Accountability::Result.where(component: model).order_randomly(random_seed)
+                     end
       end
 
-      def results_to_render
-        @results_to_render ||= results.includes(:component, :status).limit(4)
+      def single_component?
+        @single_component ||= model.is_a?(Decidim::Component)
       end
 
-      def results_count
-        @results_count ||= results.count
+      def results_to_render
+        @results_to_render ||= results.includes(:component, :status).limit(limit)
       end
 
       def cache_hash
@@ -43,6 +58,14 @@ module Decidim
       def cache_expiry_time
         10.minutes
       end
+
+      def limit
+        4
+      end
+
+      def random_seed
+        (rand * 2) - 1
+      end
     end
   end
 end

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

@@ -0,0 +1,11 @@
+<section class="layout-main__section layout-main__heading">
+  <h1 class="h2 decorator"><%= title %></h1>
+</section>
+
+<section class="layout-main__section">
+  <div class="editor-content mt-8">
+    <%= description %>
+  </div>
+</section>
+
+<%= cell "decidim/tab_panels", tab_panel_items %>

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

@@ -0,0 +1,22 @@
+<ol class="accountability__project-timeline">
+  <% timeline_entries.each_with_index do |timeline_entry, i| %>
+    <li class="accountability__project-timeline-entry">
+      <div class="accountability__project-timeline-entry-number">
+        <span><%= i + 1 %></span>
+      </div>
+      <div class="accountability__project-timeline-entry-attributes">
+        <h3>
+          <%= translated_attribute timeline_entry.title %>
+        </h3>
+        <div>
+          <%= l timeline_entry.entry_date, format: :decidim_short %>
+        </div>
+        <% if translated_attribute(timeline_entry.description).present? %>
+          <div>
+            <%= translated_attribute(timeline_entry.description).html_safe %>
+          </div>
+        <% end %>
+      </div>
+    </li>
+  <% end %>
+</ol>

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

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Accountability
+    # This cell renders a project
+    class ProjectCell < Decidim::ViewModel
+      include ApplicationHelper
+      include Decidim::ResourceHelper
+      include Decidim::TranslationsHelper
+      include Decidim::AttachmentsHelper
+
+      delegate :current_component, :component_settings, to: :controller
+      delegate :children, :timeline_entries, to: :model
+
+      alias result model
+
+      def show
+        render
+      end
+
+      private
+
+      def title
+        translated_attribute result.title
+      end
+
+      def description
+        translated_attribute(result.description).html_safe
+      end
+
+      def scope
+        current_scope.presence
+      end
+
+      def tab_panel_items
+        [
+          {
+            enabled: children.any?,
+            id: "list",
+            text: t("decidim.accountability.results.timeline.title"),
+            icon: "route-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
+    end
+  end
+end

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

@@ -5,10 +5,7 @@ module Decidim
     # A cell to display when a Result has been created.
     class ResultActivityCell < ActivityCell
       def title
-        I18n.t(
-          "decidim.accountability.last_activity.new_result_at_html",
-          link: participatory_space_link
-        )
+        I18n.t("decidim.accountability.last_activity.new_result")
       end
     end
   end

data/app/cells/decidim/accountability/result_card_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 List Card (:l)
+    class ResultCardCell < Decidim::ViewModel
+      def show
+        cell card_size, model, options
+      end
+
+      private
+
+      def card_size
+        "decidim/accountability/result_l"
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ 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)
+    # the default size is the List Card (:l)
     class ResultCell < Decidim::ViewModel
       def show
         cell card_size, model, options
@@ -14,7 +14,7 @@ module Decidim
       private
 
       def card_size
-        "decidim/accountability/result_m"
+        "decidim/accountability/result_l"
       end
     end
   end

data/app/cells/decidim/accountability/result_l/extra_data.erb

@@ -0,0 +1,3 @@
+<% if component_settings.try(:display_progress_enabled?) && result.progress.present? %>
+  <div class="accountability__progress"><%= display_percentage result.progress %></div>
+<% end %>

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Accountability
+    # This cell renders the List (:l) result card
+    # for an instance of a Result
+    class ResultLCell < Decidim::CardLCell
+      include ApplicationHelper
+      include ActiveSupport::NumberHelper
+
+      alias result model
+
+      def component_settings
+        controller.try(:component_settings) || result.component.settings
+      end
+
+      def render_extra_data?
+        true
+      end
+
+      private
+
+      def metadata_cell
+        "decidim/accountability/result_metadata"
+      end
+    end
+  end
+end

data/app/cells/decidim/accountability/result_metadata/project_aside.erb

@@ -0,0 +1,6 @@
+<% items.each do |item| %>
+  <div class="accountability__project-aside-item">
+    <div><%= icon item[:icon], class: "w-3.5 h-3.5 fill-current text-gray" %><%= item[:text] %></div>
+    <div><%= item[:value] %></div>
+  </div>
+<% end %>

data/app/cells/decidim/accountability/result_metadata/show_footer.erb

@@ -0,0 +1,11 @@
+<ul class="metadata__container layout-main__section" data-metadata-footer>
+  <% items.each do |item| %>
+    <li class="metadata__item">
+      <% if item.has_key? :partial %>
+        <%= render item[:partial] %>
+      <% else %>
+        <%= item[:text] %>
+      <% end %>
+    </li>
+  <% end %>
+</ul>

data/app/cells/decidim/accountability/result_metadata/versions.erb

@@ -0,0 +1 @@
+<%= resource_version(result, versions_path: result_version_path(result, result.versions.count)) %>

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

@@ -0,0 +1,136 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Accountability
+    # This cell renders metadata for an instance of a Result
+    class ResultMetadataCell < Decidim::CardMetadataCell
+      include Decidim::SanitizeHelper
+      include Decidim::TranslationsHelper
+      include ActiveSupport::NumberHelper
+      include Decidim::ResourceReferenceHelper
+      include Decidim::ResourceVersionsHelper
+      include Decidim::Accountability::Engine.routes.url_helpers
+      include Decidim::LayoutHelper
+
+      delegate :start_date, :end_date, :status, :category, :parent, :reference, to: :model
+
+      alias result model
+
+      def show
+        render template
+      end
+
+      def initialize(*)
+        super
+
+        @items.prepend(*result_items)
+      end
+
+      private
+
+      def result_items
+        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]
+      end
+
+      def template
+        @template ||= options[:template] || :show
+      end
+
+      def dates_item_compact
+        return if start_date.blank?
+
+        {
+          text: date_values(format: :decidim_with_month_name_short).join(" - "),
+          icon: "calendar-todo-line"
+        }
+      end
+
+      def reference
+        { text: resource_reference(result) }
+      end
+
+      def versions_count
+        @versions_count ||= result.versions_count
+      end
+
+      def versions
+        return if result.versions.blank?
+
+        { 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?
+
+        {
+          text: translated_attribute(status.name),
+          icon: "focus-2-line"
+        }
+      end
+
+      def inherited_category
+        return category if category.present?
+
+        parent&.category
+      end
+
+      def dates_item
+        return if start_date.blank?
+
+        date_title = [
+          *(t("models.result.fields.start_date", scope: "decidim.accountability") if start_date),
+          *(t("models.result.fields.end_date", scope: "decidim.accountability") if end_date)
+        ].join(" / ")
+
+        {
+          text: date_title,
+          icon: "calendar-todo-line",
+          value: date_values.join(" / ")
+        }
+      end
+
+      def date_values(format: :decidim_short_with_month_name_short)
+        @date_values ||= [
+          *(l(start_date, format:) if start_date),
+          *(l(end_date, format:) if end_date)
+        ]
+      end
+
+      def status_item
+        return if status.blank?
+
+        {
+          text: t("models.result.fields.status", scope: "decidim.accountability"),
+          icon: "focus-2-line",
+          value: translated_attribute(status.name)
+        }
+      end
+
+      def status_description
+        return unless status.present? && (description = translated_attribute(status.description)).present?
+
+        {
+          text: t("models.status.fields.description", scope: "decidim.accountability"),
+          icon: "file-text-line",
+          value: description
+        }
+      end
+
+      def has_dates?
+        start_date.present? && end_date.present?
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+<% if results.any? %>
+  <% results.each do |result| %>
+    <%= card_for result %>
+  <% end %>
+<% else %>
+  <%= cell("decidim/announcement", t("no_results", scope: "decidim.accountability.results")) %>
+<% end %>

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Accountability
+    # This cell renders a list of results
+    class ResultsCell < Decidim::ViewModel
+      include Decidim::CardHelper
+
+      alias results model
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+<% if url %>
+  <a href="<%= url %>" class="accountability__status <%= extra_classes %>">
+    <%= render :status %>
+  </a>
+<% else %>
+  <div class="accountability__status <%= extra_classes %>">
+    <%= render :status %>
+  </div>
+<% end %>

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

@@ -0,0 +1,16 @@
+<p class="accountability__status-title"><%= title %></p>
+
+<% if component_settings.display_progress_enabled? && progress.present? %>
+  <div class="accountability__status-progress">
+    <div style="width:<%= progress %>%"></div>
+  </div>
+<% end %>
+
+<div class="accountability__status-value">
+  <% if progress.present? %>
+    <span><%= display_percentage progress %></span>
+  <% end %>
+  <% if count %>
+    <span><%= count %></span>
+  <% end %>
+</div>

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

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+require "cell/partial"
+
+module Decidim
+  module Accountability
+    # This cell renders the status of a category
+    class StatusCell < Decidim::ViewModel
+      include ApplicationHelper
+      include BreadcrumbHelper
+      include Decidim::TranslationsHelper
+      include ActiveSupport::NumberHelper
+
+      delegate :current_component, :component_settings, to: :controller
+
+      def show
+        return unless render?
+
+        render
+      end
+
+      def render?
+        options[:render_blank] || has_results?
+      end
+
+      def has_results?
+        results_count&.positive? || progress.present?
+      end
+
+      private
+
+      def scope
+        current_scope.presence
+      end
+
+      def url
+        options[:url]
+      end
+
+      def title
+        if model.is_a? Decidim::Category
+          translated_attribute(model.name)
+        else
+          options[:title]
+        end
+      end
+
+      def results_count
+        @results_count ||= if model.is_a? Decidim::Category
+                             count_calculator(scope, model.id)
+                           else
+                             options[:count]
+                           end
+      end
+
+      def progress
+        if model.is_a? Decidim::Category
+          progress_calculator(scope, model.id).presence
+        elsif model.respond_to?(:progress)
+          model.progress
+        else
+          options[:progress] || progress_calculator(scope, nil).presence
+        end
+      end
+
+      def extra_classes
+        options[:extra_classes]
+      end
+
+      def count
+        return unless results_count&.positive? && render_count
+
+        display_count(results_count)
+      end
+
+      def render_count
+        return true unless options.has_key?(:render_count)
+
+        options[:render_count]
+      end
+
+      def count_calculator(scope_id, category_id)
+        Decidim::Accountability::ResultsCalculator.new(current_component, scope_id, category_id).count
+      end
+
+      def decidim
+        Decidim::Accountability::Engine.routes.url_helpers
+      end
+    end
+  end
+end