decidim-accountability 0.29.5 → 0.30.0.rc1

data/config/locales/uk.yml

@@ -9,8 +9,6 @@ uk:
         description: Опис
         end_date: Дата закінчення
         progress: Перебіг
-        project_ids: Включені проекти
-        proposals: Включені пропозиції
         start_date: Дата початку
         title: Назва
         updated_at: 'Оновлено:'
@@ -21,7 +19,7 @@ uk:
         progress: Перебіг
       timeline_entry:
         description: Опис
-        title: Назва
+        entry_date: Дата
     models:
       decidim/accountability/proposal_linked_event: Пропозиція, включена до підсумку
   activerecord:
@@ -89,10 +87,8 @@ uk:
       models:
         result:
           fields:
-            category: Категорія
             end_date: Дата закінчення
             progress: Перебіг
-            scope: Обсяг
             start_date: Дата початку
             status: Стан
             title: Назва
@@ -104,7 +100,7 @@ uk:
             progress: Перебіг
         timeline_entry:
           fields:
-            title: Назва
+            entry_date: Дата
       results:
         count:
           results_count:
@@ -112,12 +108,8 @@ uk:
             few: "%{count} підсумків"
             many: "%{count} підсумків"
             other: "%{count} підсумків"
-        filters:
-          all: Усі
         home_header:
           global_status: Загальний стан виконання
-        nav_breadcrumb:
-          global: Загальне виконання
         search:
           search: Пошук дій
         show:
@@ -125,13 +117,6 @@ uk:
             back_to_resource: Повернутися до підсумків
         timeline:
           title: Розвиток проекту
-    admin:
-      filters:
-        results:
-          category_id_eq:
-            label: Категорія
-          scope_id_eq:
-            label: Обсяг
     components:
       accountability:
         name: Звітність
@@ -140,7 +125,6 @@ uk:
             comments_enabled: Коментарі увімкнено
             display_progress_enabled: Показувати перебіг
             intro: Вступ
-            scope_id: Обсяг
           step:
             comments_blocked: Коментарі вимкнено
     events:
@@ -150,9 +134,6 @@ uk:
           email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{proposal_title}". Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
           email_subject: Оновлення до %{proposal_title}
           notification_title: Пропозиція <a href="%{proposal_path}">%{proposal_title}</a> була включена до підсумку <a href="%{resource_path}">%{resource_title}</a>.
-    metrics:
-      results:
-        title: Підсумки
     resource_links:
       included_projects:
         result_project: Проекти, включені до цих підсумків

data/config/locales/zh-CN.yml

@@ -9,8 +9,6 @@ zh-CN:
         description: 描述
         end_date: 结束日期
         progress: 进展情况
-        project_ids: 包括项目
-        proposals: 包括的建议
         start_date: 开始日期
         title: 标题
         updated_at: 更新于
@@ -21,7 +19,7 @@ zh-CN:
         progress: 进展情况
       timeline_entry:
         description: 描述
-        title: 标题
+        entry_date: 日期
     models:
       decidim/accountability/proposal_linked_event: 结果中包括的提案
       decidim/accountability/result_progress_updated_event: 结果进度更新
@@ -49,9 +47,6 @@ zh-CN:
             name: 结果
           status:
             name: 状态
-        projects_import:
-          new:
-            create: 导入
         results:
           edit:
             title: 编辑结果
@@ -99,10 +94,8 @@ zh-CN:
       models:
         result:
           fields:
-            category: 类别
             end_date: 结束日期
             progress: 进展情况
-            scope: 范围
             start_date: 开始日期
             status: 状态
             title: 标题
@@ -114,17 +107,13 @@ zh-CN:
             progress: 进展情况
         timeline_entry:
           fields:
-            title: 标题
+            entry_date: 日期
       results:
         count:
           results_count:
             other: "%{count} 个结果"
-        filters:
-          all: 所有的
         home_header:
           global_status: 全局执行状态
-        nav_breadcrumb:
-          global: 全局执行
         search:
           search: 搜索操作
         show:
@@ -132,13 +121,6 @@ zh-CN:
             back_to_resource: 返回结果
         timeline:
           title: 项目进化
-    admin:
-      filters:
-        results:
-          category_id_eq:
-            label: 类别
-          scope_id_eq:
-            label: 范围
     components:
       accountability:
         name: 问责制
@@ -148,8 +130,6 @@ zh-CN:
             comments_max_length: 评论最大长度 (默认值留0)
             display_progress_enabled: 显示进度
             intro: 简介
-            scope_id: 范围
-            scopes_enabled: 范围已启用
           step:
             comments_blocked: 评论已阻止
     events:

data/config/locales/zh-TW.yml

@@ -8,10 +8,7 @@ zh-TW:
         decidim_scope_id: 範圍
         description: 說明
         end_date: 結束日期
-        meetings_ids: 包含的會議
         progress: 進度
-        project_ids: 包含的專案
-        proposals: 包含的建議
         start_date: 開始日期
         title: 標題
         updated_at: 更新時間
@@ -22,6 +19,7 @@ zh-TW:
         progress: 進度
       timeline_entry:
         description: 說明
+        entry_date: 日期
         title: 標題
     models:
       decidim/accountability/proposal_linked_event: 在結果的建議
@@ -49,27 +47,6 @@ zh-TW:
           new:
             download_export: 匯出成 CSV
             import: 匯入
-            info: |
-              <p>建議透過下面步驟：</p>
-              <ol>
-              <li><a href='%{link_new_status}' target='_blank'>建立結果的狀態</a></li>
-              <li><a href='%{link_new_result}' target='_blank'>手動建立至少一個結果</a> 在這個管理介面，這樣一來在匯入前可以先理解需要填寫的格式</li>
-              <li>%{link_export_csv}</li>
-              <li>下載後在電腦調整，只能夠調整 CSV 檔案的下面欄位：
-                <ul>
-                <li><b>category/id:</b> 類別編號</li>
-                <li><b>scope/id:</b> 範圍編號</li>
-                <li><b>parent/id:</b> 上層編號 (相關結果)，選填</li>
-                <li><b>title/en:</b> 英文標題，這會依據語言設定不同</li>
-                <li><b>description/en:</b> 英文說明，這會依據語言設定不同</li>
-                <li><b>start_date:</b> 結果開始執行時間 (格式 YYYY-MM-DD)</li>
-                <li><b>end_date:</b> 結果結束執行時間 (格式 YYYY-MM-DD)</li>
-                <li><b>status/id:</b> 這個結果的狀態編號</li>
-                <li><b>progress:</b> 執行率百分比 (從 0 到 100) </li>
-                <li><b>proposals_ids:</b> 相關提案的內部編號 (逗點分隔)，會自動轉換為 <span class='attribute-name'>proposal_url</span></li>
-                </ul>
-              </li>
-              </ol>
         imports:
           create:
             success: 檔案開始匯入，執行完成後會寄發 email 說明匯入結果.
@@ -78,21 +55,10 @@ zh-TW:
             name: 結果
           status:
             name: 狀態
-        projects_import:
-          create:
-            invalid: 匯入專案到結果時發生錯誤，請確實依照說明小心操作，以及確認已經選擇要實做的專案
-          new:
-            create: 匯入
-            import_all_selected_projects: 匯入所有選擇的專案來實現
-            no_components: 在這個參與空間沒有預算元件來匯入專案到結果
-            success:
-              other: "%{count} 個專案已經排程匯入，完成後會寄送 email 通知."
         results:
           create:
             invalid: 建立結果時發生錯誤.
             success: 結果成功建立.
-          destroy:
-            success: 結果成功刪除.
           edit:
             title: 編輯結果
             update: 更新結果
@@ -178,12 +144,10 @@ zh-TW:
       models:
         result:
           fields:
-            category: 類別
             created_at: 建立時間
             end_date: 結束日期
             id: 編號
             progress: 進度
-            scope: 範圍
             start_date: 開始日期
             status: 狀態
             title: 標題
@@ -195,17 +159,14 @@ zh-TW:
             progress: 進度
         timeline_entry:
           fields:
+            entry_date: 日期
             title: 標題
       results:
         count:
           results_count:
             other: "%{count} 個結果"
-        filters:
-          all: 全部
         home_header:
           global_status: 全域執行狀態
-        nav_breadcrumb:
-          global: 全域執行
         search:
           search: 搜尋操作
         show:
@@ -216,10 +177,6 @@ zh-TW:
     admin:
       filters:
         results:
-          category_id_eq:
-            label: 類別
-          scope_id_eq:
-            label: 範圍
           status_id_eq:
             label: 狀態
     components:
@@ -233,8 +190,6 @@ zh-TW:
             comments_max_length: 留言字數上限 (0 表示使用預設)
             display_progress_enabled: 顯示進度
             intro: 介紹
-            scope_id: 範圍
-            scopes_enabled: 啟用的範圍
           step:
             comments_blocked: 留言已封鎖
     events:

data/db/migrate/20200827154103_add_commentable_counter_cache_to_results.rb

@@ -4,6 +4,6 @@ class AddCommentableCounterCacheToResults < ActiveRecord::Migration[5.2]
   def change
     add_column :decidim_accountability_results, :comments_count, :integer, null: false, default: 0, index: true
     Decidim::Accountability::Result.reset_column_information
-    Decidim::Accountability::Result.find_each(&:update_comments_count)
+    Decidim::Accountability::Result.unscoped.find_each(&:update_comments_count)
   end
 end

data/db/migrate/20240828103202_add_deleted_at_to_decidim_accountability_results.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddDeletedAtToDecidimAccountabilityResults < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_accountability_results, :deleted_at, :datetime
+    add_index :decidim_accountability_results, :deleted_at
+  end
+end

data/db/migrate/20240916112128_add_geolocation_fields_to_results.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddGeolocationFieldsToResults < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_accountability_results, :address, :text
+    add_column :decidim_accountability_results, :latitude, :float
+    add_column :decidim_accountability_results, :longitude, :float
+  end
+end

data/decidim-accountability.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-accountability"
   s.summary = "Decidim accountability module"

data/lib/decidim/accountability/admin_engine.rb

@@ -13,14 +13,28 @@ module Decidim
 
       routes do
         resources :statuses
-        resources :results, except: [:show] do
+        resources :results, except: [:show, :destroy] do
+          member do
+            patch :soft_delete
+            patch :restore
+          end
+
+          collection do
+            post :update_taxonomies, controller: "results_bulk_actions"
+            post :update_status, controller: "results_bulk_actions"
+            post :update_dates, controller: "results_bulk_actions"
+          end
+
           get :proposals_picker, on: :collection
+          get :manage_trash, on: :collection
 
           resources :attachment_collections, except: [:show]
           resources :attachments, except: [:show]
           resources :timeline_entries, except: [:show]
         end
-        resources :projects_import, only: [:new, :create]
+        resources :import_components, only: [:new, :create] do
+          get :preview, on: :collection
+        end
         get :import_results, to: "import_results#new"
         post :import_results, to: "import_results#create"
         root to: "results#index"

data/lib/decidim/accountability/component.rb

@@ -25,12 +25,12 @@ Decidim.register_component(:accountability) do |component|
   end
 
   component.settings(:global) do |settings|
-    settings.attribute :scopes_enabled, type: :boolean, default: true
-    settings.attribute :scope_id, type: :scope
+    settings.attribute :taxonomy_filters, type: :taxonomy_filters
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :comments_max_length, type: :integer, required: true
     settings.attribute :intro, type: :text, translated: true, editor: true
     settings.attribute :display_progress_enabled, type: :boolean, default: true
+    settings.attribute :geocoding_enabled, type: :boolean, default: false
   end
 
   component.register_stat :results_count, primary: true, priority: Decidim::StatsRegistry::HIGH_PRIORITY do |components, _start_at, _end_at|
@@ -45,7 +45,7 @@ Decidim.register_component(:accountability) do |component|
     exports.collection do |component_instance|
       Decidim::Accountability::Result
         .where(component: component_instance)
-        .includes(:category, :scope, :status, component: { participatory_space: :organization })
+        .includes(:taxonomies, :status, component: { participatory_space: :organization })
     end
 
     exports.include_in_open_data = true

data/lib/decidim/accountability/result_serializer.rb

@@ -17,14 +17,7 @@ module Decidim
       def serialize
         {
           id: result.id,
-          category: {
-            id: result.category.try(:id),
-            name: result.category.try(:name) || empty_translatable
-          },
-          scope: {
-            id: result.scope.try(:id),
-            name: result.scope.try(:name) || empty_translatable
-          },
+          taxonomies:,
           parent: {
             id: result.parent.try(:id)
           },
@@ -39,9 +32,16 @@ module Decidim
           },
           progress: result.progress,
           created_at: result.created_at,
+          updated_at: result.updated_at,
           url:,
           component: { id: component.id },
-          proposal_urls: proposals
+          proposal_urls: proposals,
+          reference: result.reference,
+          children_count: result.children_count,
+          comments_count: result.comments_count,
+          address: result.address,
+          latitude: result.latitude,
+          longitude: result.longitude
         }
       end
 
@@ -50,10 +50,6 @@ module Decidim
       attr_reader :result
       alias resource result
 
-      def component
-        result.component
-      end
-
       def proposals
         result.linked_resources(:proposals, "included_proposals").map do |proposal|
           Decidim::ResourceLocatorPresenter.new(proposal).url

data/lib/decidim/accountability/seeds.rb

@@ -17,10 +17,10 @@ module Decidim
         create_statuses!(component:)
 
         3.times do
-          categories = create_categories!
+          taxonomies = create_taxonomies!
 
-          categories.each do |category|
-            create_result!(component:, category:)
+          taxonomies.each do |taxonomy|
+            create_result!(component:, taxonomy:)
           end
         end
       end
@@ -33,8 +33,7 @@ module Decidim
           participatory_space:,
           settings: {
             intro: Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(word_count: 4) },
-            scopes_enabled: true,
-            scope_id: participatory_space.scope&.id
+            taxonomy_filters: create_filters!.pluck(:id)
           }
         }
 
@@ -53,36 +52,44 @@ module Decidim
         end
       end
 
-      def create_categories!
-        parent_category = participatory_space.categories.sample
-        categories = [parent_category]
+      def root_taxonomy
+        @root_taxonomy ||= participatory_space.organization.taxonomies.roots.find_by("name->>'#{I18n.locale}'= ?",
+                                                                                     "Categories") || participatory_space.organization.taxonomies.roots.sample
+      end
+
+      def create_taxonomies!
+        parent_taxonomy = root_taxonomy.children.sample || root_taxonomy.children.create!(name: Decidim::Faker::Localized.sentence(word_count: 5))
+        taxonomies = [parent_taxonomy]
 
         2.times do
-          categories << Decidim::Category.create!(
-            name: Decidim::Faker::Localized.sentence(word_count: 5),
-            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(sentence_count: 3)
-            end,
-            parent: parent_category,
-            participatory_space:
-          )
+          taxonomies << if parent_taxonomy.children.count > 1
+                          parent_taxonomy.children.sample
+                        else
+                          parent_taxonomy.children.create!(name: Decidim::Faker::Localized.sentence(word_count: 5))
+                        end
         end
 
-        categories
+        taxonomies
+      end
+
+      def create_filters!
+        root_taxonomy.taxonomy_filters || [create_taxonomy_filter!(root_taxonomy:, taxonomies: root_taxonomy.all_children)]
       end
 
-      def create_result!(component:, category:)
+      def create_result!(component:, taxonomy:)
         result = Decidim.traceability.create!(
           Decidim::Accountability::Result,
           admin_user,
           {
             component:,
-            scope: participatory_space.organization.scopes.sample,
-            category:,
+            taxonomies: [taxonomy],
             title: Decidim::Faker::Localized.sentence(word_count: 2),
             description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
               Decidim::Faker::Localized.paragraph(sentence_count: 3)
-            end
+            end,
+            address: "#{::Faker::Address.street_address} #{::Faker::Address.zip} #{::Faker::Address.city}",
+            latitude: ::Faker::Address.latitude,
+            longitude: ::Faker::Address.longitude
           },
           visibility: "all"
         )

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

@@ -17,9 +17,7 @@ FactoryBot.define do
     participatory_space { create(:participatory_process, :with_steps, organization:, skip_injection:) }
     settings do
       {
-        intro: generate_localized_description(:accountability_component_intro, skip_injection:),
-        scopes_enabled: true,
-        scope_id: participatory_space.scope&.id
+        intro: generate_localized_description(:accountability_component_intro, skip_injection:)
       }
     end
   end
@@ -44,8 +42,12 @@ FactoryBot.define do
     description { generate_localized_description(:result_description, skip_injection:) }
     start_date { "12/7/2017" }
     end_date { "30/9/2017" }
-    status { create :status, component:, skip_injection: }
+    status { create(:status, component:, skip_injection:) }
     progress { rand(1..100) }
+    deleted_at { nil }
+    address { Faker::Lorem.sentence(word_count: 3) }
+    latitude { Faker::Address.latitude }
+    longitude { Faker::Address.longitude }
   end
 
   factory :timeline_entry, class: "Decidim::Accountability::TimelineEntry" do

data/lib/decidim/accountability/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds decidim-accountability version.
   module Accountability
     def self.version
-      "0.29.5"
+      "0.30.0.rc1"
     end
   end
 end

data/lib/decidim/api/accountability_type.rb

@@ -6,16 +6,15 @@ module Decidim
       graphql_name "Accountability"
       description "An accountability component of a participatory space."
 
-      field :results, Decidim::Accountability::ResultType.connection_type, null: true, connection: true
+      field :result, Decidim::Accountability::ResultType, "A single Result object", null: true do
+        argument :id, ID, "The id of the Result requested", required: true
+      end
+      field :results, Decidim::Accountability::ResultType.connection_type, "A collection of Results", null: true, connection: true
 
       def results
         Result.where(component: object).includes(:component)
       end
 
-      field :result, Decidim::Accountability::ResultType, null: true do
-        argument :id, ID, required: true
-      end
-
       def result(**args)
         Result.where(component: object).find_by(id: args[:id])
       end

data/lib/decidim/api/result_type.rb

@@ -3,29 +3,26 @@
 module Decidim
   module Accountability
     class ResultType < Decidim::Api::Types::BaseObject
-      implements Decidim::Core::CategorizableInterface
+      implements Decidim::Core::TaxonomizableInterface
+      implements Decidim::Core::TimestampsInterface
       implements Decidim::Comments::CommentableInterface
-      implements Decidim::Core::ScopableInterface
 
       description "A result"
 
-      field :id, GraphQL::Types::ID, "The internal ID for this result", null: false
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this result", null: true
+      field :children, [Decidim::Accountability::ResultType, { null: true }], "The children's results", null: true
+      field :children_count, GraphQL::Types::Int, "The number of children results", null: true
       field :description, Decidim::Core::TranslatedFieldType, "The description for this result", null: true
-      field :reference, GraphQL::Types::String, "The reference for this result", null: true
-      field :start_date, Decidim::Core::DateType, "The start date for this result", null: true
       field :end_date, Decidim::Core::DateType, "The end date for this result", null: true
-      field :progress, GraphQL::Types::Float, "The progress for this result", null: true
-      field :created_at, Decidim::Core::DateTimeType, "When this result was created", null: true
-      field :updated_at, Decidim::Core::DateTimeType, "When this result was updated", null: true
-      field :children_count, GraphQL::Types::Int, "The number of children results", null: true
-      field :weight, GraphQL::Types::Int, "The order of this result", null: false
       field :external_id, GraphQL::Types::String, "The external ID for this result", null: true
-
-      field :children, [Decidim::Accountability::ResultType, { null: true }], "The children's results", null: true
+      field :id, GraphQL::Types::ID, "The internal ID for this result", null: false
       field :parent, Decidim::Accountability::ResultType, "The parent result", null: true
+      field :progress, GraphQL::Types::Float, "The progress for this result", null: true
+      field :reference, GraphQL::Types::String, "The reference for this result", null: true
+      field :start_date, Decidim::Core::DateType, "The start date for this result", null: true
       field :status, Decidim::Accountability::StatusType, "The status for this result", null: true
       field :timeline_entries, [Decidim::Accountability::TimelineEntryType, { null: true }], "The timeline entries for this result", null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this result", null: true
+      field :weight, GraphQL::Types::Int, "The order of this result", null: false
     end
   end
 end

data/lib/decidim/api/status_type.rb

@@ -3,16 +3,15 @@
 module Decidim
   module Accountability
     class StatusType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::TimestampsInterface
+
       description "A status"
 
+      field :description, Decidim::Core::TranslatedFieldType, "The description for this status", null: true
       field :id, GraphQL::Types::ID, "The internal ID for this status", null: false
       field :key, GraphQL::Types::String, "The key for this status", null: true
       field :name, Decidim::Core::TranslatedFieldType, "The name for this status", null: true
-      field :created_at, Decidim::Core::DateType, "When this status was created", null: true
-      field :updated_at, Decidim::Core::DateType, "When this status was updated", null: true
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this status", null: true
       field :progress, GraphQL::Types::Int, "The progress for this status", null: true
-
       field :results, [Decidim::Accountability::ResultType, { null: true }], "The results for this status", null: true
     end
   end

data/lib/decidim/api/timeline_entry_type.rb

@@ -3,16 +3,15 @@
 module Decidim
   module Accountability
     class TimelineEntryType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::TimestampsInterface
+
       description "A Timeline Entry"
 
-      field :id, GraphQL::Types::ID, "The internal ID for this timeline entry", null: false
-      field :entry_date, Decidim::Core::DateType, "The entry date for this timeline entry", null: true
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this timeline entry", null: true
       field :description, Decidim::Core::TranslatedFieldType, "The description for this timeline entry", null: true
-      field :created_at, Decidim::Core::DateTimeType, "When this timeline entry was created", null: true
-      field :updated_at, Decidim::Core::DateTimeType, "When this timeline entry was updated", null: true
-
+      field :entry_date, Decidim::Core::DateType, "The entry date for this timeline entry", null: true
+      field :id, GraphQL::Types::ID, "The internal ID for this timeline entry", null: false
       field :result, Decidim::Accountability::ResultType, "The result for this timeline entry", null: true
+      field :title, Decidim::Core::TranslatedFieldType, "The title for this timeline entry", null: true
     end
   end
 end