decidim-accountability 0.26.8 → 0.27.0.rc1

data/config/locales/zh-TW.yml

@@ -1,268 +1,2 @@
+---
 zh-TW:
-  activemodel:
-    attributes:
-      result:
-        decidim_accountability_status_id: 狀態
-        decidim_category_id: 類別
-        decidim_scope_id: 範圍
-        description: 說明
-        end_date: 結束日期
-        progress: 進度
-        project_ids: 包含的專案
-        proposals: 包含的建議
-        start_date: 開始日期
-        title: 標題
-        updated_at: 更新時間
-      status:
-        description: 說明
-        key: 金鑰
-        name: 名稱
-        progress: 進度
-      timeline_entry:
-        description: 說明
-        entry_date: 日期
-    models:
-      decidim/accountability/proposal_linked_event: 在結果的建議
-      decidim/accountability/result_progress_updated_event: 結果程序已更新
-  activerecord:
-    models:
-      decidim/accountability/result:
-        other: 結果
-  decidim:
-    accountability:
-      actions:
-        attachment_collections: 資料夾
-        attachments: 附件
-        confirm_destroy: 確定要刪除 %{name} ？
-        destroy: 刪除
-        edit: 編輯
-        import_csv: 匯入CSV
-        new: 新增 %{name}
-        preview: 預覽
-        timeline_entries: 專案評估
-        title: 操作
-      admin:
-        exports:
-          result_comments: 評論
-          results: 結果
-        import_results:
-          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>在自己電腦編輯，只能夠異動下面欄位：
-                <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>
-            title: 從 CSV 匯入結果
-        imports:
-          create:
-            success: 檔案開始匯入，執行完成後會寄發 email 說明匯入結果
-        models:
-          result:
-            name: 結果
-          status:
-            name: 狀態
-          timeline_entry:
-            name: 輸入時間線
-        results:
-          create:
-            invalid: 建立結果時發生錯誤
-            success: 結果成功建立
-          destroy:
-            success: 結果成功刪除
-          edit:
-            title: 編輯結果
-            update: 更新結果
-          index:
-            title: 結果
-          new:
-            create: 建立結果
-            title: 新增結果
-          update:
-            invalid: 更新結果時發生錯誤
-            success: 結果成功更新
-        shared:
-          subnav:
-            statuses: 狀態
-        statuses:
-          create:
-            invalid: 建立狀態時發生錯誤
-            success: 狀態成功建立
-          destroy:
-            success: 狀態成功刪除
-          edit:
-            title: 編輯狀態
-            update: 更新狀態
-          index:
-            title: 狀態
-          new:
-            create: 新增狀態
-            title: 新狀態
-          update:
-            invalid: 更新狀態時發生錯誤
-            success: 狀態成功更新
-        timeline_entries:
-          create:
-            invalid: 建立資料時發生錯誤
-            success: 資料成功建立
-          destroy:
-            success: 資料成功刪除
-          edit:
-            title: 編輯資料
-            update: 更新資料
-          index:
-            title: 專案時程資料
-          new:
-            create: 建立資料
-            title: 新資料
-          update:
-            invalid: 更新資料時發生錯誤
-            success: 資料成功更新
-      admin_log:
-        result:
-          create: "%{user_name} 建立結果 %{resource_name} 在 %{space_name}"
-          delete: "%{user_name} 刪除了 %{resource_name} 在 %{space_name} 的結果"
-          update: "%{user_name} 更新了 %{resource_name} 在 %{space_name} 的結果"
-        value_types:
-          parent_presenter:
-            not_found: '資料庫中找不到上一層 (ID: %{id})'
-      content_blocks:
-        highlighted_results:
-          dates: 日期
-          results: 結果
-          unspecified: 未指定
-      import_mailer:
-        import:
-          errors: 錯誤
-          errors_present: 匯入結果時發生錯誤
-          row_number: 列
-          subject: 結果匯入成功
-          success: 結果匯入成功，在管理介面可以檢視。
-      last_activity:
-        new_result_at_html: "<span>在 %{link} 有新的結果</span>"
-      models:
-        result:
-          fields:
-            category: 類別
-            created_at: 建立時間
-            end_date: 結束日期
-            id: 編號
-            progress: 進度
-            scope: 範圍
-            start_date: 開始日期
-            status: 狀態
-            title: 標題
-        status:
-          fields:
-            description: 說明
-            key: 金鑰
-            name: 名稱
-            progress: 進度
-        timeline_entry:
-          fields:
-            description: 說明
-            entry_date: 日期
-      result_m:
-        executed: 已執行
-        view: 檢視
-      results:
-        count:
-          results_count:
-            other: "%{count} 個結果"
-        filters:
-          all: 全部
-          scopes: 範圍
-        home:
-          categories_label: 類別
-          subcategories_label: 子類別
-        home_header:
-          global_status: 全域執行狀態
-        nav_breadcrumb:
-          global: 全域執行
-        search:
-          search: 搜尋操作
-        show:
-          stats:
-            attendees: 與會者
-            back_to_resource: 返回至結果
-            comments: 評論
-            contributions: 貢獻
-            last_edited_by: 最後編輯者
-            last_updated_at: 更新時間
-            meetings: 會議
-            proposals: 提案
-            votes: 支援
-        timeline:
-          title: 專案評估
-    admin:
-      filters:
-        results:
-          category_id_eq:
-            label: 類別
-          scope_id_eq:
-            label: 範圍
-          status_id_eq:
-            label: 狀態
-    components:
-      accountability:
-        actions:
-          comment: 評論
-        name: 問責
-        settings:
-          global:
-            categories_label: 類別名稱
-            comments_enabled: 已啟用留言
-            comments_max_length: 留言字數上限 (0 表示使用預設)
-            display_progress_enabled: 顯示進度
-            heading_leaf_level_results: 專案名稱
-            heading_parent_level_results: 結果名稱
-            intro: 介紹
-            scope_id: 範圍
-            scopes_enabled: 啟用的範圍
-            subcategories_label: 子類別名稱
-          step:
-            comments_blocked: 留言已封鎖
-    events:
-      accountability:
-        proposal_linked:
-          email_intro: '提案 "%{proposal_title}" 已經包含在結果，可以在這個頁面檢視：'
-          email_outro: 收到這個提醒是因為訂閱了 "%{proposal_title}" ，透過上面連結可以停止訂閱。
-          email_subject: '%{proposal_title} 的更新'
-          notification_title: 這個提案 <a href="%{proposal_path}">%{proposal_title}</a> 已經包含在 <a href="%{resource_path}">%{resource_title}</a> 結果
-        result_progress_updated:
-          email_intro: '這個結果 "%{resource_title}" 包含提案 "%{proposal_title}" 現在完成 %{progress}% ，可以透過網頁檢視：'
-          email_outro: 收到這個通知表示正在訂閱 "%{proposal_title}" ，而這個提案包含在結果 "%{resource_title}" ，透過下面連結可以停止接收通知。
-          email_subject: '%{resource_title} 的更新進度'
-          notification_title: 這個結果 <a href="%{resource_path}">%{resource_title}</a> 包含提案 <a href="%{proposal_path}">%{proposal_title}</a>，現在完成 %{progress}% 。
-    metrics:
-      results:
-        description: 產生的結果數量
-        object: 結果
-        title: 結果
-    participatory_spaces:
-      highlighted_results:
-        see_all: 檢視所有結果 (%{count})
-    resource_links:
-      included_projects:
-        result_project: 這個結果包含的專案
-      included_proposals:
-        result_proposal: 這個結果包含的提案
-    statistics:
-      results_count: 結果

data/db/migrate/20220331150008_add_title_to_timeline_entries.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddTitleToTimelineEntries < ActiveRecord::Migration[6.1]
+  def change
+    add_column :decidim_accountability_timeline_entries, :title, :jsonb
+  end
+end

data/db/migrate/20220331150155_move_legacy_description_to_title_of_timeline_entries.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class MoveLegacyDescriptionToTitleOfTimelineEntries < ActiveRecord::Migration[6.1]
+  class TimelineEntry < ApplicationRecord
+    self.table_name = :decidim_accountability_timeline_entries
+  end
+
+  def up
+    TimelineEntry.find_each do |timeline_entry|
+      timeline_entry.update!(title: timeline_entry.description, description: nil)
+    end
+  end
+end

data/lib/decidim/accountability/component.rb

@@ -159,7 +159,8 @@ Decidim.register_component(:accountability) do |component|
           rand(0..5).times do |i|
             child_result.timeline_entries.create!(
               entry_date: child_result.start_date + i.days,
-              description: Decidim::Faker::Localized.sentence(word_count: 2)
+              title: Decidim::Faker::Localized.sentence(word_count: 2),
+              description: Decidim::Faker::Localized.paragraph(sentence_count: 1)
             )
           end
 

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

@@ -45,6 +45,7 @@ FactoryBot.define do
   factory :timeline_entry, class: "Decidim::Accountability::TimelineEntry" do
     result { create(:result) }
     entry_date { "12/7/2017" }
+    title { generate_localized_title }
     description { generate_localized_title }
   end
 end

data/lib/decidim/accountability/version.rb

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

data/lib/decidim/api/timeline_entry_type.rb

@@ -7,6 +7,7 @@ module Decidim
 
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-accountability
 version: !ruby/object:Gem::Version
-  version: 0.26.8
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-27 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-comments
@@ -18,126 +18,126 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.8
+        version: 0.27.0.rc1
 description: An accountability component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -212,10 +212,11 @@ files:
 - app/permissions/decidim/accountability/admin/permissions.rb
 - app/permissions/decidim/accountability/permissions.rb
 - app/presenters/decidim/accountability/admin_log/result_presenter.rb
+- app/presenters/decidim/accountability/admin_log/status_presenter.rb
+- app/presenters/decidim/accountability/admin_log/timeline_entry_presenter.rb
 - app/presenters/decidim/accountability/admin_log/value_types/parent_presenter.rb
 - app/queries/decidim/accountability/metrics/results_metric_manage.rb
 - app/services/decidim/accountability/diff_renderer.rb
-- app/services/decidim/accountability/result_search.rb
 - app/services/decidim/accountability/result_stats_calculator.rb
 - app/services/decidim/accountability/results_calculator.rb
 - app/services/decidim/accountability/results_csv_importer.rb
@@ -257,7 +258,6 @@ files:
 - app/views/decidim/accountability/versions/show.html.erb
 - app/views/decidim/participatory_spaces/_result.html.erb
 - config/assets.rb
-- config/environment.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -280,7 +280,6 @@ files:
 - config/locales/et-EE.yml
 - config/locales/et.yml
 - config/locales/eu.yml
-- config/locales/fa-IR.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
@@ -289,7 +288,6 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
-- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -298,13 +296,10 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
-- config/locales/ka-GE.yml
-- config/locales/kaa.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
-- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -312,7 +307,6 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
-- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -347,6 +341,8 @@ files:
 - db/migrate/20180508170647_add_external_id_to_results.rb
 - db/migrate/20200320105903_index_foreign_keys_in_decidim_accountability_results.rb
 - db/migrate/20200827154103_add_commentable_counter_cache_to_results.rb
+- db/migrate/20220331150008_add_title_to_timeline_entries.rb
+- db/migrate/20220331150155_move_legacy_description_to_title_of_timeline_entries.rb
 - lib/decidim/accountability.rb
 - lib/decidim/accountability/admin.rb
 - lib/decidim/accountability/admin_engine.rb
@@ -372,14 +368,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim accountability module

data/app/services/decidim/accountability/result_search.rb

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Accountability
-    # This class handles search and filtering of results. Needs a
-    # `current_component` param with a `Decidim::Component` in order to
-    # find the results.
-    class ResultSearch < ResourceSearch
-      text_search_fields :title, :description
-
-      # Public: Initializes the service.
-      #
-      # options - A hash of options to modify the search. These options will be
-      #          converted to methods by SearchLight so they can be used on filter
-      #          methods. (Default {})
-      #          * component - A Decidim::Component to get the results from.
-      #          * organization - A Decidim::Organization object.
-      #          * parent_id - The parent ID of the result. The value is forced to false to force
-      #                        the filter execution when the value is nil
-      #          * deep_search - Whether to perform the search on all children levels or just the
-      #                          first one. True by default.
-      def initialize(options = {})
-        options = options.dup
-        options[:deep_search] = true if options[:deep_search].nil?
-        options[:parent_id] = "root" if options[:parent_id].nil?
-        super(Result.all, options)
-      end
-
-      # Handle parent_id filter
-      def search_parent_id
-        parent_id = options[:parent_id]
-        parent_id = nil if parent_id == "root"
-
-        if options[:deep_search]
-          query.where(parent_id: [parent_id] + children_ids(parent_id))
-        else
-          query.where(parent_id: parent_id)
-        end
-      end
-
-      private
-
-      def children_ids(parent_id)
-        Result.where(parent_id: parent_id).pluck(:id)
-      end
-    end
-  end
-end

data/config/locales/fa-IR.yml

@@ -1 +0,0 @@
-fa:

data/config/locales/gn-PY.yml

@@ -1,15 +0,0 @@
-gn:
-  activemodel:
-    attributes:
-      result:
-        decidim_accountability_status_id: Tetã
-        decidim_category_id: Hendápe
-        description: Techaukaha
-      timeline_entry:
-        entry_date: Fecha
-  decidim:
-    accountability:
-      models:
-        timeline_entry:
-          fields:
-            description: Techaukaha

data/config/locales/ka-GE.yml

@@ -1 +0,0 @@
-ka: