decidim-assemblies 0.23.3 → 0.24.1

data/config/locales/ru.yml

@@ -307,17 +307,18 @@ ru:
         target: Кто участвует
       statistics:
         answers_count: Ответов
-        assemblies_count: Собраний
+        assemblies_count: Собрания
         comments_count: Комментариев
         debates_count: Обсуждений
         endorsements_count: Выражений поддержки
-        headline: Деятельность
         meetings_count: Встреч
         orders_count: Голосов
         pages_count: Страниц
+        participants_count: Участников
         projects_count: Проектов
         proposals_count: Предложений
         results_count: Итогов
+        supports_count: Голосов
         surveys_count: Опросов
         users_count: Участников
         votes_count: Голосов

data/config/locales/sk.yml

@@ -129,7 +129,6 @@ sk:
     admin_log:
       assembly_type:
         create: "%{user_name} vytvoril %{resource_name} nový typ zhromaždenia"
-        delete: "%{user_name} odstránil %{resource_name} používateľa z typu zhromaždenia %{space_name}"
         publish: "%{user_name} vytvoril nový typ zhromaždenia %{resource_name}"
         unpublish: "%{user_name} zrušil publikovanie typu zhromaždenia %{resource_name}"
         update: "%{user_name} aktualizoval typ zhromaždenia %{resource_name}"
@@ -163,8 +162,6 @@ sk:
       home:
         hero:
           participate_title: Podieľajte sa na procesoch platformy
-        sub_hero:
-          register_title: Vytvorte si účet na platforme
     participatory_processes:
       pages:
         home:

data/config/locales/sl.yml

@@ -238,14 +238,15 @@ sl:
         assemblies_count: Združbe
         comments_count: Komentarji
         debates_count: Debate
-        headline: Dejavnost
         meetings_count: Sestanki
         orders_count: Podpora
         pages_count: Strani
+        participants_count: Udeleženci
         posts_count: Objave
         projects_count: Projekti
         proposals_count: Predlogi
         results_count: Rezultati
+        supports_count: Podpora
         surveys_count: Ankete
         users_count: Udeleženci
         votes_count: Podpora

data/config/locales/sr-CS.yml

@@ -25,7 +25,6 @@ sr:
     admin_log:
       assembly_type:
         create: "%{user_name} je stvorio tip veća %{resource_name}"
-        delete: "%{user_name} je uklonio člana %{resource_name} iz tipa veća %{space_name}"
         publish: "%{user_name} je objavio tip veća %{resource_name}"
         unpublish: "%{user_name} je odustao od objavljivanja tipa veća %{resource_name}"
         update: "%{user_name} je ažurirao tip veća %{resource_name}"
@@ -64,8 +63,6 @@ sr:
       home:
         hero:
           participate_title: Učestvujte u procesima platforme
-        sub_hero:
-          register_title: Registrujte se na platformu
     participatory_processes:
       pages:
         home:

data/config/locales/sv.yml

@@ -1,6 +1,8 @@
 sv:
   activemodel:
     attributes:
+      assemblies_setting:
+        enable_organization_chart: Aktivera organisationskarta
       assembly:
         area_id: Område
         assembly_type: Typ av grupp
@@ -50,6 +52,7 @@ sv:
         target: Vem deltar
         title: Titel
         twitter: Twitter
+        weight: Vikt
         youtube: YouTube
       assembly_member:
         birthday: Födelsedag
@@ -60,6 +63,7 @@ sv:
         full_name: Fullständigt namn
         gender: Kön
         position: Befattning
+        user_id: Användare
       assembly_user_role:
         email: E-post
         name: Namn
@@ -246,7 +250,7 @@ sv:
         update: "%{user_name} uppdaterade inställningarna för församlingarna"
       assembly_type:
         create: "%{user_name} skapade grupptypen %{resource_name}"
-        delete: "%{user_name} tog bort medlemmen %{resource_name} från grupptypen %{space_name}"
+        delete: "%{user_name} raderade grupptypen %{resource_name}"
         publish: "%{user_name} publicerade grupptypen %{resource_name}"
         unpublish: "%{user_name} avpublicerade grupptypen %{resource_name}"
         update: "%{user_name} uppdaterade grupptypen %{resource_name}"
@@ -383,14 +387,18 @@ sv:
         comments_count: Kommentarer
         debates_count: Debatter
         endorsements_count: Instämmanden
-        headline: Aktivitet
+        followers_count: Följare
+        headline: Statistik
         meetings_count: Möten
         orders_count: Stöd
         pages_count: Sidor
+        participants_count: Deltagare
         posts_count: Inlägg
+        processes_count: Dialoger
         projects_count: Projekt
         proposals_count: Förslag
         results_count: Resultat
+        supports_count: Stöd
         surveys_count: Undersökningar
         users_count: Deltagare
         votes_count: Stöd
@@ -441,7 +449,7 @@ sv:
         hero:
           participate_title: Delta i plattformens dialoger
         sub_hero:
-          register_title: Skapa ett konto på plattformen genom att logga in
+          register_title: Skapa ett konto
     participatory_processes:
       pages:
         home:

data/config/locales/tr-TR.yml

@@ -249,7 +249,6 @@ tr:
         update: "%{user_name}, kurul ayarlarını güncelledi"
       assembly_type:
         create: "%{user_name},%{resource_name} kurul türünü oluşturdu"
-        delete: "%{user_name},%{resource_name} üyesini %{space_name} kurul türünden kaldırdı"
         publish: "%{user_name}, %{resource_name} kurul türünü yayınladı"
         unpublish: "%{user_name}, %{resource_name} kurul türünü yayından kaldırdı"
         update: "%{user_name}, %{resource_name} kurul türünü güncelledi"
@@ -386,14 +385,15 @@ tr:
         comments_count: Yorumlar
         debates_count: Tartışmalar
         endorsements_count: Onaylar
-        headline: Aktivite
         meetings_count: Toplantılar
         orders_count: Destekler
         pages_count: Sayfalar
+        participants_count: Katılımcılar
         posts_count: Yayınlar
         projects_count: Projeler
         proposals_count: Teklifler
         results_count: Sonuçlar
+        supports_count: Destekler
         surveys_count: Anketler
         users_count: Katılımcılar
         votes_count: Destekler
@@ -443,8 +443,6 @@ tr:
       home:
         hero:
           participate_title: Platformun süreçlerine katılın
-        sub_hero:
-          register_title: Platformda bir hesap oluşturmak için kaydolun
     participatory_processes:
       pages:
         home:

data/config/locales/uk.yml

@@ -307,17 +307,18 @@ uk:
         target: Хто бере участь
       statistics:
         answers_count: Відповідей
-        assemblies_count: Зборів
+        assemblies_count: Збори
         comments_count: Коментарів
         debates_count: Обговорень
         endorsements_count: Проявів підтримки
-        headline: Діяльність
         meetings_count: Зустрічей
         orders_count: Голосів
         pages_count: Сторінок
+        participants_count: Учасників
         projects_count: Проектів
         proposals_count: Пропозицій
         results_count: Підсумків
+        supports_count: Голосів
         surveys_count: Опитувань
         users_count: Учасників
         votes_count: Голосів

data/config/locales/zh-CN.yml

@@ -243,7 +243,6 @@ zh-CN:
         update: "%{user_name} 更新了程序集设置"
       assembly_type:
         create: "%{user_name} 创建了 %{resource_name} 组装类型"
-        delete: "%{user_name} 将 %{resource_name} 成员从 %{space_name} 组装类型中移除"
         publish: "%{user_name} 发布了 %{resource_name} 组装类型"
         unpublish: "%{user_name} 未发布的 %{resource_name} 组装类型"
         update: "%{user_name} 更新了 %{resource_name} 装配体类型"
@@ -377,14 +376,15 @@ zh-CN:
         comments_count: 评论
         debates_count: 辩论
         endorsements_count: 授权
-        headline: 活动
         meetings_count: 会议
         orders_count: 支持
         pages_count: 页 次
+        participants_count: 参加者
         posts_count: 员额
         projects_count: 项目
         proposals_count: 建议
         results_count: 成果
+        supports_count: 支持
         surveys_count: 调查
         users_count: 参加者
         votes_count: 支持
@@ -434,8 +434,6 @@ zh-CN:
       home:
         hero:
           participate_title: 参与平台进程
-        sub_hero:
-          register_title: 注册在平台上创建帐户
     participatory_processes:
       pages:
         home:

data/db/migrate/20210204152393_add_weight_field_to_assembly.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddWeightFieldToAssembly < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_assemblies, :weight, :integer, null: false, default: true
+  end
+end

data/db/migrate/20210310120444_add_followable_counter_cache_to_assemblies.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class AddFollowableCounterCacheToAssemblies < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_assemblies, :follows_count, :integer, null: false, default: 0, index: true
+
+    reversible do |dir|
+      dir.up do
+        Decidim::Assembly.reset_column_information
+        Decidim::Assembly.find_each do |record|
+          record.class.reset_counters(record.id, :follows)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/api/assemblies_type_type.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents an AssembliesType.
+    class AssembliesTypeType < Decidim::Api::Types::BaseObject
+      description "An assemblies type"
+
+      field :id, GraphQL::Types::ID, "The assemblies type's unique ID", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title of this assemblies type.", null: false
+      field :created_at, Decidim::Core::DateTimeType, "The time this assemblies type was created", null: false
+      field :updated_at, Decidim::Core::DateTimeType, "The time this assemblies type was updated", null: false
+      field :assemblies, [Decidim::Assemblies::AssemblyType, { null: true }], "Assemblies with this assemblies type", null: false
+    end
+  end
+end

data/lib/decidim/api/assembly_member_type.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents a assembly.
+    class AssemblyMemberType < Decidim::Api::Types::BaseObject
+      description "An assembly member"
+
+      field :id, GraphQL::Types::ID, "Internal ID of the member", null: false
+      field :full_name, GraphQL::Types::String, "Full name of the member", null: true
+      field :position, GraphQL::Types::String, "Position of the member in the assembly", null: true
+
+      field :user, Decidim::Core::UserType, "The corresponding decidim user", null: true
+
+      field :created_at, Decidim::Core::DateTimeType, "The time this member was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "The time this member was updated", null: true
+
+      field :weight, GraphQL::Types::Int, "Order of appearance in which it should be represented", null: true
+      field :gender, GraphQL::Types::String, "Gender of the member", null: true
+      # field :birthday, Decidim::Core::DateType, "Birthday date of the member" # non-public currently
+      field :birthplace, GraphQL::Types::String, "Birthplace of the member", null: true
+      field :designation_date, Decidim::Core::DateType, "Date of designation of the member", null: true
+      # field :designationMode, types.String, "Mode in which the member was designated", property: :designation_mode # non-public currently
+      field :position_other, GraphQL::Types::String, "Custom position name", null: true
+      field :ceased_date, Decidim::Core::DateType, "Date of cease for the member", null: true
+    end
+  end
+end

data/lib/decidim/api/assembly_type.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This type represents a assembly.
+    class AssemblyType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ParticipatorySpaceInterface
+      implements Decidim::Core::AttachableInterface
+      implements Decidim::Core::ParticipatorySpaceResourceableInterface
+
+      description "An assembly"
+
+      field :id, ID, "The internal ID for this assembly", null: false
+      field :subtitle, Decidim::Core::TranslatedFieldType, "The subtitle of this assembly", null: true
+      field :short_description, Decidim::Core::TranslatedFieldType, "The sort description of this assembly", null: true
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this assembly", null: true
+      field :slug, String, "The slug of this assembly", null: false
+      field :hashtag, String, "The hashtag for this assembly", null: true
+      field :created_at, Decidim::Core::DateTimeType, "The time this assembly was created", null: false
+      field :updated_at, Decidim::Core::DateTimeType, "The time this assembly was updated", null: false
+      field :published_at, Decidim::Core::DateTimeType, "The time this assembly was published", null: false
+      field :reference, String, "Reference for this assembly", null: false
+      field :categories, [Decidim::Core::CategoryType, { null: true }], "Categories for this assembly", null: false
+
+      field :hero_image, String, "The hero image for this assembly", null: true
+      field :banner_image, String, "The banner image for this assembly", null: true
+      field :promoted, Boolean, "If this assembly is promoted (therefore in the homepage)", null: true
+      field :developer_group, Decidim::Core::TranslatedFieldType, "The promoter group of this assembly", null: true
+      field :meta_scope, Decidim::Core::TranslatedFieldType, "The scope metadata of this assembly", null: true
+      field :local_area, Decidim::Core::TranslatedFieldType, "The organization area of this assembly", null: true
+      field :target, Decidim::Core::TranslatedFieldType, "Who participates in this assembly", null: true
+      field :participatory_scope, Decidim::Core::TranslatedFieldType, "What is decided on this assembly", null: true
+      field :participatory_structure, Decidim::Core::TranslatedFieldType, "How it is decided on this assembly", null: true
+      field :show_statistics, Boolean, "If this assembly should show statistics", null: true
+      field :scopes_enabled, Boolean, "If this assembly has scopes enabled", null: true
+      field :private_space, Boolean, "If this assembly is a private space", null: true
+      field :area, Decidim::Core::AreaApiType, "Area of this assembly", null: true
+      field :parent, Decidim::Assemblies::AssemblyType, "The parent assembly of this assembly", null: true
+      field :parents_path, String, "Assembly hierarchy representation", null: true
+      field :children_count, Integer, "Number of children assemblies", null: true
+      field :purpose_of_action, Decidim::Core::TranslatedFieldType, "Purpose of action", null: true
+      field :composition, Decidim::Core::TranslatedFieldType, "Composition of this assembly", null: true
+      field :assembly_type, Decidim::Assemblies::AssembliesTypeType, "Type of the assembly", null: true
+      field :creation_date, Decidim::Core::DateType, "Creation date of this assembly", null: true
+      field :created_by, String, "The creator of this assembly", null: true
+      field :created_by_other, Decidim::Core::TranslatedFieldType, "Custom creator", null: true
+      field :duration, Decidim::Core::DateType, "Duration of this assembly", null: true
+      field :included_at, Decidim::Core::DateType, "Included at", null: true
+      field :closing_date, Decidim::Core::DateType, "Closing date of the assembly", null: true
+      field :closing_date_reason, Decidim::Core::TranslatedFieldType, "Closing date reason of this assembly", null: true
+      field :internal_organisation, Decidim::Core::TranslatedFieldType, "Internal organisation of this assembly", null: true
+      field :is_transparent, Boolean, "If this assembly is transparent", null: true
+      field :special_features, Decidim::Core::TranslatedFieldType, "Special features of this assembly", null: true
+      field :twitter_handler, String, "Twitter handler", null: true
+      field :instagram_handler, String, "Instagram handler", null: true
+      field :facebook_handler, String, "Facebook handler", null: true
+      field :youtube_handler, String, "Youtube handler", null: true
+      field :github_handler, String, "Github handler", null: true
+
+      field :members, [Decidim::Assemblies::AssemblyMemberType, { null: true }], "Members of this assembly", null: false
+      field :children, [Decidim::Assemblies::AssemblyType, { null: true }], "Childrens of this assembly", null: false
+    end
+  end
+end

data/lib/decidim/assemblies.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/assemblies/admin"
+require "decidim/assemblies/api"
 require "decidim/assemblies/engine"
 require "decidim/assemblies/admin_engine"
 require "decidim/assemblies/participatory_space"

data/lib/decidim/assemblies/admin_engine.rb

@@ -50,6 +50,7 @@ module Decidim
               get :share
             end
             resources :exports, only: :create
+            resources :imports, only: [:new, :create]
           end
 
           resources :moderations do
@@ -58,6 +59,7 @@ module Decidim
               put :hide
               put :unhide
             end
+            resources :reports, controller: "moderations/reports", only: [:index, :show]
           end
 
           resources :participatory_space_private_users, controller: "participatory_space_private_users" do
@@ -81,6 +83,12 @@ module Decidim
         end
       end
 
+      initializer "decidim_assemblies.action_controller" do |_app|
+        ActiveSupport.on_load :action_controller do
+          helper Decidim::Assemblies::Admin::AssembliesAdminMenuHelper if respond_to?(:helper)
+        end
+      end
+
       initializer "decidim_assemblies.admin_assets" do |app|
         app.config.assets.precompile += %w(admin/decidim_assemblies_manifest.js)
       end
@@ -90,11 +98,33 @@ module Decidim
           menu.item I18n.t("menu.assemblies", scope: "decidim.admin"),
                     decidim_admin_assemblies.assemblies_path,
                     icon_name: "dial",
-                    position: 3.5,
+                    position: 2.2,
                     active: :inclusive,
                     if: allowed_to?(:enter, :space_area, space_name: :assemblies)
         end
       end
+
+      initializer "decidim_assemblies.admin_assemblies_menu" do
+        Decidim.menu :admin_assemblies_menu do |menu|
+          menu.item I18n.t("menu.assemblies", scope: "decidim.admin"),
+                    decidim_admin_assemblies.assemblies_path,
+                    position: 1.0,
+                    active: is_active_link?(decidim_admin_assemblies.assemblies_path),
+                    if: allowed_to?(:read, :assembly_list)
+
+          menu.item I18n.t("menu.assemblies_types", scope: "decidim.admin"),
+                    decidim_admin_assemblies.assemblies_types_path,
+                    active: is_active_link?(decidim_admin_assemblies.assemblies_types_path),
+                    position: 1.1,
+                    if: allowed_to?(:manage, :assemblies_type)
+
+          menu.item I18n.t("menu.assemblies_settings", scope: "decidim.admin"),
+                    decidim_admin_assemblies.edit_assemblies_settings_path,
+                    active: is_active_link?(decidim_admin_assemblies.edit_assemblies_settings_path),
+                    position: 1.3,
+                    if: allowed_to?(:read, :assemblies_setting)
+        end
+      end
     end
   end
 end

data/lib/decidim/assemblies/api.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    autoload :AssemblyType, "decidim/api/assembly_type"
+    autoload :AssemblyMemberType, "decidim/api/assembly_member_type"
+    autoload :AssembliesTypeType, "decidim/api/assemblies_type_type"
+  end
+end