decidim-participatory_processes 0.13.1 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f09501ffcc10838805f02e2e7ee8b02731d0f3474e157a51bdf394bf0c63fbce
-  data.tar.gz: 4bf0443f2c8b0b9b1b256d9147d87e18695fc9cee8330d2e2634234a0b665a17
+  metadata.gz: 6a8ad562172fbb6e2f42b1772f225fd64a96aedc0ebf86fd3c1f603eae18dab5
+  data.tar.gz: 808814fd81f14405f847f71fff76d0195146ba0be87604075a68d3102fe00ec1
 SHA512:
-  metadata.gz: be4e178b5a7eb8a56c3241b5aae51b47dc5f602a8cf105655340de93241f46209c4f67ec3678be033408edcc005c1603721900a5f3578a4f910cc9ea6c1dc983
-  data.tar.gz: 78e0c0126cb3fcc620d811f5d97ef509f42373f0164ecbd3967ad9f82d2951f9425ed7fb9d99ea3b49a191b0b67a6844f861097339ec128ca7518d06962f5e7f
+  metadata.gz: b78ec048fe1dcd7ee0d60cb67a253b6a38b639c360eb962acfe1e88ddcb4874952564b78275a42ffc3aa9ebc1598c0b804f6f317f8b5c598ba19bd3140971d79
+  data.tar.gz: eeca8f2c950844b9fbd1297ee14d3ef420d658761dd613eab383e53f63fe40adbd7af589ad5658d5a6c48a66716c9feb3a8fcd9cef939cc30ba4fa7c889849a3

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/_all_processes.erb

@@ -0,0 +1,6 @@
+<div class="row" id="see-all-processes">
+  <div class="columns small-centered small-12
+    smallmedium-8 medium-6 large-4">
+    <%= link_to t("see_all_processes", scope: i18n_scope), decidim_participatory_processes.participatory_processes_path, class: "button expanded hollow button--sc home-section__cta" %>
+  </div>
+</div>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/show.erb

@@ -0,0 +1,32 @@
+<section class="wrapper-home home-section">
+  <div class="row" id="highlighted-processes">
+    <h3 class="section-heading"><%= t("active_processes", scope: i18n_scope) %></h3>
+    <div class="row collapse">
+      <div class="row small-up-1 smallmedium-up-2 mediumlarge-up-3
+        large-up-4 card-grid">
+        <% highlighted_processes.each do |process| %>
+          <div class="column">
+            <article class="card card--process card--mini">
+              <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
+                <div class="card__image-top"
+                  style="background-image:url(<%= process.hero_image.url %>)"></div>
+              <% end %>
+              <div class="card__content">
+                <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
+                  <h4 class="card__title"><%= translated_attribute process.title %></h4>
+                <% end %>
+                <% if process.active_step %>
+                  <span class="card--process__small">
+                    <%= t("active_step", scope: i18n_scope) %>
+                    <strong><%= translated_attribute process.active_step.title %></strong>
+                  </span>
+                <% end %>
+              </div>
+            </article>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+  <%= render "_all_processes" %>
+</section>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/single_process.erb

@@ -0,0 +1,39 @@
+<% process = highlighted_processes.first %>
+<section class="wrapper-home home-section">
+  <div class="row" id="highlighted-processes">
+    <h3 class="section-heading"><%= t("active_processes", scope: i18n_scope) %></h3>
+    <div class="row collapse">
+      <article class="card card--full card--process">
+        <div class="row collapse card--process__row">
+          <div class="column large-6 card--process__column">
+            <div class="card__content">
+              <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "card__link" do %>
+                <h2 class="card__title"><%= translated_attribute process.title %></h2>
+              <% end %>
+              <%= decidim_sanitize translated_attribute(process.description) %>
+              <%= link_to t("more_information", scope: i18n_scope), decidim_participatory_processes.participatory_process_path(process), class: "button secondary small hollow" %>
+            </div>
+          </div>
+          <div class="column large-6 card--process__column">
+            <div class="card--full__image" style="background-image:url(<%= process.hero_image.url %>)">
+              <div class="card__content row collapse">
+                <div class="large-6 large-offset-6 columns">
+                  <%= link_to decidim_participatory_processes.participatory_process_path(process), class: "button expanded button--sc" do %>
+                    <%= t("participate", scope: i18n_scope) %>
+                    <% if process.active_step %>
+                      <span class="button__info">
+                        <%= t("active_step", scope: i18n_scope) %>
+                        <strong><%= translated_attribute process.active_step.title %></strong>
+                      </span>
+                    <% end %>
+                  <% end %>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </article>
+    </div>
+  </div>
+  <%= render "_all_processes" %>
+</section>

data/app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    module ContentBlocks
+      class HighlightedProcessesCell < Decidim::ViewModel
+        include Decidim::SanitizeHelper
+
+        delegate :current_organization, to: :controller
+        delegate :current_user, to: :controller
+
+        def show
+          if single_process?
+            render "single_process"
+          elsif highlighted_processes.any?
+            render
+          end
+        end
+
+        def single_process?
+          highlighted_processes.to_a.length == 1
+        end
+
+        def highlighted_processes
+          OrganizationPublishedParticipatoryProcesses.new(current_organization, current_user) |
+            HighlightedParticipatoryProcesses.new |
+            FilteredParticipatoryProcesses.new("active")
+        end
+
+        def i18n_scope
+          "decidim.participatory_processes.pages.home.highlighted_processes"
+        end
+
+        def decidim_participatory_processes
+          Decidim::ParticipatoryProcesses::Engine.routes.url_helpers
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/participatory_processes/process_cell.rb

@@ -6,7 +6,7 @@ module Decidim
     # the default size is the Medium Card (:m)
     class ProcessCell < Decidim::ViewModel
       def show
-        cell card_size, model
+        cell card_size, model, options
       end
 
       private

data/app/cells/decidim/participatory_processes/process_filters/filter_tabs.erb

@@ -0,0 +1,16 @@
+<span class="order-by__tabs ml-s">
+  <%# <span class="muted mr-s ml-s">No hay procesos activos</span> %>
+  <% if should_show_tabs? %>
+    <%= explanation %>
+    <span class="muted mr-xs"><%= t("decidim.participatory_processes.participatory_processes.filters.see") %></span>
+    <% other_filters_with_value.each do |filter| %>
+      <%= link_to filter_link(filter), remote: true, class: "order-by__tab" do %>
+        <strong>
+          <%= filter_name(filter) %>
+        </strong>&nbsp;<span>(<%= model[filter] %>)</span>
+      <% end %>
+    <% end %>
+  <% else %>
+    <%= explanation %>
+  <% end %>
+</span>

data/app/cells/decidim/participatory_processes/process_filters/show.erb

@@ -0,0 +1,13 @@
+<div class="row collapse order-by">
+  <h2 class="order-by__text section-heading">
+    <%= title %>
+    <%= render :filter_tabs %>
+  </h2>
+</div>
+<% if model["active"] == 0 && model["upcoming"] == 0 %>
+<div class="row column">
+  <div class="callout warning mb-sm">
+    <p><%= t("decidim.participatory_processes.participatory_processes.filters.explanations.no_active_nor_upcoming_callout") %></p>
+  </div>
+</div>
+<% end %>

data/app/cells/decidim/participatory_processes/process_filters_cell.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ParticipatoryProcesses
+    class ProcessFiltersCell < Decidim::ViewModel
+      ALL_FILTERS = %w(active past upcoming all).freeze
+
+      def filter_link(filter)
+        Decidim::ParticipatoryProcesses::Engine
+          .routes
+          .url_helpers
+          .participatory_processes_path(filter: filter)
+      end
+
+      def current_filter
+        options[:current_filter]
+      end
+
+      def other_filters
+        @other_filters ||= ALL_FILTERS - [current_filter]
+      end
+
+      def other_filters_with_value
+        @other_filters_with_value ||= other_filters.select do |filter|
+          model[filter].positive?
+        end
+      end
+
+      def should_show_tabs?
+        other_filters_with_value.any?
+        other_filters_with_value != ["all"]
+      end
+
+      def title
+        I18n.t(current_filter, scope: "decidim.participatory_processes.participatory_processes.filters.counters", count: model[current_filter])
+      end
+
+      def filter_name(filter)
+        I18n.t(filter, scope: "decidim.participatory_processes.participatory_processes.filters.names")
+      end
+
+      def explanation
+        return if model["active"].positive?
+        content_tag(
+          :span,
+          I18n.t(explanation_text, scope: "decidim.participatory_processes.participatory_processes.filters.explanations"),
+          class: "muted mr-s ml-s"
+        )
+      end
+
+      def explanation_text
+        return "no_active" if model["upcoming"].positive?
+        "no_active_nor_upcoming"
+      end
+    end
+  end
+end

data/app/cells/decidim/participatory_processes/process_group_cell.rb

@@ -6,7 +6,7 @@ module Decidim
     # the default size is the Medium Card (:m)
     class ProcessGroupCell < Decidim::ViewModel
       def show
-        cell card_size, model
+        cell card_size, model, options
       end
 
       private

data/app/cells/decidim/participatory_processes/process_group_m_cell.rb

@@ -39,7 +39,7 @@ module Decidim
         content_tag(
           :strong,
           t("layouts.decidim.participatory_process_groups.participatory_process_group.processes_count")
-        ) + " " + model.participatory_processes.count.to_s
+        ) + " " + model.participatory_processes.published.count.to_s
       end
     end
   end

data/app/cells/decidim/participatory_processes/process_m/tags.erb

@@ -1,6 +1,8 @@
-<%= link_to(
-  "##{model.hashtag}",
-  "https://twitter.com/hashtag/#{model.hashtag}",
-  class: "card__text--category",
-  target: "_blank"
- ) %>
+<% if model.hashtag.present? %>
+  <%= link_to(
+    "##{model.hashtag}",
+    "https://twitter.com/hashtag/#{model.hashtag}",
+    class: "card__text--category",
+    target: "_blank"
+   ) %>
+<% end %>

data/app/controllers/decidim/participatory_processes/admin/participatory_space_private_users_controller.rb

@@ -15,10 +15,6 @@ module Decidim
         def privatable_to
           current_participatory_process
         end
-
-        def authorization_object
-          @participatory_space_private_user
-        end
       end
     end
   end

data/app/controllers/decidim/participatory_processes/participatory_processes_controller.rb

@@ -17,6 +17,7 @@ module Decidim
       helper ParticipatoryProcessHelper
 
       helper_method :collection, :promoted_participatory_processes, :participatory_processes, :stats, :filter
+      helper_method :process_count_by_filter
 
       def index
         redirect_to "/404" if published_processes.none?
@@ -51,8 +52,8 @@ module Decidim
         @collection ||= (participatory_processes.to_a + participatory_process_groups).flatten
       end
 
-      def filtered_participatory_processes(filter = default_filter)
-        OrganizationPrioritizedParticipatoryProcesses.new(current_organization, filter, current_user)
+      def filtered_participatory_processes(filter_name = filter)
+        OrganizationPrioritizedParticipatoryProcesses.new(current_organization, filter_name, current_user)
       end
 
       def participatory_processes
@@ -63,8 +64,12 @@ module Decidim
         @promoted_participatory_processes ||= filtered_participatory_processes | PromotedParticipatoryProcesses.new
       end
 
+      def filtered_participatory_process_groups(filter_name = filter)
+        OrganizationPrioritizedParticipatoryProcessGroups.new(current_organization, filter_name)
+      end
+
       def participatory_process_groups
-        @participatory_process_groups ||= OrganizationPrioritizedParticipatoryProcessGroups.new(current_organization, filter)
+        @participatory_process_groups ||= filtered_participatory_process_groups(filter)
       end
 
       def stats
@@ -76,8 +81,23 @@ module Decidim
       end
 
       def default_filter
+        return "active" if process_count_by_filter["active"].positive?
+        return "upcoming" if process_count_by_filter["upcoming"].positive?
+        return "past" if process_count_by_filter["past"].positive?
         "active"
       end
+
+      def process_count_by_filter
+        return @process_count_by_filter if @process_count_by_filter
+
+        @process_count_by_filter = %w(active upcoming past).inject({}) do |collection_by_filter, filter_name|
+          processes = filtered_participatory_processes(filter_name)
+          groups = filtered_participatory_process_groups(filter_name)
+          collection_by_filter.merge(filter_name.to_s => processes.count + groups.count)
+        end
+        @process_count_by_filter["all"] = @process_count_by_filter.values.sum
+        @process_count_by_filter
+      end
     end
   end
 end

data/app/forms/decidim/participatory_processes/admin/participatory_process_step_form.rb

@@ -14,23 +14,13 @@ module Decidim
 
         mimic :participatory_process_step
 
-        attribute :start_date, DateTime
-        attribute :end_date, DateTime
+        attribute :start_date, Date
+        attribute :end_date, Date
 
         validates :title, translatable_presence: true
 
         validates :start_date, date: { before: :end_date, allow_blank: true, if: proc { |obj| obj.end_date.present? } }
         validates :end_date, date: { after: :start_date, allow_blank: true, if: proc { |obj| obj.start_date.present? } }
-
-        def start_date
-          return nil unless super.respond_to?(:at_midnight)
-          super.at_midnight
-        end
-
-        def end_date
-          return nil unless super.respond_to?(:at_midnight)
-          super.at_midnight
-        end
       end
     end
   end

data/app/models/decidim/participatory_process.rb

@@ -55,9 +55,9 @@ module Decidim
     mount_uploader :hero_image, Decidim::HeroImageUploader
     mount_uploader :banner_image, Decidim::BannerImageUploader
 
-    scope :past, -> { where(arel_table[:end_date].lteq(Time.current)) }
-    scope :upcoming, -> { where(arel_table[:start_date].gt(Time.current)) }
-    scope :active, -> { where(arel_table[:start_date].lteq(Time.current).and(arel_table[:end_date].gt(Time.current).or(arel_table[:end_date].eq(nil)))) }
+    scope :past, -> { where(arel_table[:end_date].lteq(Date.current)) }
+    scope :upcoming, -> { where(arel_table[:start_date].gt(Date.current)) }
+    scope :active, -> { where(arel_table[:start_date].lteq(Date.current).and(arel_table[:end_date].gt(Date.current).or(arel_table[:end_date].eq(nil)))) }
 
     # Scope to return only the promoted processes.
     #
@@ -72,7 +72,7 @@ module Decidim
 
     def past?
       return false if end_date.blank?
-      end_date < Time.current
+      end_date < Date.current
     end
 
     def hashtag

data/app/queries/decidim/participatory_processes/filtered_participatory_process_groups.rb

@@ -15,9 +15,9 @@ module Decidim
 
         processes = case @filter
                     when "past"
-                      processes.where("decidim_participatory_processes.end_date <= ?", Time.current)
+                      processes.where("decidim_participatory_processes.end_date <= ?", Date.current)
                     when "upcoming"
-                      processes.where("decidim_participatory_processes.start_date > ?", Time.current)
+                      processes.where("decidim_participatory_processes.start_date > ?", Date.current)
                     else
                       processes
                     end

data/app/views/decidim/participatory_processes/admin/participatory_process_copies/new.html.erb

@@ -1,5 +1,5 @@
 <%= decidim_form_for(@form, url: participatory_process_copies_path(current_participatory_process), method: :post, html: { class: "form copy_participatory_process" }) do |f| %>
-  <%= render partial: "form", object: f, locals: { title: t("participatory_process_copies.new.title", scope: "decidim.admin"), select: t("participatory_process_copies.new.select", scope: "decidim.admin")} %>
+  <%= render partial: "form", object: f, locals: { title: t("participatory_process_copies.new.title", scope: "decidim.admin"), select: t("participatory_process_copies.new.select", scope: "decidim.admin") } %>
 
   <div class="button--double form-general-submit">
     <%= f.submit t("participatory_process_copies.new.copy", scope: "decidim.admin") %>

data/app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb

@@ -2,8 +2,7 @@
 
 <main class="wrapper">
   <section id="processes-grid" class="section row collapse">
-    <h1 class="section-heading"><%= t("participatory_process_groups.show.group_participatory_processes", scope: "decidim", group: translated_attribute(group.name)) %></h1>
-    <%= render partial: "decidim/participatory_processes/order_by_processes", locals: { include_filter: false } %>
+    <h1 class="section-heading"><%= t("participatory_process_groups.show.group_participatory_processes", scope: "decidim", count: participatory_processes.count, group: translated_attribute(group.name)) %></h1>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
       <%= render participatory_processes %>
     </div>

data/app/views/decidim/participatory_processes/participatory_processes/_order_by_processes.html.erb

@@ -0,0 +1 @@
+<%= cell "decidim/participatory_processes/process_filters", process_count_by_filter, current_filter: filter %>

data/app/views/decidim/participatory_processes/participatory_processes/index.html.erb

@@ -1,5 +1,13 @@
 <% add_decidim_meta_tags(title: t("participatory_processes.index.title", scope: "decidim")) %>
 
+<%
+edit_link(
+  decidim_admin_participatory_processes.participatory_processes_path,
+  :read,
+  :process_list
+)
+%>
+
 <main class="wrapper">
   <% if promoted_participatory_processes.any? %>
     <section id="highlighted-processes" class="row section">
@@ -10,7 +18,7 @@
 
   <section id="processes-grid" class="section row collapse">
     <div class="processes-grid-order-by">
-      <%= render partial: "decidim/participatory_processes/order_by_processes", locals: { include_filter: true } %>
+      <%= render partial: "order_by_processes" %>
     </div>
     <p class="loading"><%= t(".loading") %></p>
     <div class="row small-up-1 medium-up-2 large-up-3 card-grid">