decidim-participatory_processes 0.26.0 → 0.27.0.rc1

data/app/presenters/decidim/participatory_processes/participatory_process_metric_charts_presenter.rb

@@ -4,7 +4,11 @@ module Decidim
   module ParticipatoryProcesses
     # A presenter to render metrics in ParticipatoryProcesses statistics page
     class ParticipatoryProcessMetricChartsPresenter < Decidim::MetricChartsPresenter
-      attribute :participatory_process, Decidim::ParticipatoryProcess
+      delegate :hidden_field_tag, :link_to, :capture, to: :view_context
+
+      def participatory_process
+        __getobj__.fetch(:participatory_process)
+      end
 
       def params
         capture do

data/app/presenters/decidim/participatory_processes/participatory_process_stats_presenter.rb

@@ -4,9 +4,12 @@ module Decidim
   module ParticipatoryProcesses
     # A presenter to render statistics in the homepage.
     class ParticipatoryProcessStatsPresenter < Decidim::StatsPresenter
-      attribute :participatory_process, Decidim::ParticipatoryProcess
       include Decidim::IconHelper
 
+      def participatory_process
+        __getobj__.fetch(:participatory_process)
+      end
+
       # Public: returns a collection of stats (Hash) for the Process Home.
       def collection
         highlighted_stats = process_participants_stats

data/app/queries/decidim/participatory_processes/admin/admin_users.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A class used to find the admins for a participatory process including
       # organization admins.
-      class AdminUsers < Rectify::Query
+      class AdminUsers < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # process - a process that needs to find its process admins

data/app/queries/decidim/participatory_processes/admin/moderators.rb

@@ -5,7 +5,7 @@ module Decidim
     module Admin
       # A class used to find the users that can moderate the participatory
       # process.
-      class Moderators < Rectify::Query
+      class Moderators < Decidim::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
         # process - a process that needs to find its moderators

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

@@ -5,7 +5,7 @@ module Decidim
     # This query class filters participatory processes groups given a filter name.
     # The filter is applied checking the start and end dates of the processes in
     # the group.
-    class FilteredParticipatoryProcessGroups < Rectify::Query
+    class FilteredParticipatoryProcessGroups < Decidim::Query
       def initialize(filter = "active")
         @filter = filter
       end

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

@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory processes given a filter name.
     # It uses the start and end dates to select the correct processes.
-    class FilteredParticipatoryProcesses < Rectify::Query
+    class FilteredParticipatoryProcesses < Decidim::Query
       def initialize(filter = "active")
         @filter = filter
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters all processes of a participatory process group
-    class GroupParticipatoryProcesses < Rectify::Query
+    class GroupParticipatoryProcesses < Decidim::Query
       def initialize(group)
         @group = group
       end

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

@@ -3,14 +3,14 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters published processes of a participatory process group
-    class GroupPublishedParticipatoryProcesses < Rectify::Query
+    class GroupPublishedParticipatoryProcesses < Decidim::Query
       def initialize(group, user = nil)
         @group = group
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           GroupParticipatoryProcesses.new(@group),
           VisibleParticipatoryProcesses.new(@user),
           PublishedParticipatoryProcesses.new

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query selects some prioritized processes.
-    class HighlightedParticipatoryProcesses < Rectify::Query
+    class HighlightedParticipatoryProcesses < Decidim::Query
       def query
         PrioritizedParticipatoryProcesses.new.query.limit(8)
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory process groups given an organization.
-    class OrganizationParticipatoryProcessGroups < Rectify::Query
+    class OrganizationParticipatoryProcessGroups < Decidim::Query
       def initialize(organization)
         @organization = organization
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters all processes given an organization.
-    class OrganizationParticipatoryProcesses < Rectify::Query
+    class OrganizationParticipatoryProcesses < Decidim::Query
       def initialize(organization)
         @organization = organization
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory process groups given an organization and a filter.
-    class OrganizationPrioritizedParticipatoryProcessGroups < Rectify::Query
+    class OrganizationPrioritizedParticipatoryProcessGroups < Decidim::Query
       def initialize(organization, filter = "active", user = nil)
         @organization = organization
         @filter = filter
@@ -11,7 +11,7 @@ module Decidim
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationParticipatoryProcessGroups.new(@organization),
           FilteredParticipatoryProcessGroups.new(@filter),
           VisibleParticipatoryProcessGroups.new(@user)

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

@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     # This query class filters public processes given an organization and a
     # filter in a meaningful prioritized order.
-    class OrganizationPrioritizedParticipatoryProcesses < Rectify::Query
+    class OrganizationPrioritizedParticipatoryProcesses < Decidim::Query
       def initialize(organization, filter = "active", user = nil)
         @organization = organization
         @filter = filter
@@ -12,7 +12,7 @@ module Decidim
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationPublishedParticipatoryProcesses.new(@organization, @user),
           PrioritizedParticipatoryProcesses.new,
           FilteredParticipatoryProcesses.new(@filter)

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory process groups given an organization.
-    class OrganizationPromotedParticipatoryProcessGroups < Rectify::Query
+    class OrganizationPromotedParticipatoryProcessGroups < Decidim::Query
       def initialize(organization)
         @organization = organization
       end

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

@@ -3,14 +3,14 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters published processes given an organization.
-    class OrganizationPublishedParticipatoryProcesses < Rectify::Query
+    class OrganizationPublishedParticipatoryProcesses < Decidim::Query
       def initialize(organization, user = nil)
         @organization = organization
         @user = user
       end
 
       def query
-        Rectify::Query.merge(
+        Decidim::Query.merge(
           OrganizationParticipatoryProcesses.new(@organization),
           VisibleParticipatoryProcesses.new(@user),
           PublishedParticipatoryProcesses.new

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # A class used to find the ParticipatoryProcesses from a ProcessGroup.
-    class ParticipatoryProcessesByGroup < Rectify::Query
+    class ParticipatoryProcessesByGroup < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       def self.for(process_group)
         new(process_group).query

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

@@ -4,7 +4,7 @@ module Decidim
   module ParticipatoryProcesses
     # This query orders processes by importance, prioritizing promoted processes
     # first, and closest to finalization date second.
-    class PrioritizedParticipatoryProcesses < Rectify::Query
+    class PrioritizedParticipatoryProcesses < Decidim::Query
       def query
         Decidim::ParticipatoryProcess.order(promoted: :desc).includes(:active_step).order("decidim_participatory_process_steps.end_date ASC")
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query filters participatory process groups so only promoted ones are returned.
-    class PromotedParticipatoryProcessGroups < Rectify::Query
+    class PromotedParticipatoryProcessGroups < Decidim::Query
       def query
         Decidim::ParticipatoryProcessGroup.promoted
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query filters processes so only promoted ones are returned.
-    class PromotedParticipatoryProcesses < Rectify::Query
+    class PromotedParticipatoryProcesses < Decidim::Query
       def query
         Decidim::ParticipatoryProcess.promoted
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query filters published processes only.
-    class PublishedParticipatoryProcesses < Rectify::Query
+    class PublishedParticipatoryProcesses < Decidim::Query
       def query
         Decidim::ParticipatoryProcess.published
       end

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

@@ -4,10 +4,10 @@ module Decidim
   module ParticipatoryProcesses
     # This class counts all Followers of a participatory process or
     # participatory processes belonging to a participatory process group
-    class StatsFollowersCount < Rectify::Query
+    class StatsFollowersCount < Decidim::Query
       def self.for(participatory_space)
         return 0 unless participatory_space.is_a?(Decidim::ParticipatoryProcess) ||
-                        participatory_space.is_a?(Decidim::ParticipatoryProcessGroup) && participatory_space.participatory_processes.exists?
+                        (participatory_space.is_a?(Decidim::ParticipatoryProcessGroup) && participatory_space.participatory_processes.exists?)
 
         new(participatory_space).query
       end

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

@@ -4,10 +4,10 @@ module Decidim
   module ParticipatoryProcesses
     # This class counts unique Participants on a participatory process or
     # participatory processes belonging to a participatory process group
-    class StatsParticipantsCount < Rectify::Query
+    class StatsParticipantsCount < Decidim::Query
       def self.for(participatory_space)
         return 0 unless participatory_space.is_a?(Decidim::ParticipatoryProcess) ||
-                        participatory_space.is_a?(Decidim::ParticipatoryProcessGroup) && participatory_space.participatory_processes.exists?
+                        (participatory_space.is_a?(Decidim::ParticipatoryProcessGroup) && participatory_space.participatory_processes.exists?)
 
         new(participatory_space).query
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory processes given a current_user.
-    class VisibleParticipatoryProcessGroups < Rectify::Query
+    class VisibleParticipatoryProcessGroups < Decidim::Query
       def initialize(current_user)
         @current_user = current_user
       end

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

@@ -3,7 +3,7 @@
 module Decidim
   module ParticipatoryProcesses
     # This query class filters participatory processes given a current_user.
-    class VisibleParticipatoryProcesses < Rectify::Query
+    class VisibleParticipatoryProcesses < Decidim::Query
       def initialize(current_user)
         @current_user = current_user
       end

data/app/serializers/decidim/participatory_processes/participatory_process_importer.rb

@@ -116,7 +116,7 @@ module Decidim
         attachments["files"].map do |file|
           next unless remote_file_exists?(file["remote_file_url"])
 
-          file_tmp = URI.open(file["remote_file_url"])
+          file_tmp = URI.parse(file["remote_file_url"]).open
 
           Decidim.traceability.perform_action!("create", Attachment, @user) do
             attachment = Attachment.new(

data/app/views/decidim/participatory_process_steps/_participatory_process_step.html.erb

@@ -7,7 +7,7 @@
       <span class="timeline__date text-small">
         <%= participatory_space_helpers.step_dates(participatory_process_step) %>
       </span>
-      <h4 class="timeline__title heading4"><%= translated_attribute(participatory_process_step.title) %></h4>
+      <h3 class="timeline__title heading4"><%= translated_attribute(participatory_process_step.title) %></h3>
     </div>
     <div class="timeline__content">
       <%= translated_attribute(participatory_process_step.description).html_safe %>

data/app/views/decidim/participatory_processes/admin/participatory_process_types/_form.html.erb

@@ -0,0 +1,11 @@
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t("participatory_process_types.form.title", scope: "decidim.admin") %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true %>
+    </div>
+  </div>
+</div>

data/app/views/decidim/participatory_processes/admin/participatory_process_types/edit.html.erb

@@ -0,0 +1,9 @@
+<%= decidim_form_for(@form, html: { class: "form edit_participatory_process_type" }) do |f| %>
+  <h2 class="process-title-summary">
+    <%= t("participatory_process_types.edit.title", scope: "decidim.admin") %>
+  </h2>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t("participatory_process_types.edit.update", scope: "decidim.admin"), class: "button" %>
+  </div>
+<% end %>

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

@@ -0,0 +1,60 @@
+<div class="card" id="participatory-process-types">
+  <div class="card-divider">
+    <h2 class="card-title">
+      <%= t("titles.participatory_process_types", scope: "decidim.admin") %>
+      <%= link_to(
+            t("actions.new_process_type", scope: "decidim.admin"),
+            [:new, :participatory_process_type],
+            class: "button tiny button--title"
+          ) if allowed_to? :create, :participatory_process_type %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("models.participatory_process_type.fields.title", scope: "decidim.admin") %></th>
+            <th><%= t("models.participatory_process_type.fields.created_at", scope: "decidim.admin") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% collection.each do |participatory_process_type| %>
+          <tr>
+            <td>
+              <% if allowed_to?(:update, :participatory_process_type, participatory_process_type: participatory_process_type) %>
+                <%= link_to(
+                      translated_attribute(participatory_process_type.title),
+                      edit_participatory_process_type_path(participatory_process_type)
+                    ) %>
+              <% else %>
+                <%= translated_attribute(participatory_process_type.title) %></td>
+              <% end %>
+            <td><%= l(participatory_process_type.created_at, format: :short) %></td>
+            <td class="table-list__actions">
+              <% if allowed_to?(:update, :participatory_process_type, participatory_process_type: participatory_process_type) %>
+                <%= icon_link_to(
+                      "pencil",
+                      edit_participatory_process_type_path(participatory_process_type),
+                      t("actions.edit", scope: "decidim.admin"),
+                      class: "action-icon--new"
+                    ) %>
+              <% end %>
+              <% if allowed_to?(:destroy, :participatory_process_type, participatory_process_type: participatory_process_type) %>
+                <%= icon_link_to(
+                      "circle-x",
+                      participatory_process_type_path(participatory_process_type),
+                      t("actions.destroy", scope: "decidim.admin"),
+                      class: "action-icon--remove",
+                      method: :delete,
+                      data: { confirm: t("actions.confirm_destroy", scope: "decidim.admin") }
+                    ) %>
+              <% end %>
+            </td>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,9 @@
+<%= decidim_form_for(@form, html: { class: "form new_participatory_process_type" }) do |f| %>
+  <h2 class="process-title-summary">
+    <%= t("participatory_process_types.new.title", scope: "decidim.admin") %>
+  </h2>
+  <%= render partial: "form", object: f %>
+  <div class="button--double form-general-submit">
+    <%= f.submit t("participatory_process_types.new.create", scope: "decidim.admin"), class: "button" %>
+  </div>
+<% end %>

data/app/views/decidim/participatory_processes/admin/participatory_processes/_form.html.erb

@@ -188,6 +188,16 @@
     <div class="row column">
       <%= form.check_box :show_metrics %>
     </div>
+
+    <% if @form.participatory_process_types_for_select.present? %>
+      <div class="row column">
+        <%= form.select(
+              :participatory_process_type_id,
+              @form.participatory_process_types_for_select,
+              include_blank: t(".select_participatory_process_type")
+            ) %>
+      </div>
+    <% end %>
   </div>
 </div>
 

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

@@ -19,4 +19,6 @@
   </div>
 </div>
 
-<%= javascript_pack_tag "decidim_participatory_processes" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_participatory_processes" %>
+<% end %>

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

@@ -1,12 +1,15 @@
 var $grid = $('#processes-grid');
-var $assembliesFilter = $('#processes-filter');
+var $order_by_filters = $grid.find('.processes-grid-order-by');
+var $loading = $grid.find('.loading');
 
 $grid.find('.card-grid').html('<%= j(cell(
                                       "decidim/participatory_processes/filtered_participatory_processes",
                                       participatory_processes
                                     ).show).strip.html_safe %>');
-$grid.find('.processes-grid-order-by').html('<%= j(cell(
-                                                    "decidim/participatory_process_groups/process_filters",
-                                                    group,
-                                                    base_relation: participatory_processes
-                                                  ).show).strip.html_safe %>');
+$order_by_filters.html('<%= j(cell(
+                                "decidim/participatory_process_groups/process_filters",
+                                group,
+                                base_relation: participatory_processes
+                              ).show).strip.html_safe %>');
+$order_by_filters.foundation();
+$loading.hide();

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

@@ -10,7 +10,7 @@
             <%= t(".back_to_process") %>
           <% end %>
 
-          <h3 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h3>
+          <h2 class="section-heading"><%= t("participatory_process_steps.index.process_steps", scope: "decidim") %></h2>
           <%= render partial: "timeline" %>
         </div>
       </div>

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

@@ -30,4 +30,6 @@ edit_link(
   </section>
 <% end %>
 
-<%= javascript_pack_tag "decidim_participatory_processes" %>
+<% content_for :js_content do %>
+  <%= javascript_pack_tag "decidim_participatory_processes" %>
+<% end %>

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

@@ -1,6 +1,8 @@
 var $grid = $('#processes-grid');
+var $order_by_filters = $grid.find('.processes-grid-order-by');
 var $loading = $grid.find('.loading');
 
 $grid.find('.card-grid').html('<%= j(render(collection)).strip.html_safe %>');
-$grid.find('.processes-grid-order-by').html('<%= j(render(partial: "decidim/participatory_processes/participatory_processes/order_by_processes", locals: { include_filter: true })).strip.html_safe %>');
+$order_by_filters.html('<%= j(render(partial: "decidim/participatory_processes/participatory_processes/order_by_processes", locals: { include_filter: true })).strip.html_safe %>');
+$order_by_filters.foundation();
 $loading.hide();

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

@@ -27,6 +27,7 @@
   <div class="row">
     <div class="columns medium-7 mediumlarge-8">
       <div class="section">
+        <h2 class="show-for-sr"><%= t(".title") %></h2>
         <% if participatory_process_group.present? %>
           <%= render partial: "participatory_process_group" %>
         <% end %>

data/app/views/layouts/decidim/_process_header.html.erb

@@ -11,14 +11,14 @@
           </h1>
         </div>
         <div>
-          <h2 class="text-highlight heading-small">
+          <p class="text-highlight heading-small">
             <% if current_participatory_space.hashtag.present? %>
               <span class="process-header__hashtag">
-                <%= link_to "##{decidim_html_escape(current_participatory_space.hashtag)}", "https://twitter.com/hashtag/#{decidim_html_escape(current_participatory_space.hashtag)}", target: "_blank" %>
+                <%= link_to "##{decidim_html_escape(current_participatory_space.hashtag)}", twitter_hashtag_url(decidim_html_escape(current_participatory_space.hashtag)), target: "_blank" %>
               </span>
             <% end %>
             <%= translated_attribute(current_participatory_space.subtitle) %>
-          </h2>
+          </p>
         </div>
       </div>
       <%= render partial: "layouts/decidim/process_header_steps", locals: { participatory_process: current_participatory_space } %>

data/app/views/layouts/decidim/admin/participatory_process_type.html.erb

@@ -0,0 +1,15 @@
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:admin_participatory_processes_menu).render %>
+<% end %>
+
+<%= render "layouts/decidim/admin/application" do %>
+  <div class="process-title">
+    <div class="process-title-content">
+      <%= link_to t("decidim.admin.titles.participatory_processes"), decidim_participatory_processes.participatory_processes_path, target: "_blank" %>
+    </div>
+  </div>
+
+  <div class="process-content">
+    <%= yield %>
+  </div>
+<% end %>

data/config/locales/am-ET.yml

@@ -1 +1,2 @@
+---
 am:

data/config/locales/ar.yml

@@ -1,3 +1,4 @@
+---
 ar:
   activemodel:
     attributes:

data/config/locales/bg.yml

@@ -1,3 +1,4 @@
+---
 bg:
   activemodel:
     attributes: