decidim-participatory_processes 0.13.1 → 0.14.1

data/lib/decidim/participatory_processes/admin_engine.rb

@@ -12,6 +12,7 @@ module Decidim
       isolate_namespace Decidim::ParticipatoryProcesses::Admin
 
       paths["db/migrate"] = nil
+      paths["lib/tasks"] = nil
 
       routes do
         resources :participatory_process_groups

data/lib/decidim/participatory_processes/engine.rb

@@ -54,25 +54,14 @@ module Decidim
                     decidim_participatory_processes.participatory_processes_path,
                     position: 2,
                     if: Decidim::ParticipatoryProcess.where(organization: current_organization).published.any?,
-                    active: :inclusive
+                    active: %r{^\/process(es|_groups)}
         end
       end
 
-      initializer "decidim_participatory_processes.view_hooks" do
-        Decidim.view_hooks.register(:highlighted_elements, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
-          highlighted_processes =
-            OrganizationPublishedParticipatoryProcesses.new(view_context.current_organization, view_context.current_user) |
-            HighlightedParticipatoryProcesses.new |
-            FilteredParticipatoryProcesses.new("active")
-
-          next unless highlighted_processes.any?
-
-          view_context.render(
-            partial: "decidim/participatory_processes/pages/home/highlighted_processes",
-            locals: {
-              highlighted_processes: highlighted_processes
-            }
-          )
+      initializer "decidim_participatory_processes.content_blocks" do
+        Decidim.content_blocks.register(:homepage, :highlighted_processes) do |content_block|
+          content_block.cell = "decidim/participatory_processes/content_blocks/highlighted_processes"
+          content_block.public_name_key = "decidim.participatory_processes.content_blocks.highlighted_processes.name"
         end
       end
     end

data/lib/decidim/participatory_processes/participatory_space.rb

@@ -37,6 +37,14 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
     organization = Decidim::Organization.first
     seeds_root = File.join(__dir__, "..", "..", "..", "db", "seeds")
 
+    Decidim::ContentBlock.create(
+      organization: organization,
+      weight: 31,
+      scope: :homepage,
+      manifest_name: :highlighted_processes,
+      published_at: Time.current
+    )
+
     process_groups = []
     2.times do
       process_groups << Decidim::ParticipatoryProcessGroup.create!(
@@ -72,8 +80,8 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         target: Decidim::Faker::Localized.sentence(3),
         participatory_scope: Decidim::Faker::Localized.sentence(1),
         participatory_structure: Decidim::Faker::Localized.sentence(2),
-        start_date: Time.current,
-        end_date: 2.months.from_now.at_midnight,
+        start_date: Date.current,
+        end_date: 2.months.from_now,
         participatory_process_group: process_groups.sample,
         scope: n.positive? ? nil : Decidim::Scope.reorder(Arel.sql("RANDOM()")).first
       )
@@ -86,8 +94,8 @@ Decidim.register_participatory_space(:participatory_processes) do |participatory
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
         end,
-        start_date: 1.month.ago.at_midnight,
-        end_date: 2.months.from_now.at_midnight
+        start_date: 1.month.ago,
+        end_date: 2.months.from_now
       )
 
       # Create users with specific roles

data/lib/decidim/participatory_processes/test/factories.rb

@@ -26,17 +26,17 @@ FactoryBot.define do
     target { Decidim::Faker::Localized.sentence(3) }
     participatory_scope { Decidim::Faker::Localized.sentence(1) }
     participatory_structure { Decidim::Faker::Localized.sentence(2) }
-    show_statistics true
-    private_space false
-    start_date { Time.current }
-    end_date { 2.months.from_now.at_midnight }
+    show_statistics { true }
+    private_space { false }
+    start_date { Date.current }
+    end_date { 2.months.from_now }
 
     trait :promoted do
-      promoted true
+      promoted { true }
     end
 
     trait :unpublished do
-      published_at nil
+      published_at { nil }
     end
 
     trait :published do
@@ -44,7 +44,7 @@ FactoryBot.define do
     end
 
     trait :with_steps do
-      transient { current_step_ends 1.month.from_now }
+      transient { current_step_ends { 1.month.from_now } }
 
       after(:create) do |participatory_process, evaluator|
         create(:participatory_process_step,
@@ -83,9 +83,9 @@ FactoryBot.define do
   factory :participatory_process_step, class: "Decidim::ParticipatoryProcessStep" do
     title { Decidim::Faker::Localized.sentence(3) }
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
-    start_date { 1.month.ago.at_midnight }
-    end_date { 2.months.from_now.at_midnight }
-    position nil
+    start_date { 1.month.ago }
+    end_date { 2.months.from_now }
+    position { nil }
     participatory_process
 
     after(:create) do |step, _evaluator|
@@ -94,7 +94,7 @@ FactoryBot.define do
     end
 
     trait :active do
-      active true
+      active { true }
     end
   end
 
@@ -146,6 +146,6 @@ FactoryBot.define do
   factory :participatory_process_user_role, class: "Decidim::ParticipatoryProcessUserRole" do
     user
     participatory_process { create :participatory_process, organization: user.organization }
-    role "admin"
+    role { "admin" }
   end
 end

data/lib/decidim/participatory_processes/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-participatory_processes version.
   module ParticipatoryProcesses
     def self.version
-      "0.13.1"
+      "0.14.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-participatory_processes
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.14.1
 description: Participatory processes component for decidim.
 email:
 - josepjaume@gmail.com
@@ -70,7 +70,14 @@ files:
 - app/assets/images/decidim/participatory_processes/process.svg
 - app/assets/javascripts/decidim/participatory_processes/admin/participatory_processes.js.es6
 - app/assets/javascripts/decidim/participatory_processes/filters.js.es6
+- app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/_all_processes.erb
+- app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/show.erb
+- app/cells/decidim/participatory_processes/content_blocks/highlighted_processes/single_process.erb
+- app/cells/decidim/participatory_processes/content_blocks/highlighted_processes_cell.rb
 - app/cells/decidim/participatory_processes/process_cell.rb
+- app/cells/decidim/participatory_processes/process_filters/filter_tabs.erb
+- app/cells/decidim/participatory_processes/process_filters/show.erb
+- app/cells/decidim/participatory_processes/process_filters_cell.rb
 - app/cells/decidim/participatory_processes/process_group_cell.rb
 - app/cells/decidim/participatory_processes/process_group_m/footer.erb
 - app/cells/decidim/participatory_processes/process_group_m_cell.rb
@@ -155,7 +162,6 @@ files:
 - app/types/decidim/participatory_processes/participatory_process_type.rb
 - app/views/decidim/participatory_process_groups/_participatory_process_group.html.erb
 - app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb
-- app/views/decidim/participatory_processes/_order_by_processes.html.erb
 - app/views/decidim/participatory_processes/_participatory_process.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_process_copies/_form.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_process_copies/new.html.erb
@@ -177,11 +183,11 @@ files:
 - app/views/decidim/participatory_processes/admin/participatory_processes/edit.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_processes/index.html.erb
 - app/views/decidim/participatory_processes/admin/participatory_processes/new.html.erb
-- app/views/decidim/participatory_processes/pages/home/_highlighted_processes.html.erb
 - app/views/decidim/participatory_processes/participatory_process_groups/show.html.erb
 - app/views/decidim/participatory_processes/participatory_process_steps/_timeline.html.erb
 - app/views/decidim/participatory_processes/participatory_process_steps/index.html.erb
 - app/views/decidim/participatory_processes/participatory_process_widgets/show.html.erb
+- app/views/decidim/participatory_processes/participatory_processes/_order_by_processes.html.erb
 - app/views/decidim/participatory_processes/participatory_processes/_promoted_process.html.erb
 - app/views/decidim/participatory_processes/participatory_processes/_statistics.html.erb
 - app/views/decidim/participatory_processes/participatory_processes/index.html.erb
@@ -201,6 +207,7 @@ files:
 - config/locales/fi.yml
 - config/locales/fr.yml
 - config/locales/gl.yml
+- config/locales/hu.yml
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
@@ -271,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Decidim participatory processes module

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

@@ -1,12 +0,0 @@
-<div class="row collapse order-by">
-  <h2 class="order-by__text section-heading">
-    <%= t("participatory_processes.order_by_processes.processes", scope: "layouts.decidim", count: collection.count) %>
-    <% if include_filter %>
-      <span class="order-by__tabs">
-        <% %w(past active upcoming all).each do |filter_name| %>
-          <%= link_to t(".#{filter_name}"), { filter: filter_name }, remote: true, class: "order-by__tab #{'is-active' if filter == filter_name }" %>
-        <% end %>
-      </span>
-    <% end %>
-  </h2>
-</div>

data/app/views/decidim/participatory_processes/pages/home/_highlighted_processes.html.erb

@@ -1,35 +0,0 @@
-<div class="row" id="highlighted-processes">
-  <h3 class="section-heading"><%= t(".active_processes") %></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") %>
-                  <strong><%= translated_attribute process.active_step.title %></strong>
-                </span>
-              <% end %>
-            </div>
-          </article>
-        </div>
-      <% end %>
-    </div>
-  </div>
-</div>
-<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"), decidim_participatory_processes.participatory_processes_path, class: "button expanded hollow button--sc home-section__cta" %>
-  </div>
-</div>