decidim-assemblies 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abbaf0cf55ca1946b02e15843d4387759c36090db90ee1e8a8a895f5fbbfe161
-  data.tar.gz: 46dcc5d7d581b17dc6d4d84e65a41aab62288ace410dfe6518de6871fe1ccd95
+  metadata.gz: '09b9f26ef758d2c8a4d363252f2362cfbbc5d289e3218e28447a27a15b5c87ed'
+  data.tar.gz: a8e851f1646503f6adfdd4c0862ba3a0d31e61deefe583d3da723b9e89e545e0
 SHA512:
-  metadata.gz: 8fa667363b5800dd52ce3af34e5c3174337c1d1218f1b0d7819aecff91b4b8a1b8cf51d25af4c71470fa471f9e9151b1b7c9910d279e7396f36beb7acefd6a6e
-  data.tar.gz: ba25a4be31a8a6d950fdcaad18076caba0debdceb308fbc6c37bb168e39eb833e944934e078ee32e9d40edb68eb3f92e9ace380795c76f2685ac9f2a0a76fca5
+  metadata.gz: 7865bc7cac30fee454dc891c31db636a8d7c4f74fe39fea0aa9327c2cb695add217b8923a2332c502ad85a683e90d31c652ef7c56308772b6e5fc0f59aa47b68
+  data.tar.gz: de8a5ceb9fb13df9b45fbb53daad619a7eae91b080907dd600da1371809ca0fcb5df9fea66d8ca049ab704af8ea2f40355cea1918096d149c5d5e3ece7c012c9

data/app/assets/images/decidim/assemblies/assembly.svg

@@ -1,6 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02">
-  <path d="M883.8,543.84a18,18,0,1,1,18-18A18,18,0,0,1,883.8,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,883.8,509.83Z" transform="translate(-865.8 -507.83)" />
-  <ellipse ry="5.504777" rx="5.5598245" cy="17.971844" cx="18" />
-  <path d="M883.8,543.84a18,18,0,1,1,18-18A18,18,0,0,1,883.8,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,883.8,509.83Z" transform="translate(-865.8 -507.83)" />
-  <path d="m 6.3078227,-25.154474 a 9.3338938,9.0435648 0 0 1 -8.7369752,9.025052 9.3338938,9.0435648 0 0 1 -9.8544645,-7.870717 9.3338938,9.0435648 0 0 1 7.4765554,-10.031744" transform="matrix(-0.78352169,0.62136443,-0.62136443,-0.78352169,0,0)" class="stroked-shape" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 34 34">
+  <path d="M31.593 20.937c.338-1.255.518-2.575.518-3.937 0-8.346-6.765-15.111-15.111-15.111S1.889 8.654 1.889 17c0 1.362.18 2.682.518 3.937a10.378 10.378 0 0 1 2.712-.36c2.422 0 4.717.835 6.55 2.328a10.348 10.348 0 0 1 5.177-1.383c1.95 0 3.786.542 5.357 1.49a10.338 10.338 0 0 1 6.678-2.434c.925 0 1.836.121 2.712.359zm-.606 1.793a8.487 8.487 0 0 0-2.106-.263 8.448 8.448 0 0 0-5.107 1.707 10.355 10.355 0 0 1 2.913 4.425 15.151 15.151 0 0 0 4.3-5.869zm-27.974 0c.9 2.195 2.302 4.13 4.062 5.665a10.357 10.357 0 0 1 2.982-4.345 8.45 8.45 0 0 0-4.938-1.583c-.718 0-1.424.089-2.106.263zm23.805 8.15a.94.94 0 0 1-.324.224A16.921 16.921 0 0 1 17 34C7.611 34 0 26.389 0 17S7.611 0 17 0s17 7.611 17 17c0 5.732-2.836 10.8-7.182 13.88zm-1.75-1.1a8.492 8.492 0 0 0-16.398-.17A15.04 15.04 0 0 0 17 32.11a15.04 15.04 0 0 0 8.067-2.331zm-3.042-14.33a5.18 5.18 0 1 1-10.36 0 5.18 5.18 0 0 1 10.36 0zm-1.89 0a3.291 3.291 0 1 0-6.582 0 3.291 3.291 0 0 0 6.583 0zm-11.333.944a3.062 3.062 0 1 1-6.124.001 3.062 3.062 0 0 1 6.124-.001zm-1.888 0a1.173 1.173 0 1 0-2.347 0 1.173 1.173 0 0 0 2.347 0zm18.28 0a3.063 3.063 0 1 1 6.127.002 3.063 3.063 0 0 1-6.126-.002zm1.89 0a1.174 1.174 0 1 0 2.348 0 1.174 1.174 0 0 0-2.348 0z"/>
 </svg>

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb

@@ -11,8 +11,15 @@ module Decidim
           render if highlighted_assemblies.any?
         end
 
+        def max_results
+          model.settings.max_results
+        end
+
         def highlighted_assemblies
-          OrganizationPrioritizedAssemblies.new(current_organization, current_user)
+          @highlighted_assemblies ||= OrganizationPrioritizedAssemblies
+                                      .new(current_organization, current_user)
+                                      .query
+                                      .limit(max_results)
         end
 
         def i18n_scope

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form/show.erb

@@ -0,0 +1,3 @@
+<% form.fields_for :settings, form.object.settings do |settings_fields| %>
+  <%= settings_fields.select :max_results, [4, 8, 12], prompt: "", label: label %>
+<% end %>

data/app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form_cell.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module ContentBlocks
+      class HighlightedAssembliesSettingsFormCell < Decidim::ViewModel
+        alias form model
+
+        def content_block
+          options[:content_block]
+        end
+
+        def label
+          I18n.t("decidim.assemblies.admin.content_blocks.highlighted_assemblies.max_results")
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/assembly_activity_cell.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  # A cell to display when an Assembly has been published.
+  class AssemblyActivityCell < ActivityCell
+    def title
+      I18n.t "decidim.assemblies.last_activity.new_assembly"
+    end
+  end
+end

data/app/commands/decidim/assemblies/admin/copy_assembly.rb

@@ -50,6 +50,7 @@ module Decidim
             banner_image: @assembly.banner_image,
             promoted: @assembly.promoted,
             scope: @assembly.scope,
+            parent: @assembly.parent,
             developer_group: @assembly.developer_group,
             local_area: @assembly.local_area,
             target: @assembly.target,

data/app/commands/decidim/assemblies/admin/publish_assembly.rb

@@ -23,7 +23,7 @@ module Decidim
         def call
           return broadcast(:invalid) if assembly.nil? || assembly.published?
 
-          Decidim.traceability.perform_action!("publish", assembly, current_user) do
+          Decidim.traceability.perform_action!("publish", assembly, current_user, visibility: "all") do
             assembly.publish!
           end
 

data/app/controllers/decidim/assemblies/admin/assembly_copies_controller.rb

@@ -20,7 +20,7 @@ module Decidim
           CopyAssembly.call(@form, current_assembly) do
             on(:ok) do
               flash[:notice] = I18n.t("assemblies_copies.create.success", scope: "decidim.admin")
-              redirect_to assemblies_path
+              redirect_to assemblies_path(parent_id: current_assembly.parent_id)
             end
 
             on(:invalid) do

data/app/controllers/decidim/assemblies/assemblies_controller.rb

@@ -14,12 +14,32 @@ module Decidim
       helper Decidim::SanitizeHelper
       helper Decidim::ResourceReferenceHelper
 
-      helper_method :collection, :promoted_assemblies, :assemblies, :stats, :assembly_participatory_processes
+      helper_method :collection, :parent_assemblies, :promoted_assemblies, :assemblies, :stats, :assembly_participatory_processes
 
       def index
-        redirect_to "/404" if published_assemblies.none?
-
         enforce_permission_to :list, :assembly
+
+        respond_to do |format|
+          format.html do
+            raise ActionController::RoutingError, "Not Found" if published_assemblies.none?
+
+            render "index"
+          end
+
+          format.json do
+            render json: published_assemblies.query.includes(:children).where(parent: nil).collect { |assembly|
+              {
+                name: assembly.title[I18n.locale.to_s],
+                children: assembly.children.collect do |child|
+                  {
+                    name: child.title[I18n.locale.to_s],
+                    children: child.children.collect { |child_of_child| { name: child_of_child.title[I18n.locale.to_s] } }
+                  }
+                end
+              }
+            }
+          end
+        end
       end
 
       def show
@@ -44,7 +64,11 @@ module Decidim
         @assemblies ||= OrganizationPrioritizedAssemblies.new(current_organization, current_user)
       end
 
-      alias collection assemblies
+      def parent_assemblies
+        @parent_assemblies ||= assemblies | ParentAssemblies.new
+      end
+
+      alias collection parent_assemblies
 
       def promoted_assemblies
         @promoted_assemblies ||= assemblies | PromotedAssemblies.new

data/app/forms/decidim/assemblies/admin/assembly_member_form.rb

@@ -13,8 +13,8 @@ module Decidim
         attribute :gender, String
         attribute :birthday, Decidim::Attributes::TimeWithZone
         attribute :birthplace, String
-        attribute :ceased_date, Decidim::Attributes::TimeWithZone
-        attribute :designation_date, Decidim::Attributes::TimeWithZone
+        attribute :ceased_date, Decidim::Attributes::LocalizedDate
+        attribute :designation_date, Decidim::Attributes::LocalizedDate
         attribute :designation_mode, String
         attribute :position, String
         attribute :position_other, String

data/app/models/decidim/assembly_member.rb

@@ -15,7 +15,7 @@ module Decidim
 
     default_scope { order(weight: :asc, created_at: :asc) }
 
-    scope :not_ceased, -> { where(ceased_date: nil) }
+    scope :not_ceased, -> { where("ceased_date >= ? OR ceased_date IS NULL", Time.zone.today) }
 
     def self.log_presenter_class_for(_log)
       Decidim::Assemblies::AdminLog::AssemblyMemberPresenter

data/app/queries/decidim/assemblies/metrics/assemblies_metric_manage.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Metrics
+      class AssembliesMetricManage < Decidim::MetricManage
+        def metric_name
+          "assemblies"
+        end
+
+        private
+
+        def query
+          return @query if @query
+
+          @query = Decidim::Assembly.where(organization: @organization)
+          @query = @query.where("decidim_assemblies.published_at <= ?", end_time)
+          @query
+        end
+
+        def quantity
+          @quantity ||= query.where("decidim_assemblies.published_at >= ?", start_time).count
+        end
+      end
+    end
+  end
+end

data/app/queries/decidim/assemblies/parent_assemblies.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This query filters assemblies so only parent assemblies are returned.
+    class ParentAssemblies < Rectify::Query
+      def query
+        Decidim::Assembly.where(parent: nil)
+      end
+    end
+  end
+end

data/app/views/decidim/assemblies/admin/assembly_members/index.html.erb

@@ -23,7 +23,7 @@
       <div class="filters__search">
         <div class="input-group">
           <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
-          <%= hidden_field_tag :state, @state %>
+          <%= hidden_field_tag :status, @status %>
           <div class="input-group-button">
             <button type="submit" class="button button--muted">
               <%= icon "magnifying-glass", aria_label: t(".search") %>
@@ -68,10 +68,10 @@
                 <%= member_presenter.position %>
               </td>
               <td>
-                <%= l member.designation_date, format: :datepicker %>
+                <%= l member.designation_date, format: :decidim_short %>
               </td>
               <td>
-                <%= member.ceased_date ? l(member.ceased_date, format: :datepicker) : nil %>
+                <%= member.ceased_date ? l(member.ceased_date, format: :decidim_short) : nil %>
               </td>
               <td class="table-list__actions">
                 <% if allowed_to? :update, :assembly_member, member: member %>
@@ -86,6 +86,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @assembly_members, theme: "decidim" %>
     </div>
   </div>
 </div>

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

@@ -22,4 +22,13 @@ edit_link(
       <%= render(collection) %>
     </div>
   </section>
+
+  <section id="assemblies-chart" class="row column section">
+    <div class="row column">
+      <h2 class="section-heading"><%= t("assemblies.index.organizational_chart", scope: "layouts.decidim") %></h2>
+      <article id="orgchart-<%= SecureRandom.hex(5) %>" class="card orgchart js-orgchart absolutes" data-url="<%= decidim_assemblies.assemblies_path(format: :json) %>">
+        <button class="medium-1 m-s top left button small hollow invisible js-reset-orgchart"><%= t("assemblies.index.reset_chart", scope: "layouts.decidim") %></button>
+      </article>
+    </div>
+  </section>
 </main>

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

@@ -75,7 +75,7 @@ edit_link(
         </div>
       <% end %>
 
-      <%= render_hook(:assembly_meetings) %>
+      <%= render_hook(:current_participatory_space_meetings) %>
 
       <%= attachments_for current_participatory_space %>
       <% if current_participatory_space.children_count > 0 %>
@@ -160,7 +160,7 @@ edit_link(
         <% if current_participatory_space.creation_date.presence %>
           <div class="definition-data__item creation_date">
             <span class="definition-data__title"><%= t("assemblies.show.creation_date", scope: "decidim") %></span>
-            <%= l current_participatory_space.creation_date, format: :datepicker %>
+            <%= l current_participatory_space.creation_date, format: :decidim_short %>
           </div>
         <% end %>
 
@@ -178,7 +178,7 @@ edit_link(
         <div class="definition-data__item duration">
           <span class="definition-data__title"><%= t("assemblies.show.duration", scope: "decidim") %></span>
           <% if current_participatory_space.duration.presence %>
-            <%= l current_participatory_space.duration, format: :datepicker %>
+            <%= l current_participatory_space.duration, format: :decidim_short %>
           <% else %>
             <%= t("assemblies.show.indefinite_duration", scope: "decidim") %>
           <% end %>
@@ -187,14 +187,14 @@ edit_link(
         <% if current_participatory_space.included_at.presence %>
           <div class="definition-data__item included_at">
             <span class="definition-data__title"><%= t("assemblies.show.included_at", scope: "decidim") %></span>
-            <%= l current_participatory_space.included_at, format: :datepicker %>
+            <%= l current_participatory_space.included_at, format: :decidim_short %>
           </div>
         <% end %>
 
         <% if current_participatory_space.closing_date.presence %>
           <div class="definition-data__item closing_date">
             <span class="definition-data__title"><%= t("assemblies.show.closing_date", scope: "decidim") %></span>
-            <%= l current_participatory_space.closing_date, format: :datepicker %>
+            <%= l current_participatory_space.closing_date, format: :decidim_short %>
             <br />
             <%= decidim_sanitize translated_attribute(current_participatory_space.closing_date_reason) %>
           </div>

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

@@ -1,6 +1,7 @@
 <% content_for :secondary_nav do %>
   <div class="secondary-nav secondary-nav--subnav">
     <ul>
+      <%= public_page_link decidim_assemblies.assembly_path(current_participatory_space) %>
       <% if allowed_to? :update, :assembly, assembly: current_participatory_space %>
         <li <% if is_active_link?(decidim_admin_assemblies.edit_assembly_path(current_participatory_space)) %> class="is-active" <% end %>>
           <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.edit_assembly_path(current_participatory_space) %>

data/config/locales/ca.yml

@@ -238,6 +238,9 @@ ca:
               not_ceased: No cessat
             filter_by: Filtra per
             search: Cerca
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Quantitat màxima d'elements que es mostraran
       assembly_members:
         index:
           members: Membres
@@ -258,6 +261,8 @@ ca:
         public: Públic
       index:
         title: Assemblees
+      last_activity:
+        new_assembly: Nova assemblea
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ ca:
           not_found: 'L''assemblea no s''ha trobada a la base de dades (ID: %{id})'
     menu:
       assemblies: Assemblees
+    metrics:
+      assemblies:
+        object: assemblees
+        title: Assemblees
   errors:
     messages:
       cannot_be_blank: no es pot deixar en blanc
@@ -329,7 +338,9 @@ ca:
         assembly:
           take_part: Participa
         index:
+          organizational_chart: Organigrama
           promoted_assemblies: Assemblees destacades
+          reset_chart: Restablir
         order_by_assemblies:
           assemblies:
             one: "%{count} assemblea"

data/config/locales/de.yml

@@ -238,6 +238,9 @@ de:
               not_ceased: Nicht aufgehört
             filter_by: Filtern nach
             search: Suche
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Maximale Anzahl der Elemente, die angezeigt werden sollen
       assembly_members:
         index:
           members: Mitglieder
@@ -258,6 +261,8 @@ de:
         public: Öffentlichkeit
       index:
         title: Baugruppen
+      last_activity:
+        new_assembly: Neue Montage
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ de:
           not_found: 'Die Assembly wurde nicht in der Datenbank gefunden (ID: %{id})'
     menu:
       assemblies: Baugruppen
+    metrics:
+      assemblies:
+        object: Baugruppen
+        title: Baugruppen
   errors:
     messages:
       cannot_be_blank: darf nicht leer sein
@@ -329,7 +338,9 @@ de:
         assembly:
           take_part: Teilnehmen
         index:
+          organizational_chart: Organigramm
           promoted_assemblies: Hervorgehobene Baugruppen
+          reset_chart: Zurücksetzen
         order_by_assemblies:
           assemblies:
             one: "%{count} Versammlung"

data/config/locales/en.yml

@@ -239,6 +239,9 @@ en:
               not_ceased: Not ceased
             filter_by: Filter by
             search: Search
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Maximum amount of elements to show
       assembly_members:
         index:
           members: Members
@@ -259,6 +262,8 @@ en:
         public: Public
       index:
         title: Assemblies
+      last_activity:
+        new_assembly: New assembly
       pages:
         home:
           highlighted_assemblies:
@@ -321,6 +326,10 @@ en:
           not_found: 'The assembly was not found on the database (ID: %{id})'
     menu:
       assemblies: Assemblies
+    metrics:
+      assemblies:
+        object: assemblies
+        title: Assemblies
   errors:
     messages:
       cannot_be_blank: can not be blank
@@ -330,7 +339,9 @@ en:
         assembly:
           take_part: Take part
         index:
+          organizational_chart: Organizational chart
           promoted_assemblies: Highlighted assemblies
+          reset_chart: Reset
         order_by_assemblies:
           assemblies:
             one: "%{count} assembly"

data/config/locales/es-PY.yml

@@ -238,6 +238,9 @@ es-PY:
               not_ceased: No cesado
             filter_by: Filtrado por
             search: Buscar
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Cantidad máxima de elementos para mostrar
       assembly_members:
         index:
           members: Miembros
@@ -258,6 +261,8 @@ es-PY:
         public: Público
       index:
         title: Asambleas
+      last_activity:
+        new_assembly: Nueva asamblea
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ es-PY:
           not_found: 'No se encontró la asamblea en la base de datos (ID: %{id})'
     menu:
       assemblies: Asambleas
+    metrics:
+      assemblies:
+        object: asambleas
+        title: Asambleas
   errors:
     messages:
       cannot_be_blank: no puede estar en blanco
@@ -329,7 +338,9 @@ es-PY:
         assembly:
           take_part: Participa
         index:
+          organizational_chart: Organigrama
           promoted_assemblies: Asambleas destacadas
+          reset_chart: Reiniciar
         order_by_assemblies:
           assemblies:
             one: "%{count} asamblea"

data/config/locales/es.yml

@@ -238,6 +238,9 @@ es:
               not_ceased: No cesado
             filter_by: Filtrado por
             search: Buscar
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Cantidad máxima de elementos para mostrar
       assembly_members:
         index:
           members: Miembros
@@ -258,6 +261,8 @@ es:
         public: Público
       index:
         title: Asambleas
+      last_activity:
+        new_assembly: Nueva asamblea
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ es:
           not_found: 'No se encontró la asamblea en la base de datos (ID: %{id})'
     menu:
       assemblies: Asambleas
+    metrics:
+      assemblies:
+        object: asambleas
+        title: Asambleas
   errors:
     messages:
       cannot_be_blank: no puede estar en blanco
@@ -329,7 +338,9 @@ es:
         assembly:
           take_part: Participa
         index:
+          organizational_chart: Organigrama
           promoted_assemblies: Asambleas destacadas
+          reset_chart: Reiniciar
         order_by_assemblies:
           assemblies:
             one: "%{count} asamblea"

data/config/locales/eu.yml

@@ -238,6 +238,9 @@ eu:
               not_ceased: Ez da gelditu
             filter_by: Iragazi arabera
             search: Search
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Erakusteko elementu gehienen kopurua
       assembly_members:
         index:
           members: Bazkideek
@@ -258,6 +261,8 @@ eu:
         public: Publiko
       index:
         title: Biltzarrak
+      last_activity:
+        new_assembly: Batzar berria
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ eu:
           not_found: 'Ez da muntaia aurkitu datu-basean (ID: %{id})'
     menu:
       assemblies: Biltzarrak
+    metrics:
+      assemblies:
+        object: batzarrak
+        title: Batzar
   errors:
     messages:
       cannot_be_blank: ezin da hutsik egon
@@ -329,7 +338,9 @@ eu:
         assembly:
           take_part: Parte hartu
         index:
+          organizational_chart: Organigrama
           promoted_assemblies: Batzar nabarmenduak
+          reset_chart: Berrezarri
         order_by_assemblies:
           assemblies:
             one: "%{count} batzarra"

data/config/locales/fi.yml

@@ -150,7 +150,7 @@ fi:
           error: Ryhmän käyttäjän päivityksessä tapahtui virhe.
           success: Ryhmän käyttäjä päivitetty onnistuneesti.
       menu:
-        assemblies: Kehitysryhmät
+        assemblies: Ryhmät
         assemblies_submenu:
           assembly_admins: Ryhmän käyttäjät
           assembly_members: Jäsenet
@@ -194,7 +194,7 @@ fi:
             collaborator: Osallistumiskäyttäjä
             moderator: Moderoija
       titles:
-        assemblies: Kehitysryhmät
+        assemblies: Ryhmät
     admin_log:
       assembly:
         create: "%{user_name} loi %{resource_name} ryhmän"
@@ -238,6 +238,9 @@ fi:
               not_ceased: Ei lakkautettu
             filter_by: Suodata
             search: Hae
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Näytettävien elementtien enimmäismäärä
       assembly_members:
         index:
           members: Jäsenet
@@ -257,12 +260,14 @@ fi:
         others: Muut
         public: Julkinen
       index:
-        title: Kehitysryhmät
+        title: Ryhmät
+      last_activity:
+        new_assembly: Uusi ryhmä
       pages:
         home:
           highlighted_assemblies:
-            active_assemblies: Aktiiviset kehitysryhmät
-            see_all_assemblies: Näytä kaikki kehitysryhmät
+            active_assemblies: Aktiiviset ryhmät
+            see_all_assemblies: Näytä kaikki ryhmät
         user_profile:
           member_of:
             member_of: Jäsen ryhmässä
@@ -295,7 +300,7 @@ fi:
         target: Kuka osallistuu
       statistics:
         answers_count: Vastaukset
-        assemblies_count: Kehitysryhmät
+        assemblies_count: Ryhmät
         comments_count: Kommentit
         debates_count: Keskustelut
         endorsements_count: Suositukset
@@ -319,7 +324,11 @@ fi:
         assembly_presenter:
           not_found: 'Ryhmää ei löytynyt tietokannasta (ID: %{id})'
     menu:
-      assemblies: Kehitysryhmät
+      assemblies: Ryhmät
+    metrics:
+      assemblies:
+        object: ryhmät
+        title: Ryhmät
   errors:
     messages:
       cannot_be_blank: ei voi olla tyhjä
@@ -329,7 +338,9 @@ fi:
         assembly:
           take_part: Osallistu
         index:
-          promoted_assemblies: Korostetut kehitysryhmät
+          organizational_chart: Organisaatiokaavio
+          promoted_assemblies: Korostetut ryhmät
+          reset_chart: Palauta
         order_by_assemblies:
           assemblies:
             one: "%{count} ryhmä"

data/config/locales/fr.yml

@@ -238,6 +238,9 @@ fr:
               not_ceased: Validité en cours
             filter_by: Filtrer par
             search: Rechercher
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Quantité maximale d'éléments à afficher
       assembly_members:
         index:
           members: Membres
@@ -258,6 +261,8 @@ fr:
         public: Public
       index:
         title: Assemblées
+      last_activity:
+        new_assembly: Nouvelle assemblée
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ fr:
           not_found: 'L''assemblée n''a pas été trouvée sur la base de données (ID: %{id})'
     menu:
       assemblies: Assemblées
+    metrics:
+      assemblies:
+        object: assemblées
+        title: Assemblages
   errors:
     messages:
       cannot_be_blank: ne peut être vide
@@ -329,7 +338,9 @@ fr:
         assembly:
           take_part: Participer
         index:
+          organizational_chart: Organigramme
           promoted_assemblies: Assemblées mises en avant
+          reset_chart: Réinitialiser
         order_by_assemblies:
           assemblies:
             one: "%{count} assemblée"

data/config/locales/gl.yml

@@ -238,6 +238,9 @@ gl:
               not_ceased: Non cesou
             filter_by: Filtrar por
             search: Busca
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Cantidade máxima de elementos para mostrar
       assembly_members:
         index:
           members: Membros
@@ -258,6 +261,8 @@ gl:
         public: Público
       index:
         title: Asembleas
+      last_activity:
+        new_assembly: Nova montaxe
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ gl:
           not_found: 'A asemblea non se atopou na base de datos (ID: %{id})'
     menu:
       assemblies: Asembleas
+    metrics:
+      assemblies:
+        object: asembleas
+        title: Asembleas
   errors:
     messages:
       cannot_be_blank: non pode estar en branco
@@ -329,7 +338,9 @@ gl:
         assembly:
           take_part: Tomar parte en
         index:
+          organizational_chart: Organigrama
           promoted_assemblies: Asembleas destacadas
+          reset_chart: Restablecer
         order_by_assemblies:
           assemblies:
             one: "Asemblea %{count}"

data/config/locales/hu.yml

@@ -238,6 +238,9 @@ hu:
               not_ceased: Nem szűnt meg
             filter_by: 'Szűrés ez alapján:'
             search: Keresés
+        content_blocks:
+          highlighted_assemblies:
+            max_results: A megjelenítendő elemek maximális száma
       assembly_members:
         index:
           members: Tagok
@@ -258,6 +261,8 @@ hu:
         public: Nyilvános
       index:
         title: Gyűlések
+      last_activity:
+        new_assembly: Új összeszerelés
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ hu:
           not_found: 'A gyűlés nem található az adatbázisban (ID: %{id})'
     menu:
       assemblies: Gyűlések
+    metrics:
+      assemblies:
+        object: szerelvények
+        title: szerelvények
   errors:
     messages:
       cannot_be_blank: nem lehet üres
@@ -329,7 +338,9 @@ hu:
         assembly:
           take_part: Vegyél részt
         index:
+          organizational_chart: Szervezési táblázat
           promoted_assemblies: Kiemelt gyűlések
+          reset_chart: Visszaállítás
         order_by_assemblies:
           assemblies:
             one: "%{count} gyűlés"

data/config/locales/it.yml

@@ -238,6 +238,9 @@ it:
               not_ceased: Non è cessato
             filter_by: Filtra per
             search: Ricerca
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Quantità massima di elementi da mostrare
       assembly_members:
         index:
           members: Utenti
@@ -258,6 +261,8 @@ it:
         public: Pubblico
       index:
         title: assemblee
+      last_activity:
+        new_assembly: Nuovo assemblaggio
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ it:
           not_found: 'L''assembly non è stato trovato nel database (ID: %{id})'
     menu:
       assemblies: assemblee
+    metrics:
+      assemblies:
+        object: assiemi
+        title: assemblee
   errors:
     messages:
       cannot_be_blank: non può essere vuoto
@@ -329,7 +338,9 @@ it:
         assembly:
           take_part: Partecipa
         index:
+          organizational_chart: Grafico organizzativo
           promoted_assemblies: Assiemi evidenziati
+          reset_chart: Reset
         order_by_assemblies:
           assemblies:
             one: "%{count} montaggio"

data/config/locales/nl.yml

@@ -238,6 +238,9 @@ nl:
               not_ceased: Niet opgehouden
             filter_by: Filteren op
             search: Zoeken
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Maximum aantal elementen dat kan worden weergegeven
       assembly_members:
         index:
           members: leden
@@ -258,6 +261,8 @@ nl:
         public: Openbaar
       index:
         title: Events
+      last_activity:
+        new_assembly: Nieuwe vergadering
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ nl:
           not_found: 'De assembly is niet gevonden in de database (ID: %{id})'
     menu:
       assemblies: Events
+    metrics:
+      assemblies:
+        object: assemblages
+        title: Assemblies
   errors:
     messages:
       cannot_be_blank: mag niet leeg zijn
@@ -329,7 +338,9 @@ nl:
         assembly:
           take_part: Deelnemen
         index:
+          organizational_chart: Organisatieschema
           promoted_assemblies: Uitgelichte events
+          reset_chart: Reset
         order_by_assemblies:
           assemblies:
             one: "%{count} bijeenkomst"

data/config/locales/pl.yml

@@ -244,6 +244,9 @@ pl:
               not_ceased: Nie przestał
             filter_by: Filtruj według
             search: Szukaj
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Maksymalna ilość elementów do pokazania
       assembly_members:
         index:
           members: Członkowie
@@ -264,6 +267,8 @@ pl:
         public: Publiczny
       index:
         title: Zespoły
+      last_activity:
+        new_assembly: Nowy montaż
       pages:
         home:
           highlighted_assemblies:
@@ -326,6 +331,10 @@ pl:
           not_found: 'Zestaw nie został znaleziony w bazie danych (ID: %{id})'
     menu:
       assemblies: Zespoły
+    metrics:
+      assemblies:
+        object: zespoły
+        title: Złożenia
   errors:
     messages:
       cannot_be_blank: nie może być puste
@@ -335,7 +344,9 @@ pl:
         assembly:
           take_part: Wziąć udział
         index:
+          organizational_chart: Schemat organizacyjny
           promoted_assemblies: Podświetlone zespoły
+          reset_chart: Nastawić
         order_by_assemblies:
           assemblies:
             one: "%{count} montaż"

data/config/locales/pt-BR.yml

@@ -238,6 +238,9 @@ pt-BR:
               not_ceased: Não cessou
             filter_by: Filtrar por
             search: Procurar
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Quantidade máxima de elementos para mostrar
       assembly_members:
         index:
           members: Membros
@@ -258,6 +261,8 @@ pt-BR:
         public: Público
       index:
         title: Assembleias
+      last_activity:
+        new_assembly: Nova assembleia
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ pt-BR:
           not_found: 'O assembly não foi encontrado no banco de dados (ID: %{id})'
     menu:
       assemblies: Assembleias
+    metrics:
+      assemblies:
+        object: assembleias
+        title: Assembleias
   errors:
     messages:
       cannot_be_blank: nao pode estar em branco
@@ -329,7 +338,9 @@ pt-BR:
         assembly:
           take_part: Participar
         index:
+          organizational_chart: Organograma
           promoted_assemblies: Montagens destacadas
+          reset_chart: Restabelecer
         order_by_assemblies:
           assemblies:
             one: "Assembly %{count}"

data/config/locales/pt.yml

@@ -238,6 +238,9 @@ pt:
               not_ceased: Não cessou
             filter_by: Filtrar por
             search: Pesquisa
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Quantidade máxima de elementos para mostrar
       assembly_members:
         index:
           members: Membros
@@ -258,6 +261,8 @@ pt:
         public: Público
       index:
         title: Assembléias
+      last_activity:
+        new_assembly: Nova montagem
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ pt:
           not_found: 'O assembly não foi encontrado no banco de dados (ID: %{id})'
     menu:
       assemblies: Assembléias
+    metrics:
+      assemblies:
+        object: assembléias
+        title: Assemblies
   errors:
     messages:
       cannot_be_blank: nao pode estar em branco
@@ -329,7 +338,9 @@ pt:
         assembly:
           take_part: Participar
         index:
+          organizational_chart: Organograma
           promoted_assemblies: Montagens destacadas
+          reset_chart: Restabelecer
         order_by_assemblies:
           assemblies:
             one: "Assembly %{count}"

data/config/locales/sv.yml

@@ -238,6 +238,9 @@ sv:
               not_ceased: Inte upphört
             filter_by: Filtrera efter
             search: Sök
+        content_blocks:
+          highlighted_assemblies:
+            max_results: Maximalt antal element att visa
       assembly_members:
         index:
           members: Medlemmar
@@ -258,6 +261,8 @@ sv:
         public: Offentligt
       index:
         title: Möten
+      last_activity:
+        new_assembly: Ny sammankomst
       pages:
         home:
           highlighted_assemblies:
@@ -320,6 +325,10 @@ sv:
           not_found: 'Mötet hittades inte i databasen (ID: %{id})'
     menu:
       assemblies: Möten
+    metrics:
+      assemblies:
+        object: aggregaten
+        title: Assemblies
   errors:
     messages:
       cannot_be_blank: kan inte vara tomt
@@ -329,7 +338,9 @@ sv:
         assembly:
           take_part: Delta
         index:
+          organizational_chart: Organisationsschema
           promoted_assemblies: Markerade möten
+          reset_chart: Återställ
         order_by_assemblies:
           assemblies:
             one: "%{count} möte"

data/lib/decidim/assemblies/engine.rb

@@ -68,7 +68,7 @@ module Decidim
           assemblies = OrganizationPublishedAssemblies.new(view_context.current_organization, view_context.current_user)
                                                       .query.distinct
                                                       .joins(:members)
-                                                      .merge(Decidim::AssemblyMember.where(user: view_context.user))
+                                                      .merge(Decidim::AssemblyMember.where(user: view_context.profile_holder))
                                                       .reorder(title: :asc)
 
           next unless assemblies.any?
@@ -89,8 +89,22 @@ module Decidim
         Decidim.content_blocks.register(:homepage, :highlighted_assemblies) do |content_block|
           content_block.cell = "decidim/assemblies/content_blocks/highlighted_assemblies"
           content_block.public_name_key = "decidim.assemblies.content_blocks.highlighted_assemblies.name"
+          content_block.settings_form_cell = "decidim/assemblies/content_blocks/highlighted_assemblies_settings_form"
+
+          content_block.settings do |settings|
+            settings.attribute :max_results, type: :integer, default: 4
+          end
         end
       end
+
+      initializer "decidim_assemblies.register_metrics" do
+        Decidim.metrics_registry.register(
+          :assemblies,
+          "Decidim::Assemblies::Metrics::AssembliesMetricManage",
+          Decidim::MetricRegistry::NOT_HIGHLIGHTED,
+          1
+        )
+      end
     end
   end
 end

data/lib/decidim/assemblies/participatory_space.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Decidim.register_participatory_space(:assemblies) do |participatory_space|
-  participatory_space.icon = "decidim/assemblies/icon.svg"
+  participatory_space.icon = "decidim/assemblies/assembly.svg"
   participatory_space.model_class_name = "Decidim::Assembly"
 
   participatory_space.participatory_spaces do |organization|
@@ -38,7 +38,7 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
     )
 
     2.times do |n|
-      assembly = Decidim::Assembly.create!(
+      params = {
         title: Decidim::Faker::Localized.sentence(5),
         slug: Faker::Internet.unique.slug(nil, "-"),
         subtitle: Decidim::Faker::Localized.sentence(2),
@@ -88,7 +88,16 @@ Decidim.register_participatory_space(:assemblies) do |participatory_space|
         instagram_handler: Faker::Lorem.word,
         youtube_handler: Faker::Lorem.word,
         github_handler: Faker::Lorem.word
-      )
+      }
+
+      assembly = Decidim.traceability.perform_action!(
+        "publish",
+        Decidim::Assembly,
+        organization.users.first,
+        visibility: "all"
+      ) do
+        Decidim::Assembly.create!(params)
+      end
 
       # Create users with specific roles
       Decidim::AssemblyUserRole::ROLES.each do |role|

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

@@ -9,37 +9,37 @@ FactoryBot.define do
   end
 
   factory :assembly, class: "Decidim::Assembly" do
-    title { Decidim::Faker::Localized.sentence(3) }
+    title { generate_localized_title }
     slug { generate(:assembly_slug) }
-    subtitle { Decidim::Faker::Localized.sentence(1) }
-    short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
-    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(4) } }
+    subtitle { generate_localized_title }
+    short_description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     hero_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     banner_image { Decidim::Dev.test_file("city2.jpeg", "image/jpeg") }
     published_at { Time.current }
     organization
     meta_scope { Decidim::Faker::Localized.word }
-    developer_group { Decidim::Faker::Localized.sentence(1) }
-    local_area { Decidim::Faker::Localized.sentence(2) }
-    target { Decidim::Faker::Localized.sentence(3) }
-    participatory_scope { Decidim::Faker::Localized.sentence(1) }
-    participatory_structure { Decidim::Faker::Localized.sentence(2) }
+    developer_group { generate_localized_title }
+    local_area { generate_localized_title }
+    target { generate_localized_title }
+    participatory_scope { generate_localized_title }
+    participatory_structure { generate_localized_title }
     show_statistics { true }
     private_space { false }
-    purpose_of_action { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
-    composition { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
+    purpose_of_action { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    composition { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     assembly_type { "others" }
-    assembly_type_other { Decidim::Faker::Localized.sentence(1) }
+    assembly_type_other { generate_localized_title }
     creation_date { 1.month.ago }
     created_by { "others" }
     created_by_other { Decidim::Faker::Localized.word }
     duration { 2.months.from_now.at_midnight }
     included_at { 1.month.ago }
     closing_date { 2.months.from_now.at_midnight }
-    closing_date_reason { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
-    internal_organisation { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
+    closing_date_reason { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    internal_organisation { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     is_transparent { true }
-    special_features { Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(2) } }
+    special_features { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     twitter_handler { "others" }
     facebook_handler { "others" }
     instagram_handler { "others" }

data/lib/decidim/assemblies/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-assemblies version.
   module Assemblies
     def self.version
-      "0.14.4"
+      "0.15.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-assemblies
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-12 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.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 description: Assemblies component for decidim.
 email:
 - josepjaume@gmail.com
@@ -79,6 +79,9 @@ files:
 - app/cells/decidim/assemblies/assembly_member_cell.rb
 - app/cells/decidim/assemblies/content_blocks/highlighted_assemblies/show.erb
 - app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_cell.rb
+- app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form/show.erb
+- app/cells/decidim/assemblies/content_blocks/highlighted_assemblies_settings_form_cell.rb
+- app/cells/decidim/assembly_activity_cell.rb
 - app/commands/decidim/assemblies/admin/copy_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly.rb
 - app/commands/decidim/assemblies/admin/create_assembly_admin.rb
@@ -135,9 +138,11 @@ files:
 - app/queries/decidim/assemblies/admin/admin_users.rb
 - app/queries/decidim/assemblies/admin/assembly_members.rb
 - app/queries/decidim/assemblies/assemblies_with_user_role.rb
+- app/queries/decidim/assemblies/metrics/assemblies_metric_manage.rb
 - app/queries/decidim/assemblies/organization_assemblies.rb
 - app/queries/decidim/assemblies/organization_prioritized_assemblies.rb
 - app/queries/decidim/assemblies/organization_published_assemblies.rb
+- app/queries/decidim/assemblies/parent_assemblies.rb
 - app/queries/decidim/assemblies/prioritized_assemblies.rb
 - app/queries/decidim/assemblies/promoted_assemblies.rb
 - app/queries/decidim/assemblies/published_assemblies.rb
@@ -231,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim assemblies module