decidim-accountability 0.20.0 → 0.23.1.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (118) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/decidim/accountability/admin/accountability_admin.js.es6 +6 -42
  3. data/app/assets/stylesheets/decidim/accountability/accountability/_categories.scss +8 -1
  4. data/app/assets/stylesheets/decidim/accountability/accountability/_lines_breadcrumb.scss +8 -0
  5. data/app/assets/stylesheets/decidim/accountability/accountability/_results.scss +0 -3
  6. data/app/cells/decidim/accountability/highlighted_results_for_component/show.erb +3 -3
  7. data/app/cells/decidim/accountability/highlighted_results_for_component_cell.rb +1 -1
  8. data/app/commands/decidim/accountability/admin/create_imported_result.rb +106 -0
  9. data/app/commands/decidim/accountability/admin/update_imported_result.rb +110 -0
  10. data/app/controllers/decidim/accountability/admin/import_results_controller.rb +34 -0
  11. data/app/controllers/decidim/accountability/admin/results_controller.rb +2 -20
  12. data/app/controllers/decidim/accountability/results_controller.rb +0 -1
  13. data/app/controllers/decidim/accountability/versions_controller.rb +7 -8
  14. data/app/forms/decidim/accountability/admin/result_form.rb +3 -9
  15. data/app/helpers/decidim/accountability/admin/application_helper.rb +13 -0
  16. data/app/helpers/decidim/accountability/application_helper.rb +1 -1
  17. data/app/jobs/application_job.rb +4 -0
  18. data/app/jobs/decidim/accountability/admin/import_results_csv_job.rb +19 -0
  19. data/app/mailers/decidim/accountability/import_mailer.rb +26 -0
  20. data/app/models/decidim/accountability/result.rb +4 -1
  21. data/app/models/decidim/accountability/status.rb +3 -0
  22. data/app/models/decidim/accountability/timeline_entry.rb +3 -0
  23. data/app/queries/decidim/accountability/metrics/results_metric_manage.rb +2 -8
  24. data/app/services/decidim/accountability/result_search.rb +2 -20
  25. data/app/services/decidim/accountability/result_stats_calculator.rb +1 -1
  26. data/app/services/decidim/accountability/results_csv_importer.rb +139 -0
  27. data/app/types/decidim/accountability/accountability_type.rb +32 -0
  28. data/app/types/decidim/accountability/result_type.rb +35 -0
  29. data/app/types/decidim/accountability/status_type.rb +20 -0
  30. data/app/types/decidim/accountability/timeline_entry_type.rb +18 -0
  31. data/app/views/decidim/accountability/admin/import_results/new.html.erb +22 -0
  32. data/app/views/decidim/accountability/admin/results/_form.html.erb +3 -7
  33. data/app/views/decidim/accountability/admin/results/index.html.erb +3 -0
  34. data/app/views/decidim/accountability/admin/results/proposals_picker.html.erb +1 -0
  35. data/app/views/decidim/accountability/import_mailer/import.html.erb +25 -0
  36. data/app/views/decidim/accountability/results/_linked_results.html.erb +1 -1
  37. data/app/views/decidim/accountability/results/_results_leaf.html.erb +5 -5
  38. data/app/views/decidim/accountability/results/_results_parent.html.erb +2 -2
  39. data/app/views/decidim/accountability/results/_scope_filters.html.erb +17 -4
  40. data/app/views/decidim/accountability/results/_search.html.erb +3 -3
  41. data/app/views/decidim/accountability/results/_stats_box.html.erb +11 -5
  42. data/app/views/decidim/accountability/results/_timeline.html.erb +2 -2
  43. data/app/views/decidim/accountability/versions/index.html.erb +7 -25
  44. data/app/views/decidim/accountability/versions/show.html.erb +9 -31
  45. data/app/views/decidim/participatory_spaces/_result.html.erb +3 -3
  46. data/config/locales/am-ET.yml +1 -0
  47. data/config/locales/ar.yml +1 -24
  48. data/config/locales/bg-BG.yml +220 -0
  49. data/config/locales/bg.yml +226 -0
  50. data/config/locales/ca.yml +22 -22
  51. data/config/locales/cs.yml +48 -48
  52. data/config/locales/da-DK.yml +1 -0
  53. data/config/locales/da.yml +1 -0
  54. data/config/locales/de.yml +22 -22
  55. data/config/locales/el-GR.yml +1 -0
  56. data/config/locales/el.yml +224 -0
  57. data/config/locales/en.yml +22 -22
  58. data/config/locales/eo.yml +1 -0
  59. data/config/locales/es-MX.yml +22 -22
  60. data/config/locales/es-PY.yml +22 -22
  61. data/config/locales/es.yml +22 -22
  62. data/config/locales/et-EE.yml +1 -0
  63. data/config/locales/et.yml +1 -0
  64. data/config/locales/eu.yml +1 -24
  65. data/config/locales/fi-plain.yml +22 -22
  66. data/config/locales/fi.yml +35 -35
  67. data/config/locales/fr-CA.yml +226 -0
  68. data/config/locales/fr.yml +22 -22
  69. data/config/locales/ga-IE.yml +1 -0
  70. data/config/locales/gl.yml +1 -24
  71. data/config/locales/hr-HR.yml +1 -0
  72. data/config/locales/hr.yml +1 -0
  73. data/config/locales/hu.yml +19 -22
  74. data/config/locales/id-ID.yml +1 -24
  75. data/config/locales/is-IS.yml +177 -0
  76. data/config/locales/is.yml +177 -0
  77. data/config/locales/it.yml +40 -40
  78. data/config/locales/ja-JP.yml +222 -0
  79. data/config/locales/ja.yml +224 -0
  80. data/config/locales/ko-KR.yml +1 -0
  81. data/config/locales/ko.yml +1 -0
  82. data/config/locales/lt-LT.yml +1 -0
  83. data/config/locales/lt.yml +1 -0
  84. data/config/locales/lv.yml +218 -0
  85. data/config/locales/mt-MT.yml +1 -0
  86. data/config/locales/mt.yml +1 -0
  87. data/config/locales/nl.yml +21 -22
  88. data/config/locales/no.yml +26 -28
  89. data/config/locales/om-ET.yml +1 -0
  90. data/config/locales/pl.yml +75 -75
  91. data/config/locales/pt-BR.yml +2 -25
  92. data/config/locales/pt.yml +60 -62
  93. data/config/locales/ro-RO.yml +224 -0
  94. data/config/locales/ru.yml +1 -24
  95. data/config/locales/sk-SK.yml +224 -0
  96. data/config/locales/sk.yml +207 -0
  97. data/config/locales/sl.yml +130 -0
  98. data/config/locales/so-SO.yml +1 -0
  99. data/config/locales/sr-CS.yml +205 -0
  100. data/config/locales/sv.yml +22 -24
  101. data/config/locales/ti-ER.yml +1 -0
  102. data/config/locales/tr-TR.yml +1 -24
  103. data/config/locales/uk.yml +1 -21
  104. data/config/locales/vi-VN.yml +1 -0
  105. data/config/locales/vi.yml +1 -0
  106. data/config/locales/zh-CN.yml +223 -0
  107. data/config/locales/zh-TW.yml +1 -0
  108. data/db/migrate/20200320105903_index_foreign_keys_in_decidim_accountability_results.rb +7 -0
  109. data/db/migrate/20200827154103_add_commentable_counter_cache_to_results.rb +9 -0
  110. data/lib/decidim/accountability/admin_engine.rb +4 -3
  111. data/lib/decidim/accountability/component.rb +7 -1
  112. data/lib/decidim/accountability/engine.rb +0 -1
  113. data/lib/decidim/accountability/test/factories.rb +3 -1
  114. data/lib/decidim/accountability/version.rb +1 -1
  115. metadata +85 -28
  116. data/app/controllers/decidim/accountability/result_widgets_controller.rb +0 -19
  117. data/app/views/decidim/accountability/admin/results/_proposals.html.erb +0 -12
  118. data/app/views/decidim/accountability/versions/_version.html.erb +0 -20
@@ -0,0 +1 @@
1
+ ti:
@@ -58,17 +58,11 @@ tr:
58
58
  edit:
59
59
  title: Sonucu düzenle
60
60
  update: Sonuç güncelle
61
- form:
62
- add_proposal: Teklif ekle
63
61
  index:
64
62
  title: Sonuçlar
65
63
  new:
66
64
  create: Sonuç oluştur
67
65
  title: Yeni sonuç
68
- proposals:
69
- close: Kapat
70
- current_selection: Şu anki seçim
71
- select: seçmek
72
66
  update:
73
67
  invalid: Bu sonucu güncellerken bir sorun oluştu
74
68
  success: Sonuç başarıyla güncellendi
@@ -157,30 +151,16 @@ tr:
157
151
  show:
158
152
  stats:
159
153
  attendees: Katılımcılar
160
- back_to_result: Sonuca geri dön
154
+ back_to_resource: Sonuca geri dön
161
155
  comments: Yorumlar
162
156
  contributions: Katılımlar
163
157
  last_edited_by: Tarafından düzenlenmiş Son
164
158
  last_updated_at: 'Son güncelleme tarihi:'
165
159
  meetings: Toplantılar
166
- number_of_versions: Sürümler
167
160
  proposals: Teklif
168
- show_all_versions: Tüm sürümleri göster
169
- version_author: Sürüm yazarı
170
- version_created_at: '''De oluşturulan sürüm'
171
- version_number: Versiyon numarası
172
- version_number_out_of_total: "%{current_version} üzerinden %{total_count}"
173
161
  votes: Destekler
174
162
  timeline:
175
163
  title: Proje evrimi
176
- versions:
177
- index:
178
- changes_at_title: '"%{title}" daki değişiklikler'
179
- title: Sürümler
180
- show:
181
- changes_at_title: '"%{title}" daki değişiklikler'
182
- version:
183
- version_index: Sürüm %{index}
184
164
  components:
185
165
  accountability:
186
166
  name: Hesap verebilirlik
@@ -216,9 +196,6 @@ tr:
216
196
  participatory_process_groups:
217
197
  highlighted_results:
218
198
  results: Sonuçlar
219
- participatory_spaces:
220
- highlighted_results:
221
- see_all: Tümünü gör (%{count})
222
199
  resource_links:
223
200
  included_projects:
224
201
  result_project: Bu sonuca dahil edilen projeler
@@ -59,17 +59,11 @@ uk:
59
59
  edit:
60
60
  title: Редагувати підсумки
61
61
  update: Оновити підсумки
62
- form:
63
- add_proposal: Додати пропозицію
64
62
  index:
65
63
  title: Підсумки
66
64
  new:
67
65
  create: Створити підсумки
68
66
  title: Додати підсумки
69
- proposals:
70
- close: Закрити
71
- current_selection: Поточний вибір
72
- select: Оберіть
73
67
  update:
74
68
  invalid: При спробі оновити ці підсумки сталася помилка
75
69
  success: Підсумки успішно оновлено
@@ -158,30 +152,16 @@ uk:
158
152
  show:
159
153
  stats:
160
154
  attendees: Учасники
161
- back_to_result: Повернутися до підсумків
155
+ back_to_resource: Повернутися до підсумків
162
156
  comments: Коментарів
163
157
  contributions: Внесені пропозиції
164
158
  last_edited_by: Останній раз редагувалося
165
159
  last_updated_at: Останній раз оновлювалося
166
160
  meetings: Зустрічі
167
- number_of_versions: Версії
168
161
  proposals: Пропозиції
169
- show_all_versions: Показати всі версії
170
- version_author: Автор версії
171
- version_created_at: 'Версію створено:'
172
- version_number: Номер версії
173
- version_number_out_of_total: "%{current_version} з %{total_count}"
174
162
  votes: Підтримує
175
163
  timeline:
176
164
  title: Розвиток проекту
177
- versions:
178
- index:
179
- changes_at_title: Зміни в "%{title}"
180
- title: Версії
181
- show:
182
- changes_at_title: Зміни в "%{title}"
183
- version:
184
- version_index: Версія %{index}
185
165
  components:
186
166
  accountability:
187
167
  name: Звітність
@@ -0,0 +1 @@
1
+ vi:
@@ -0,0 +1 @@
1
+ vi:
@@ -0,0 +1,223 @@
1
+ zh-CN:
2
+ activemodel:
3
+ attributes:
4
+ result:
5
+ decidim_accountability_status_id: 状态
6
+ decidim_category_id: 类别
7
+ decidim_scope_id: 范围
8
+ description: 描述
9
+ end_date: 结束日期
10
+ progress: 进展情况
11
+ project_ids: 包括项目
12
+ proposals: 包括的建议
13
+ start_date: 开始日期
14
+ title: 标题
15
+ updated_at: 更新于
16
+ status:
17
+ description: 描述
18
+ key: 关键字
19
+ name: 名称
20
+ progress: 进展情况
21
+ timeline_entry:
22
+ description: 描述
23
+ entry_date: 日期
24
+ models:
25
+ decidim/accountability/proposal_linked_event: 结果中包括的提案
26
+ decidim/accountability/result_progress_updated_event: 结果进度更新
27
+ activerecord:
28
+ models:
29
+ decidim/accountability/result:
30
+ other: 成果
31
+ decidim:
32
+ accountability:
33
+ actions:
34
+ confirm_destroy: 您确定要删除此 %{name} 吗?
35
+ destroy: 删除
36
+ edit: 编辑
37
+ import_csv: 导入 CSV
38
+ new: 新建 %{name}
39
+ preview: 预览
40
+ timeline_entries: 项目进化
41
+ title: 行动
42
+ admin:
43
+ exports:
44
+ results: 成果
45
+ import_results:
46
+ new:
47
+ import: 导入
48
+ link: 链接
49
+ title: 从 CSV 导入结果
50
+ imports:
51
+ create:
52
+ success: 该文件已经开始导入。您将在几分钟内收到一封电子邮件,其导入的结果将会被导入。
53
+ models:
54
+ result:
55
+ name: 结果
56
+ status:
57
+ name: 状态
58
+ timeline_entry:
59
+ name: 时间线条目
60
+ results:
61
+ create:
62
+ invalid: 创建此结果时出现问题
63
+ success: 结果已成功创建
64
+ destroy:
65
+ success: 结果删除成功
66
+ edit:
67
+ title: 编辑结果
68
+ update: 更新结果
69
+ index:
70
+ title: 成果
71
+ new:
72
+ create: 创建结果
73
+ title: 新结果
74
+ update:
75
+ invalid: 更新此结果时出现问题
76
+ success: 结果已成功更新
77
+ shared:
78
+ subnav:
79
+ statuses: Statuses
80
+ statuses:
81
+ create:
82
+ invalid: 创建此状态时出现问题
83
+ success: 状态创建成功
84
+ destroy:
85
+ success: 状态删除成功
86
+ edit:
87
+ title: 编辑状态
88
+ update: 更新状态
89
+ index:
90
+ title: Statuses
91
+ new:
92
+ create: 创建状态
93
+ title: 新状态
94
+ update:
95
+ invalid: 更新此状态时出现问题
96
+ success: 状态已更新
97
+ timeline_entries:
98
+ create:
99
+ invalid: 创建此条目时出错
100
+ success: 条目创建成功
101
+ destroy:
102
+ success: 条目删除成功
103
+ edit:
104
+ title: 编辑条目
105
+ update: 更新条目
106
+ index:
107
+ title: 项目时间表条目
108
+ new:
109
+ create: 创建条目
110
+ title: 新建条目
111
+ update:
112
+ invalid: 更新此条目时出错
113
+ success: 条目已成功更新
114
+ admin_log:
115
+ result:
116
+ create: "%{user_name} 在 %{resource_name} 创建了结果 %{space_name}"
117
+ delete: "%{user_name} 刪除 %{resource_name} 結果在 %{space_name}"
118
+ update: "%{user_name} 更新结果 %{resource_name} 在 %{space_name}"
119
+ value_types:
120
+ parent_presenter:
121
+ not_found: '在数据库中找不到父级(ID: %{id})'
122
+ import_mailer:
123
+ import:
124
+ errors: 错误
125
+ errors_present: 导入结果时出现问题
126
+ row_number: 行
127
+ subject: 成功导入结果
128
+ success: 成功导入结果。您可以在管理界面查看结果。
129
+ last_activity:
130
+ new_result_at_html: "<span>在 %{link}的新结果</span>"
131
+ models:
132
+ result:
133
+ fields:
134
+ end_date: 结束日期
135
+ progress: 进展情况
136
+ start_date: 开始日期
137
+ status: 状态
138
+ title: 标题
139
+ status:
140
+ fields:
141
+ description: 描述
142
+ key: 关键字
143
+ name: 名称
144
+ progress: 进展情况
145
+ timeline_entry:
146
+ fields:
147
+ description: 描述
148
+ entry_date: 日期
149
+ results:
150
+ count:
151
+ results_count:
152
+ other: "%{count} 个结果"
153
+ filters:
154
+ all: 所有的
155
+ scopes: 范围
156
+ home:
157
+ categories_label: 类别管理
158
+ subcategories_label: 子类别
159
+ home_header:
160
+ global_status: 全局执行状态
161
+ nav_breadcrumb:
162
+ global: 全局执行
163
+ search:
164
+ search: 搜索操作
165
+ show:
166
+ stats:
167
+ attendees: 参与者
168
+ back_to_resource: 返回结果
169
+ comments: 评论
170
+ contributions: 二. 捐款
171
+ last_edited_by: 最后编辑者
172
+ last_updated_at: 最后更新于
173
+ meetings: 会议
174
+ proposals: 建议
175
+ votes: 支持
176
+ timeline:
177
+ title: 项目进化
178
+ components:
179
+ accountability:
180
+ name: 问责制
181
+ settings:
182
+ global:
183
+ categories_label: '"类别"的名称'
184
+ comments_enabled: 评论已启用
185
+ comments_max_length: 评论最大长度 (默认值留0)
186
+ display_progress_enabled: 显示进度
187
+ heading_leaf_level_results: '“项目”的名称'
188
+ heading_parent_level_results: '"结果"的名称'
189
+ intro: 简介
190
+ scope_id: 范围
191
+ scopes_enabled: 范围已启用
192
+ subcategories_label: '"子类别"的名称'
193
+ step:
194
+ comments_blocked: 评论已阻止
195
+ events:
196
+ accountability:
197
+ proposal_linked:
198
+ email_intro: '提议 "%{proposal_title}" 已被包含在结果中。您可以从这个页面查看:'
199
+ email_outro: 您收到此通知是因为您正在关注 "%{proposal_title}"。您可以停止收到跟随上一个链接的通知。
200
+ email_subject: 更新到 %{proposal_title}
201
+ notification_title: 提议 <a href="%{proposal_path}">%{proposal_title}</a> 已被包含在 <a href="%{resource_path}">%{resource_title}</a> 结果中。
202
+ result_progress_updated:
203
+ email_intro: '结果"%{resource_title}", 其中包括"%{proposal_title}", 现在完成了 %{progress}%。你可以从这个页面看到它:'
204
+ email_outro: 您收到此通知是因为您正在关注"%{proposal_title}",此建议包含在结果"%{resource_title}"中。 您可以停止接收跟随上一个链接的通知。
205
+ email_subject: 更新到 %{resource_title} 进度
206
+ notification_title: 结果 <a href="%{resource_path}">%{resource_title}</a>, 其中包括提议 <a href="%{proposal_path}">%{proposal_title}</a>, 现在已完成 %{progress}%。
207
+ metrics:
208
+ results:
209
+ description: 生成的结果数
210
+ object: 结果
211
+ title: 成果
212
+ participatory_processes:
213
+ participatory_process_groups:
214
+ highlighted_results:
215
+ results: 成果
216
+ participatory_spaces:
217
+ highlighted_results:
218
+ see_all: 查看所有结果 (%{count})
219
+ resource_links:
220
+ included_projects:
221
+ result_project: B. 列入这一结果的项目
222
+ included_proposals:
223
+ result_proposal: B. 列入这一结果的建议
@@ -0,0 +1 @@
1
+ zh-TW:
@@ -0,0 +1,7 @@
1
+ # frozen_string_literal: true
2
+
3
+ class IndexForeignKeysInDecidimAccountabilityResults < ActiveRecord::Migration[5.2]
4
+ def change
5
+ add_index :decidim_accountability_results, :external_id
6
+ end
7
+ end
@@ -0,0 +1,9 @@
1
+ # frozen_string_literal: true
2
+
3
+ class AddCommentableCounterCacheToResults < ActiveRecord::Migration[5.2]
4
+ def change
5
+ add_column :decidim_accountability_results, :comments_count, :integer, null: false, default: 0, index: true
6
+ Decidim::Accountability::Result.reset_column_information
7
+ Decidim::Accountability::Result.find_each(&:update_comments_count)
8
+ end
9
+ end
@@ -14,11 +14,12 @@ module Decidim
14
14
  routes do
15
15
  resources :statuses
16
16
  resources :results, except: [:show] do
17
+ get :proposals_picker, on: :collection
18
+
17
19
  resources :timeline_entries, except: [:show]
18
- collection do
19
- get :proposals
20
- end
21
20
  end
21
+ get :import_results, to: "import_results#new"
22
+ post :import_results, to: "import_results#create"
22
23
  root to: "results#index"
23
24
  end
24
25
 
@@ -8,6 +8,7 @@ Decidim.register_component(:accountability) do |component|
8
8
  component.icon = "decidim/accountability/icon.svg"
9
9
  component.stylesheet = "decidim/accountability/accountability"
10
10
  component.permissions_class_name = "Decidim::Accountability::Permissions"
11
+ component.query_type = "Decidim::Accountability::AccountabilityType"
11
12
 
12
13
  component.on(:before_destroy) do |instance|
13
14
  raise StandardError, "Can't remove this component" if Decidim::Accountability::Result.where(component: instance).any?
@@ -21,7 +22,10 @@ Decidim.register_component(:accountability) do |component|
21
22
  end
22
23
 
23
24
  component.settings(:global) do |settings|
25
+ settings.attribute :scopes_enabled, type: :boolean, default: true
26
+ settings.attribute :scope_id, type: :scope
24
27
  settings.attribute :comments_enabled, type: :boolean, default: true
28
+ settings.attribute :comments_max_length, type: :integer, required: false
25
29
  settings.attribute :intro, type: :text, translated: true, editor: true
26
30
  settings.attribute :categories_label, type: :string, translated: true, editor: true
27
31
  settings.attribute :subcategories_label, type: :string, translated: true, editor: true
@@ -66,7 +70,9 @@ Decidim.register_component(:accountability) do |component|
66
70
  categories_label: Decidim::Faker::Localized.word,
67
71
  subcategories_label: Decidim::Faker::Localized.word,
68
72
  heading_parent_level_results: Decidim::Faker::Localized.word,
69
- heading_leaf_level_results: Decidim::Faker::Localized.word
73
+ heading_leaf_level_results: Decidim::Faker::Localized.word,
74
+ scopes_enabled: true,
75
+ scope_id: participatory_space.scope&.id
70
76
  }
71
77
  }
72
78
 
@@ -13,7 +13,6 @@ module Decidim
13
13
 
14
14
  routes do
15
15
  resources :results, only: [:index, :show] do
16
- resource :result_widget, only: :show, path: "embed"
17
16
  resources :versions, only: [:show, :index]
18
17
  end
19
18
  root to: "results#home"
@@ -17,7 +17,9 @@ FactoryBot.define do
17
17
  categories_label: Decidim::Faker::Localized.word,
18
18
  subcategories_label: Decidim::Faker::Localized.word,
19
19
  heading_parent_level_results: Decidim::Faker::Localized.word,
20
- heading_leaf_level_results: Decidim::Faker::Localized.word
20
+ heading_leaf_level_results: Decidim::Faker::Localized.word,
21
+ scopes_enabled: true,
22
+ scope_id: participatory_space.scope&.id
21
23
  }
22
24
  end
23
25
  end
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds decidim-accountability version.
5
5
  module Accountability
6
6
  def self.version
7
- "0.20.0"
7
+ "0.23.1.rc1"
8
8
  end
9
9
  end
10
10
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: decidim-accountability
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.20.0
4
+ version: 0.23.1.rc1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2020-01-08 00:00:00.000000000 Z
13
+ date: 2020-11-06 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-comments
@@ -18,42 +18,48 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.20.0
21
+ version: 0.23.1.rc1
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 0.20.0
28
+ version: 0.23.1.rc1
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: decidim-core
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
33
  - - '='
34
34
  - !ruby/object:Gem::Version
35
- version: 0.20.0
35
+ version: 0.23.1.rc1
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - '='
41
41
  - !ruby/object:Gem::Version
42
- version: 0.20.0
42
+ version: 0.23.1.rc1
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: kaminari
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - "~>"
48
48
  - !ruby/object:Gem::Version
49
- version: '1.1'
49
+ version: '1.2'
50
+ - - ">="
51
+ - !ruby/object:Gem::Version
52
+ version: 1.2.1
50
53
  type: :runtime
51
54
  prerelease: false
52
55
  version_requirements: !ruby/object:Gem::Requirement
53
56
  requirements:
54
57
  - - "~>"
55
58
  - !ruby/object:Gem::Version
56
- version: '1.1'
59
+ version: '1.2'
60
+ - - ">="
61
+ - !ruby/object:Gem::Version
62
+ version: 1.2.1
57
63
  - !ruby/object:Gem::Dependency
58
64
  name: searchlight
59
65
  requirement: !ruby/object:Gem::Requirement
@@ -74,98 +80,98 @@ dependencies:
74
80
  requirements:
75
81
  - - '='
76
82
  - !ruby/object:Gem::Version
77
- version: 0.20.0
83
+ version: 0.23.1.rc1
78
84
  type: :development
79
85
  prerelease: false
80
86
  version_requirements: !ruby/object:Gem::Requirement
81
87
  requirements:
82
88
  - - '='
83
89
  - !ruby/object:Gem::Version
84
- version: 0.20.0
90
+ version: 0.23.1.rc1
85
91
  - !ruby/object:Gem::Dependency
86
92
  name: decidim-assemblies
87
93
  requirement: !ruby/object:Gem::Requirement
88
94
  requirements:
89
95
  - - '='
90
96
  - !ruby/object:Gem::Version
91
- version: 0.20.0
97
+ version: 0.23.1.rc1
92
98
  type: :development
93
99
  prerelease: false
94
100
  version_requirements: !ruby/object:Gem::Requirement
95
101
  requirements:
96
102
  - - '='
97
103
  - !ruby/object:Gem::Version
98
- version: 0.20.0
104
+ version: 0.23.1.rc1
99
105
  - !ruby/object:Gem::Dependency
100
106
  name: decidim-comments
101
107
  requirement: !ruby/object:Gem::Requirement
102
108
  requirements:
103
109
  - - '='
104
110
  - !ruby/object:Gem::Version
105
- version: 0.20.0
111
+ version: 0.23.1.rc1
106
112
  type: :development
107
113
  prerelease: false
108
114
  version_requirements: !ruby/object:Gem::Requirement
109
115
  requirements:
110
116
  - - '='
111
117
  - !ruby/object:Gem::Version
112
- version: 0.20.0
118
+ version: 0.23.1.rc1
113
119
  - !ruby/object:Gem::Dependency
114
120
  name: decidim-dev
115
121
  requirement: !ruby/object:Gem::Requirement
116
122
  requirements:
117
123
  - - '='
118
124
  - !ruby/object:Gem::Version
119
- version: 0.20.0
125
+ version: 0.23.1.rc1
120
126
  type: :development
121
127
  prerelease: false
122
128
  version_requirements: !ruby/object:Gem::Requirement
123
129
  requirements:
124
130
  - - '='
125
131
  - !ruby/object:Gem::Version
126
- version: 0.20.0
132
+ version: 0.23.1.rc1
127
133
  - !ruby/object:Gem::Dependency
128
134
  name: decidim-meetings
129
135
  requirement: !ruby/object:Gem::Requirement
130
136
  requirements:
131
137
  - - '='
132
138
  - !ruby/object:Gem::Version
133
- version: 0.20.0
139
+ version: 0.23.1.rc1
134
140
  type: :development
135
141
  prerelease: false
136
142
  version_requirements: !ruby/object:Gem::Requirement
137
143
  requirements:
138
144
  - - '='
139
145
  - !ruby/object:Gem::Version
140
- version: 0.20.0
146
+ version: 0.23.1.rc1
141
147
  - !ruby/object:Gem::Dependency
142
148
  name: decidim-participatory_processes
143
149
  requirement: !ruby/object:Gem::Requirement
144
150
  requirements:
145
151
  - - '='
146
152
  - !ruby/object:Gem::Version
147
- version: 0.20.0
153
+ version: 0.23.1.rc1
148
154
  type: :development
149
155
  prerelease: false
150
156
  version_requirements: !ruby/object:Gem::Requirement
151
157
  requirements:
152
158
  - - '='
153
159
  - !ruby/object:Gem::Version
154
- version: 0.20.0
160
+ version: 0.23.1.rc1
155
161
  - !ruby/object:Gem::Dependency
156
162
  name: decidim-proposals
157
163
  requirement: !ruby/object:Gem::Requirement
158
164
  requirements:
159
165
  - - '='
160
166
  - !ruby/object:Gem::Version
161
- version: 0.20.0
167
+ version: 0.23.1.rc1
162
168
  type: :development
163
169
  prerelease: false
164
170
  version_requirements: !ruby/object:Gem::Requirement
165
171
  requirements:
166
172
  - - '='
167
173
  - !ruby/object:Gem::Version
168
- version: 0.20.0
174
+ version: 0.23.1.rc1
169
175
  description: An accountability component for decidim's participatory spaces.
170
176
  email:
171
177
  - josepjaume@gmail.com
@@ -193,19 +199,21 @@ files:
193
199
  - app/cells/decidim/accountability/highlighted_results_for_component/show.erb
194
200
  - app/cells/decidim/accountability/highlighted_results_for_component_cell.rb
195
201
  - app/cells/decidim/accountability/result_activity_cell.rb
202
+ - app/commands/decidim/accountability/admin/create_imported_result.rb
196
203
  - app/commands/decidim/accountability/admin/create_result.rb
197
204
  - app/commands/decidim/accountability/admin/create_status.rb
198
205
  - app/commands/decidim/accountability/admin/create_timeline_entry.rb
199
206
  - app/commands/decidim/accountability/admin/destroy_result.rb
207
+ - app/commands/decidim/accountability/admin/update_imported_result.rb
200
208
  - app/commands/decidim/accountability/admin/update_result.rb
201
209
  - app/commands/decidim/accountability/admin/update_status.rb
202
210
  - app/commands/decidim/accountability/admin/update_timeline_entry.rb
203
211
  - app/controllers/decidim/accountability/admin/application_controller.rb
212
+ - app/controllers/decidim/accountability/admin/import_results_controller.rb
204
213
  - app/controllers/decidim/accountability/admin/results_controller.rb
205
214
  - app/controllers/decidim/accountability/admin/statuses_controller.rb
206
215
  - app/controllers/decidim/accountability/admin/timeline_entries_controller.rb
207
216
  - app/controllers/decidim/accountability/application_controller.rb
208
- - app/controllers/decidim/accountability/result_widgets_controller.rb
209
217
  - app/controllers/decidim/accountability/results_controller.rb
210
218
  - app/controllers/decidim/accountability/versions_controller.rb
211
219
  - app/events/decidim/accountability/proposal_linked_event.rb
@@ -213,8 +221,12 @@ files:
213
221
  - app/forms/decidim/accountability/admin/result_form.rb
214
222
  - app/forms/decidim/accountability/admin/status_form.rb
215
223
  - app/forms/decidim/accountability/admin/timeline_entry_form.rb
224
+ - app/helpers/decidim/accountability/admin/application_helper.rb
216
225
  - app/helpers/decidim/accountability/application_helper.rb
217
226
  - app/helpers/decidim/accountability/breadcrumb_helper.rb
227
+ - app/jobs/application_job.rb
228
+ - app/jobs/decidim/accountability/admin/import_results_csv_job.rb
229
+ - app/mailers/decidim/accountability/import_mailer.rb
218
230
  - app/models/decidim/accountability/application_record.rb
219
231
  - app/models/decidim/accountability/result.rb
220
232
  - app/models/decidim/accountability/status.rb
@@ -228,11 +240,17 @@ files:
228
240
  - app/services/decidim/accountability/result_search.rb
229
241
  - app/services/decidim/accountability/result_stats_calculator.rb
230
242
  - app/services/decidim/accountability/results_calculator.rb
243
+ - app/services/decidim/accountability/results_csv_importer.rb
244
+ - app/types/decidim/accountability/accountability_type.rb
245
+ - app/types/decidim/accountability/result_type.rb
246
+ - app/types/decidim/accountability/status_type.rb
247
+ - app/types/decidim/accountability/timeline_entry_type.rb
248
+ - app/views/decidim/accountability/admin/import_results/new.html.erb
231
249
  - app/views/decidim/accountability/admin/results/_form.html.erb
232
- - app/views/decidim/accountability/admin/results/_proposals.html.erb
233
250
  - app/views/decidim/accountability/admin/results/edit.html.erb
234
251
  - app/views/decidim/accountability/admin/results/index.html.erb
235
252
  - app/views/decidim/accountability/admin/results/new.html.erb
253
+ - app/views/decidim/accountability/admin/results/proposals_picker.html.erb
236
254
  - app/views/decidim/accountability/admin/shared/_subnav.html.erb
237
255
  - app/views/decidim/accountability/admin/statuses/_form.html.erb
238
256
  - app/views/decidim/accountability/admin/statuses/edit.html.erb
@@ -242,6 +260,7 @@ files:
242
260
  - app/views/decidim/accountability/admin/timeline_entries/edit.html.erb
243
261
  - app/views/decidim/accountability/admin/timeline_entries/index.html.erb
244
262
  - app/views/decidim/accountability/admin/timeline_entries/new.html.erb
263
+ - app/views/decidim/accountability/import_mailer/import.html.erb
245
264
  - app/views/decidim/accountability/result_widgets/show.html.erb
246
265
  - app/views/decidim/accountability/results/_home_categories.html.erb
247
266
  - app/views/decidim/accountability/results/_home_header.html.erb
@@ -260,41 +279,77 @@ files:
260
279
  - app/views/decidim/accountability/results/index.html.erb
261
280
  - app/views/decidim/accountability/results/index.js.erb
262
281
  - app/views/decidim/accountability/results/show.html.erb
263
- - app/views/decidim/accountability/versions/_version.html.erb
264
282
  - app/views/decidim/accountability/versions/index.html.erb
265
283
  - app/views/decidim/accountability/versions/show.html.erb
266
284
  - app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_results.html.erb
267
285
  - app/views/decidim/participatory_processes/participatory_process_groups/_result.html.erb
268
286
  - app/views/decidim/participatory_spaces/_result.html.erb
287
+ - config/locales/am-ET.yml
269
288
  - config/locales/ar-SA.yml
270
289
  - config/locales/ar.yml
290
+ - config/locales/bg-BG.yml
291
+ - config/locales/bg.yml
271
292
  - config/locales/ca.yml
272
293
  - config/locales/cs-CZ.yml
273
294
  - config/locales/cs.yml
295
+ - config/locales/da-DK.yml
296
+ - config/locales/da.yml
274
297
  - config/locales/de.yml
298
+ - config/locales/el-GR.yml
299
+ - config/locales/el.yml
275
300
  - config/locales/en.yml
276
301
  - config/locales/eo-UY.yml
302
+ - config/locales/eo.yml
277
303
  - config/locales/es-MX.yml
278
304
  - config/locales/es-PY.yml
279
305
  - config/locales/es.yml
306
+ - config/locales/et-EE.yml
307
+ - config/locales/et.yml
280
308
  - config/locales/eu.yml
281
309
  - config/locales/fi-pl.yml
282
310
  - config/locales/fi-plain.yml
283
311
  - config/locales/fi.yml
312
+ - config/locales/fr-CA.yml
284
313
  - config/locales/fr.yml
314
+ - config/locales/ga-IE.yml
285
315
  - config/locales/gl.yml
316
+ - config/locales/hr-HR.yml
317
+ - config/locales/hr.yml
286
318
  - config/locales/hu.yml
287
319
  - config/locales/id-ID.yml
320
+ - config/locales/is-IS.yml
321
+ - config/locales/is.yml
288
322
  - config/locales/it.yml
323
+ - config/locales/ja-JP.yml
324
+ - config/locales/ja.yml
325
+ - config/locales/ko-KR.yml
326
+ - config/locales/ko.yml
327
+ - config/locales/lt-LT.yml
328
+ - config/locales/lt.yml
329
+ - config/locales/lv.yml
330
+ - config/locales/mt-MT.yml
331
+ - config/locales/mt.yml
289
332
  - config/locales/nl.yml
290
333
  - config/locales/no.yml
334
+ - config/locales/om-ET.yml
291
335
  - config/locales/pl.yml
292
336
  - config/locales/pt-BR.yml
293
337
  - config/locales/pt.yml
338
+ - config/locales/ro-RO.yml
294
339
  - config/locales/ru.yml
340
+ - config/locales/sk-SK.yml
341
+ - config/locales/sk.yml
342
+ - config/locales/sl.yml
343
+ - config/locales/so-SO.yml
344
+ - config/locales/sr-CS.yml
295
345
  - config/locales/sv.yml
346
+ - config/locales/ti-ER.yml
296
347
  - config/locales/tr-TR.yml
297
348
  - config/locales/uk.yml
349
+ - config/locales/vi-VN.yml
350
+ - config/locales/vi.yml
351
+ - config/locales/zh-CN.yml
352
+ - config/locales/zh-TW.yml
298
353
  - db/migrate/20170425154712_create_accountability_statuses.rb
299
354
  - db/migrate/20170426104125_create_accountability_results.rb
300
355
  - db/migrate/20170508104902_add_description_and_progress_to_statuses.rb
@@ -305,6 +360,8 @@ files:
305
360
  - db/migrate/20180305133145_rename_features_to_components_at_accountability.rb
306
361
  - db/migrate/20180508170210_add_weight_to_results.rb
307
362
  - db/migrate/20180508170647_add_external_id_to_results.rb
363
+ - db/migrate/20200320105903_index_foreign_keys_in_decidim_accountability_results.rb
364
+ - db/migrate/20200827154103_add_commentable_counter_cache_to_results.rb
308
365
  - lib/decidim/accountability.rb
309
366
  - lib/decidim/accountability/admin.rb
310
367
  - lib/decidim/accountability/admin_engine.rb
@@ -326,12 +383,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
326
383
  requirements:
327
384
  - - ">="
328
385
  - !ruby/object:Gem::Version
329
- version: '2.5'
386
+ version: '2.6'
330
387
  required_rubygems_version: !ruby/object:Gem::Requirement
331
388
  requirements:
332
- - - ">="
389
+ - - ">"
333
390
  - !ruby/object:Gem::Version
334
- version: '0'
391
+ version: 1.3.1
335
392
  requirements: []
336
393
  rubygems_version: 3.0.3
337
394
  signing_key: