decidim-accountability 0.27.9 → 0.28.0.rc4

data/config/locales/zh-CN.yml

@@ -35,8 +35,6 @@ zh-CN:
         confirm_destroy: 您确定要删除此 %{name} 吗？
         destroy: 删除
         edit: 编辑
-        import_csv: 导入 CSV
-        new: 新建 %{name}
         preview: 预览
         timeline_entries: 项目进化
         title: 行动
@@ -46,23 +44,12 @@ zh-CN:
         import_results:
           new:
             import: 导入
-            title: 从 CSV 导入结果
-        imports:
-          create:
-            success: 该文件已经开始导入。您将在几分钟内收到一封电子邮件，其导入的结果将会被导入。
         models:
           result:
             name: 结果
           status:
             name: 状态
-          timeline_entry:
-            name: 时间线条目
         results:
-          create:
-            invalid: 创建此结果时出现问题
-            success: 结果已成功创建
-          destroy:
-            success: 结果删除成功
           edit:
             title: 编辑结果
             update: 更新结果
@@ -71,18 +58,10 @@ zh-CN:
           new:
             create: 创建结果
             title: 新结果
-          update:
-            invalid: 更新此结果时出现问题
-            success: 结果已成功更新
         shared:
           subnav:
             statuses: Statuses
         statuses:
-          create:
-            invalid: 创建此状态时出现问题
-            success: 状态创建成功
-          destroy:
-            success: 状态删除成功
           edit:
             title: 编辑状态
             update: 更新状态
@@ -91,15 +70,7 @@ zh-CN:
           new:
             create: 创建状态
             title: 新状态
-          update:
-            invalid: 更新此状态时出现问题
-            success: 状态已更新
         timeline_entries:
-          create:
-            invalid: 创建此条目时出错
-            success: 条目创建成功
-          destroy:
-            success: 条目删除成功
           edit:
             title: 编辑条目
             update: 更新条目
@@ -108,9 +79,6 @@ zh-CN:
           new:
             create: 创建条目
             title: 新建条目
-          update:
-            invalid: 更新此条目时出错
-            success: 条目已成功更新
       admin_log:
         result:
           create: "%{user_name} 在 %{resource_name} 创建了结果 %{space_name}"
@@ -122,12 +90,9 @@ zh-CN:
       import_mailer:
         import:
           errors: 错误
-          errors_present: 导入结果时出现问题
           row_number: 行
           subject: 成功导入结果
           success: 成功导入结果。您可以在管理界面查看结果。
-      last_activity:
-        new_result_at_html: "<span>在 %{link}的新结果</span>"
       models:
         result:
           fields:
@@ -151,7 +116,6 @@ zh-CN:
             other: "%{count} 个结果"
         filters:
           all: 所有的
-          scopes: 范围
         home:
           categories_label: 类别管理
           subcategories_label: 子类别
@@ -165,6 +129,7 @@ zh-CN:
           stats:
             attendees: 参与者
             back_to_resource: 返回结果
+            comments: 评论
             contributions: 二. 捐款
             last_edited_by: 最后编辑者
             last_updated_at: 最后更新于

data/config/locales/zh-TW.yml

@@ -8,6 +8,7 @@ zh-TW:
         decidim_scope_id: 範圍
         description: 說明
         end_date: 結束日期
+        meetings_ids: 包含的會議
         progress: 進度
         project_ids: 包含的專案
         proposals: 包含的建議
@@ -38,8 +39,6 @@ zh-TW:
         confirm_destroy: 確定要刪除 %{name} ？
         destroy: 刪除
         edit: 編輯
-        import_csv: 匯入CSV
-        new: 新增 %{name}
         preview: 預覽
         timeline_entries: 專案評估
         title: 操作
@@ -52,43 +51,53 @@ zh-TW:
             download_export: 匯出成 CSV
             import: 匯入
             info: |
-              <p>建議依照下面步驟：</p>
+              <p>建議透過下面步驟：</p>
               <ol>
-              <li><a href='%{link_new_status}' target='_blank'>為結果建立狀態</a> 到你想要新增的</li>
-              <li>在管理介面匯入前 <a href='%{link_new_result}' target='_blank'>至少手動建立一個結果</a> ，這樣才能確認要填寫的資料格式。</li>
+              <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>在自己電腦編輯，只能夠異動下面欄位：
+              <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>
+                <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 說明匯入結果
+            success: 檔案開始匯入，執行完成後會寄發 email 說明匯入結果.
         models:
           result:
             name: 結果
           status:
             name: 狀態
-          timeline_entry:
-            name: 輸入時間線
+        projects_import:
+          create:
+            invalid: 匯入專案到結果時發生錯誤，請確實依照說明小心操作，以及確認已經選擇要實做的專案
+          new:
+            create: 匯入
+            import_all_selected_projects: 匯入所有選擇的專案來實現
+            new_items:
+              other: "%{count} 個專案將匯入"
+            no_components: 在這個參與空間沒有預算元件來匯入專案到結果
+            origin_component_id: 原始元件
+            select_component: 選擇一個元件
+            success:
+              other: "%{count} 個專案已經排程匯入，完成後會寄送 email 通知."
         results:
           create:
-            invalid: 建立結果時發生錯誤
-            success: 結果成功建立
+            invalid: 建立結果時發生錯誤.
+            success: 結果成功建立.
           destroy:
-            success: 結果成功刪除
+            success: 結果成功刪除.
           edit:
             title: 編輯結果
             update: 更新結果
@@ -98,17 +107,17 @@ zh-TW:
             create: 建立結果
             title: 新增結果
           update:
-            invalid: 更新結果時發生錯誤
-            success: 結果成功更新
+            invalid: 更新結果時發生錯誤.
+            success: 結果成功更新.
         shared:
           subnav:
             statuses: 狀態
         statuses:
           create:
-            invalid: 建立狀態時發生錯誤
-            success: 狀態成功建立
+            invalid: 建立狀態時發生錯誤.
+            success: 狀態成功建立.
           destroy:
-            success: 狀態成功刪除
+            success: 狀態成功刪除.
           edit:
             title: 編輯狀態
             update: 更新狀態
@@ -118,14 +127,14 @@ zh-TW:
             create: 新增狀態
             title: 新狀態
           update:
-            invalid: 更新狀態時發生錯誤
-            success: 狀態成功更新
+            invalid: 更新狀態時發生錯誤.
+            success: 狀態成功更新.
         timeline_entries:
           create:
-            invalid: 建立資料時發生錯誤
-            success: 資料成功建立
+            invalid: 建立資料時發生錯誤.
+            success: 資料成功建立.
           destroy:
-            success: 資料成功刪除
+            success: 資料成功刪除.
           edit:
             title: 編輯資料
             update: 更新資料
@@ -135,8 +144,8 @@ zh-TW:
             create: 建立資料
             title: 新資料
           update:
-            invalid: 更新資料時發生錯誤
-            success: 資料成功更新
+            invalid: 更新資料時發生錯誤.
+            success: 資料成功更新.
       admin_log:
         result:
           create: "%{user_name} 建立結果 %{resource_name} 在 %{space_name}"
@@ -155,18 +164,22 @@ zh-TW:
             not_found: '資料庫中找不到上一層 (ID: %{id})'
       content_blocks:
         highlighted_results:
-          dates: 日期
           results: 結果
-          unspecified: 未指定
       import_mailer:
         import:
           errors: 錯誤
-          errors_present: 匯入結果時發生錯誤
+          errors_present: 匯入結果時發生錯誤.
           row_number: 列
           subject: 結果匯入成功
           success: 結果匯入成功，在管理介面可以檢視。
+      import_projects_mailer:
+        import:
+          added_projects:
+            other: "從專案匯入 %{count} 個結果"
+          subject: 專案匯入成功
+          success: 在元件 %{component_name} 成功匯入專案到結果，可以在管理介面檢視。
       last_activity:
-        new_result_at_html: "<span>在 %{link} 有新的結果</span>"
+        new_result: '新結果：'
       models:
         result:
           fields:
@@ -189,16 +202,12 @@ zh-TW:
           fields:
             entry_date: 日期
             title: 標題
-      result_m:
-        executed: 已執行
-        view: 檢視
       results:
         count:
           results_count:
             other: "%{count} 個結果"
         filters:
           all: 全部
-          scopes: 範圍
         home:
           categories_label: 類別
           subcategories_label: 子類別

data/lib/decidim/accountability/admin_engine.rb

@@ -16,10 +16,11 @@ module Decidim
         resources :results, except: [:show] do
           get :proposals_picker, on: :collection
 
-          resources :attachment_collections
-          resources :attachments
+          resources :attachment_collections, except: [:show]
+          resources :attachments, except: [:show]
           resources :timeline_entries, except: [:show]
         end
+        resources :projects_import, only: [:new, :create]
         get :import_results, to: "import_results#new"
         post :import_results, to: "import_results#create"
         root to: "results#index"

data/lib/decidim/accountability/component.rb

@@ -1,17 +1,16 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
-
 Decidim.register_component(:accountability) do |component|
   component.engine = Decidim::Accountability::Engine
   component.admin_engine = Decidim::Accountability::AdminEngine
   component.icon = "media/images/decidim_accountability.svg"
+  component.icon_key = "bar-chart-line"
   component.stylesheet = "decidim/accountability/accountability"
   component.permissions_class_name = "Decidim::Accountability::Permissions"
   component.query_type = "Decidim::Accountability::AccountabilityType"
 
   component.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this component" if Decidim::Accountability::Result.where(component: instance).any?
+    raise StandardError, "Cannot remove this component" if Decidim::Accountability::Result.where(component: instance).any?
   end
 
   # These actions permissions can be configured in the admin panel
@@ -71,102 +70,8 @@ Decidim.register_component(:accountability) do |component|
   end
 
   component.seeds do |participatory_space|
-    admin_user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "admin@example.org"
-    )
-
-    params = {
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :accountability).i18n_name,
-      manifest_name: :accountability,
-      published_at: Time.current,
-      participatory_space: participatory_space,
-      settings: {
-        intro: Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(word_count: 4) },
-        categories_label: Decidim::Faker::Localized.word,
-        subcategories_label: Decidim::Faker::Localized.word,
-        heading_parent_level_results: Decidim::Faker::Localized.word,
-        heading_leaf_level_results: Decidim::Faker::Localized.word,
-        scopes_enabled: true,
-        scope_id: participatory_space.scope&.id
-      }
-    }
-
-    component = Decidim.traceability.perform_action!("publish", Decidim::Component, admin_user, visibility: "all") do
-      Decidim::Component.create!(params)
-    end
-
-    5.times do |i|
-      Decidim::Accountability::Status.create!(
-        component: component,
-        name: Decidim::Faker::Localized.word,
-        key: "status_#{i}"
-      )
-    end
-
-    3.times do
-      parent_category = participatory_space.categories.sample
-      categories = [parent_category]
+    require "decidim/accountability/seeds"
 
-      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: participatory_space
-        )
-      end
-
-      categories.each do |category|
-        result = Decidim.traceability.create!(
-          Decidim::Accountability::Result,
-          admin_user,
-          {
-            component: component,
-            scope: participatory_space.organization.scopes.sample,
-            category: category,
-            title: Decidim::Faker::Localized.sentence(word_count: 2),
-            description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-              Decidim::Faker::Localized.paragraph(sentence_count: 3)
-            end
-          },
-          visibility: "all"
-        )
-
-        Decidim::Comments::Seed.comments_for(result)
-
-        3.times do
-          child_result = Decidim.traceability.create!(
-            Decidim::Accountability::Result,
-            admin_user,
-            {
-              component: component,
-              parent: result,
-              start_date: Time.zone.today,
-              end_date: Time.zone.today + 10,
-              status: Decidim::Accountability::Status.all.sample,
-              progress: rand(1..100),
-              title: Decidim::Faker::Localized.sentence(word_count: 2),
-              description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-                Decidim::Faker::Localized.paragraph(sentence_count: 3)
-              end
-            },
-            visibility: "all"
-          )
-
-          rand(0..5).times do |i|
-            child_result.timeline_entries.create!(
-              entry_date: child_result.start_date + i.days,
-              title: Decidim::Faker::Localized.sentence(word_count: 2),
-              description: Decidim::Faker::Localized.paragraph(sentence_count: 1)
-            )
-          end
-
-          Decidim::Comments::Seed.comments_for(child_result)
-        end
-      end
-    end
+    Decidim::Accountability::Seeds.new(participatory_space:).call
   end
 end

data/lib/decidim/accountability/engine.rb

@@ -12,11 +12,19 @@ module Decidim
 
       routes do
         resources :results, only: [:index, :show] do
-          resources :versions, only: [:show, :index]
+          resources :versions, only: [:show]
         end
         root to: "results#home"
       end
 
+      initializer "decidim_accountability.register_icons" do
+        Decidim.icons.register(name: "Decidim::Accountability::Result", icon: "briefcase-2-line", description: "Result / project (Accountability)", category: "activity",
+                               engine: :accountability)
+
+        Decidim.icons.register(name: "focus-2-line", icon: "focus-2-line", category: "system", description: "", engine: :accountability)
+        Decidim.icons.register(name: "briefcase-2-line", icon: "briefcase-2-line", category: "system", description: "", engine: :accountability)
+      end
+
       initializer "decidim_accountability.view_hooks" do
         Decidim.view_hooks.register(:participatory_space_highlighted_elements, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
           view_context.cell("decidim/accountability/highlighted_results", view_context.current_participatory_space)

data/lib/decidim/accountability/result_serializer.rb

@@ -39,7 +39,7 @@ module Decidim
           },
           progress: result.progress,
           created_at: result.created_at,
-          url: url,
+          url:,
           component: { id: component.id },
           proposal_urls: proposals
         }

data/lib/decidim/accountability/seeds.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require "decidim/components/namer"
+
+module Decidim
+  module Accountability
+    class Seeds
+      attr_reader :participatory_space
+
+      def initialize(participatory_space:)
+        @participatory_space = participatory_space
+      end
+
+      def call
+        admin_user = Decidim::User.find_by(
+          organization: participatory_space.organization,
+          email: "admin@example.org"
+        )
+
+        params = {
+          name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :accountability).i18n_name,
+          manifest_name: :accountability,
+          published_at: Time.current,
+          participatory_space:,
+          settings: {
+            intro: Decidim::Faker::Localized.wrapped("<p>", "</p>") { Decidim::Faker::Localized.sentence(word_count: 4) },
+            categories_label: Decidim::Faker::Localized.word,
+            subcategories_label: Decidim::Faker::Localized.word,
+            heading_parent_level_results: Decidim::Faker::Localized.word,
+            heading_leaf_level_results: Decidim::Faker::Localized.word,
+            scopes_enabled: true,
+            scope_id: participatory_space.scope&.id
+          }
+        }
+
+        component = Decidim.traceability.perform_action!("publish", Decidim::Component, admin_user, visibility: "all") do
+          Decidim::Component.create!(params)
+        end
+
+        5.times do |i|
+          Decidim::Accountability::Status.create!(
+            component:,
+            name: Decidim::Faker::Localized.word,
+            key: "status_#{i}"
+          )
+        end
+
+        3.times do
+          parent_category = participatory_space.categories.sample
+          categories = [parent_category]
+
+          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:
+            )
+          end
+
+          categories.each do |category|
+            result = Decidim.traceability.create!(
+              Decidim::Accountability::Result,
+              admin_user,
+              {
+                component:,
+                scope: participatory_space.organization.scopes.sample,
+                category:,
+                title: Decidim::Faker::Localized.sentence(word_count: 2),
+                description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+                  Decidim::Faker::Localized.paragraph(sentence_count: 3)
+                end
+              },
+              visibility: "all"
+            )
+
+            Decidim::Comments::Seed.comments_for(result)
+
+            3.times do
+              child_result = Decidim.traceability.create!(
+                Decidim::Accountability::Result,
+                admin_user,
+                {
+                  component:,
+                  parent: result,
+                  start_date: Time.zone.today,
+                  end_date: Time.zone.today + 10,
+                  status: Decidim::Accountability::Status.all.sample,
+                  progress: rand(1..100),
+                  title: Decidim::Faker::Localized.sentence(word_count: 2),
+                  description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+                    Decidim::Faker::Localized.paragraph(sentence_count: 3)
+                  end
+                },
+                visibility: "all"
+              )
+
+              rand(0..5).times do |i|
+                child_result.timeline_entries.create!(
+                  entry_date: child_result.start_date + i.days,
+                  title: Decidim::Faker::Localized.sentence(word_count: 2),
+                  description: Decidim::Faker::Localized.paragraph(sentence_count: 1)
+                )
+              end
+
+              Decidim::Comments::Seed.comments_for(child_result)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "decidim/components/namer"
 require "decidim/faker/localized"
 require "decidim/dev"
 
@@ -8,19 +9,16 @@ require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
   factory :accountability_component, parent: :component do
-    transient do
-      skip_injection { false }
-    end
-    name { generate_component_name(participatory_space.organization.available_locales, :accountability, skip_injection: skip_injection) }
+    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :accountability).i18n_name }
     manifest_name { :accountability }
-    participatory_space { create(:participatory_process, :with_steps, organization: organization, skip_injection: skip_injection) }
+    participatory_space { create(:participatory_process, :with_steps, organization:) }
     settings do
       {
-        intro: generate_localized_description(:accountability_component_intro, skip_injection: skip_injection),
-        categories_label: generate_localized_word(:accountability_component_categories_label, skip_injection: skip_injection),
-        subcategories_label: generate_localized_word(:accountability_component_subcategories_label, skip_injection: skip_injection),
-        heading_parent_level_results: generate_localized_word(:accountability_component_heading_parent_level_results, skip_injection: skip_injection),
-        heading_leaf_level_results: generate_localized_word(:accountability_component_heading_leaf_level_results, skip_injection: skip_injection),
+        intro: Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title },
+        categories_label: Decidim::Faker::Localized.word,
+        subcategories_label: Decidim::Faker::Localized.word,
+        heading_parent_level_results: Decidim::Faker::Localized.word,
+        heading_leaf_level_results: Decidim::Faker::Localized.word,
         scopes_enabled: true,
         scope_id: participatory_space.scope&.id
       }
@@ -28,36 +26,27 @@ FactoryBot.define do
   end
 
   factory :status, class: "Decidim::Accountability::Status" do
-    transient do
-      skip_injection { false }
-    end
-    component { create(:accountability_component, skip_injection: skip_injection) }
+    component { create(:accountability_component) }
     sequence(:key) { |n| "status_#{n}" }
-    name { generate_localized_word(:status_name, skip_injection: skip_injection) }
-    description { generate_localized_word(:status_description, skip_injection: skip_injection) }
+    name { Decidim::Faker::Localized.word }
+    description { generate_localized_title }
     progress { rand(1..100) }
   end
 
   factory :result, class: "Decidim::Accountability::Result" do
-    transient do
-      skip_injection { false }
-    end
-    component { create(:accountability_component, skip_injection: skip_injection) }
-    title { generate_localized_title(:result_title, skip_injection: skip_injection) }
-    description { generate_localized_description(:result_description, skip_injection: skip_injection) }
+    component { create(:accountability_component) }
+    title { generate_localized_title }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     start_date { "12/7/2017" }
     end_date { "30/9/2017" }
-    status { create :status, component: component, skip_injection: skip_injection }
+    status { create :status, component: }
     progress { rand(1..100) }
   end
 
   factory :timeline_entry, class: "Decidim::Accountability::TimelineEntry" do
-    transient do
-      skip_injection { false }
-    end
-    result { create(:result, skip_injection: skip_injection) }
+    result { create(:result) }
     entry_date { "12/7/2017" }
-    title { generate_localized_title(:timeline_entry_title, skip_injection: skip_injection) }
-    description { generate_localized_title(:timeline_entry_description, skip_injection: skip_injection) }
+    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.27.9"
+      "0.28.0.rc4"
     end
   end
 end