decidim-accountability 0.29.4 → 0.30.0.rc1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (142) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/accountability/project/show.erb +6 -0
  3. data/app/cells/decidim/accountability/project_cell.rb +23 -42
  4. data/app/cells/decidim/accountability/result_history_cell.rb +57 -0
  5. data/app/cells/decidim/accountability/result_metadata_cell.rb +17 -17
  6. data/app/cells/decidim/accountability/status_cell.rb +9 -13
  7. data/app/commands/decidim/accountability/admin/create_imported_result.rb +1 -1
  8. data/app/commands/decidim/accountability/admin/create_result.rb +3 -2
  9. data/app/commands/decidim/accountability/admin/import_component_to_accountability.rb +47 -0
  10. data/app/commands/decidim/accountability/admin/update_imported_result.rb +1 -1
  11. data/app/commands/decidim/accountability/admin/update_result.rb +3 -2
  12. data/app/commands/decidim/accountability/admin/update_result_dates.rb +56 -0
  13. data/app/commands/decidim/accountability/admin/update_result_status.rb +61 -0
  14. data/app/commands/decidim/accountability/admin/update_result_taxonomies.rb +18 -0
  15. data/app/controllers/concerns/decidim/accountability/admin/filterable.rb +8 -6
  16. data/app/controllers/decidim/accountability/admin/import_components_controller.rb +36 -0
  17. data/app/controllers/decidim/accountability/admin/results_bulk_actions_controller.rb +102 -0
  18. data/app/controllers/decidim/accountability/admin/results_controller.rb +21 -11
  19. data/app/controllers/decidim/accountability/results_controller.rb +10 -7
  20. data/app/forms/decidim/accountability/admin/import_component_form.rb +98 -0
  21. data/app/forms/decidim/accountability/admin/result_bulk_actions_form.rb +18 -0
  22. data/app/forms/decidim/accountability/admin/result_form.rb +17 -23
  23. data/app/helpers/decidim/accountability/admin/application_helper.rb +0 -1
  24. data/app/helpers/decidim/accountability/application_helper.rb +1 -32
  25. data/app/helpers/decidim/accountability/breadcrumb_helper.rb +10 -14
  26. data/app/jobs/decidim/accountability/admin/import_projects_job.rb +5 -3
  27. data/app/jobs/decidim/accountability/admin/import_proposals_job.rb +70 -0
  28. data/app/mailers/decidim/accountability/import_proposals_mailer.rb +28 -0
  29. data/app/models/decidim/accountability/result.rb +23 -1
  30. data/app/models/decidim/accountability/status.rb +4 -0
  31. data/app/packs/entrypoints/decidim_accountability_admin_form.js +1 -0
  32. data/app/packs/src/decidim/accountability/admin/imports.js +37 -14
  33. data/app/packs/src/decidim/accountability/admin/index/action_button.js +42 -0
  34. data/app/packs/src/decidim/accountability/admin/index/action_form.js +46 -0
  35. data/app/packs/src/decidim/accountability/admin/index/action_selector.js +37 -0
  36. data/app/packs/src/decidim/accountability/admin/index/counter.js +40 -0
  37. data/app/packs/src/decidim/accountability/admin/index/select_all.js +29 -0
  38. data/app/packs/src/decidim/accountability/admin/index.js +17 -7
  39. data/app/packs/src/decidim/accountability/admin/result_form.js +21 -0
  40. data/app/packs/stylesheets/accountability.scss +5 -0
  41. data/app/permissions/decidim/accountability/admin/permissions.rb +3 -2
  42. data/app/presenters/decidim/accountability/admin_log/result_presenter.rb +1 -1
  43. data/app/presenters/decidim/accountability/result_presenter.rb +30 -0
  44. data/app/queries/decidim/accountability/metrics/results_metric_manage.rb +6 -6
  45. data/app/services/decidim/accountability/results_calculator.rb +4 -6
  46. data/app/services/decidim/accountability/results_csv_importer.rb +1 -1
  47. data/app/views/decidim/accountability/admin/import_components/_filters.html.erb +26 -0
  48. data/app/views/decidim/accountability/admin/import_components/_form.html.erb +26 -0
  49. data/app/views/decidim/accountability/admin/import_components/new.html.erb +14 -0
  50. data/app/views/decidim/accountability/admin/results/_actions.html.erb +29 -0
  51. data/app/views/decidim/accountability/admin/results/_form.html.erb +15 -8
  52. data/app/views/decidim/accountability/admin/results/_result-tr.html.erb +32 -0
  53. data/app/views/decidim/accountability/admin/results/_results-thead.html.erb +26 -0
  54. data/app/views/decidim/accountability/admin/results/bulk_actions/_dates_form.html.erb +19 -0
  55. data/app/views/decidim/accountability/admin/results/bulk_actions/_dropdown.html.erb +40 -0
  56. data/app/views/decidim/accountability/admin/results/bulk_actions/_status_form.html.erb +16 -0
  57. data/app/views/decidim/accountability/admin/results/bulk_actions/_submit_buttons.html.erb +4 -0
  58. data/app/views/decidim/accountability/admin/results/bulk_actions/_taxonomies_form.html.erb +18 -0
  59. data/app/views/decidim/accountability/admin/results/edit.html.erb +2 -2
  60. data/app/views/decidim/accountability/admin/results/index.html.erb +50 -111
  61. data/app/views/decidim/accountability/admin/results/manage_trash.html.erb +26 -0
  62. data/app/views/decidim/accountability/admin/results/new.html.erb +2 -2
  63. data/app/views/decidim/accountability/import_proposals_mailer/import.html.erb +2 -0
  64. data/app/views/decidim/accountability/results/{_home_categories.html.erb → _home_taxonomies.html.erb} +6 -8
  65. data/app/views/decidim/accountability/results/_project.html.erb +1 -3
  66. data/app/views/decidim/accountability/results/_projects_aside.html.erb +9 -7
  67. data/app/views/decidim/accountability/results/home.html.erb +18 -6
  68. data/app/views/decidim/accountability/results/index.html.erb +8 -2
  69. data/app/views/decidim/accountability/results/show.html.erb +5 -5
  70. data/config/assets.rb +3 -2
  71. data/config/locales/ar.yml +97 -55
  72. data/config/locales/bg.yml +0 -50
  73. data/config/locales/bs-BA.yml +0 -16
  74. data/config/locales/ca.yml +128 -40
  75. data/config/locales/cs.yml +147 -56
  76. data/config/locales/da.yml +0 -23
  77. data/config/locales/de.yml +126 -39
  78. data/config/locales/el.yml +0 -48
  79. data/config/locales/en.yml +128 -40
  80. data/config/locales/es-MX.yml +129 -41
  81. data/config/locales/es-PY.yml +129 -41
  82. data/config/locales/es.yml +129 -41
  83. data/config/locales/eu.yml +141 -54
  84. data/config/locales/fi-plain.yml +136 -49
  85. data/config/locales/fi.yml +136 -49
  86. data/config/locales/fr-CA.yml +112 -58
  87. data/config/locales/fr.yml +112 -58
  88. data/config/locales/ga-IE.yml +0 -13
  89. data/config/locales/gl.yml +0 -17
  90. data/config/locales/gn-PY.yml +0 -11
  91. data/config/locales/he-IL.yml +45 -54
  92. data/config/locales/hu.yml +0 -50
  93. data/config/locales/id-ID.yml +0 -16
  94. data/config/locales/is-IS.yml +0 -17
  95. data/config/locales/it.yml +0 -75
  96. data/config/locales/ja.yml +132 -47
  97. data/config/locales/kaa.yml +0 -8
  98. data/config/locales/ko.yml +0 -47
  99. data/config/locales/lb.yml +1 -18
  100. data/config/locales/lt.yml +0 -50
  101. data/config/locales/lv.yml +0 -19
  102. data/config/locales/nl.yml +0 -17
  103. data/config/locales/no.yml +0 -17
  104. data/config/locales/pl.yml +0 -47
  105. data/config/locales/pt-BR.yml +6 -50
  106. data/config/locales/pt.yml +35 -23
  107. data/config/locales/ro-RO.yml +2 -31
  108. data/config/locales/ru.yml +1 -17
  109. data/config/locales/si-LK.yml +0 -14
  110. data/config/locales/sk.yml +0 -19
  111. data/config/locales/sl.yml +0 -17
  112. data/config/locales/sq-AL.yml +0 -50
  113. data/config/locales/sr-CS.yml +0 -16
  114. data/config/locales/sv.yml +125 -37
  115. data/config/locales/th-TH.yml +0 -50
  116. data/config/locales/tr-TR.yml +0 -53
  117. data/config/locales/uk.yml +0 -19
  118. data/config/locales/zh-CN.yml +0 -20
  119. data/config/locales/zh-TW.yml +0 -47
  120. data/db/migrate/20200827154103_add_commentable_counter_cache_to_results.rb +1 -1
  121. data/db/migrate/20240828103202_add_deleted_at_to_decidim_accountability_results.rb +8 -0
  122. data/db/migrate/20240916112128_add_geolocation_fields_to_results.rb +9 -0
  123. data/decidim-accountability.gemspec +1 -1
  124. data/lib/decidim/accountability/admin_engine.rb +16 -2
  125. data/lib/decidim/accountability/component.rb +3 -3
  126. data/lib/decidim/accountability/result_serializer.rb +9 -13
  127. data/lib/decidim/accountability/seeds.rb +28 -21
  128. data/lib/decidim/accountability/test/factories.rb +6 -4
  129. data/lib/decidim/accountability/version.rb +1 -1
  130. data/lib/decidim/api/accountability_type.rb +4 -5
  131. data/lib/decidim/api/result_type.rb +10 -13
  132. data/lib/decidim/api/status_type.rb +3 -4
  133. data/lib/decidim/api/timeline_entry_type.rb +5 -6
  134. metadata +58 -31
  135. data/app/commands/decidim/accountability/admin/import_projects_to_accountability.rb +0 -37
  136. data/app/controllers/decidim/accountability/admin/projects_import_controller.rb +0 -31
  137. data/app/forms/decidim/accountability/admin/result_import_projects_form.rb +0 -51
  138. data/app/views/decidim/accountability/admin/projects_import/new.html.erb +0 -45
  139. data/app/views/decidim/accountability/results/_nav_breadcrumb.html.erb +0 -37
  140. data/app/views/decidim/accountability/results/_scope_filters.html.erb +0 -31
  141. data/config/locales/ca-IT.yml +0 -292
  142. /data/app/packs/entrypoints/{decidim_accountability_admin.js → decidim_accountability_admin_index.js} +0 -0
@@ -8,10 +8,7 @@ th:
8
8
  decidim_scope_id: ขอบเขต
9
9
  description: คำอธิบาย
10
10
  end_date: วันสิ้นสุด
11
- meetings_ids: รวมการประชุม
12
11
  progress: ความคืบหน้า
13
- project_ids: รวมโครงการ
14
- proposals: รวมข้อเสนอ
15
12
  start_date: วันที่เริ่มต้น
16
13
  title: ชื่อ
17
14
  updated_at: อัปเดตที่
@@ -39,7 +36,6 @@ th:
39
36
  confirm_destroy: คุณแน่ใจหรือไม่ว่าต้องการลบ %{name} นี้
40
37
  destroy: ลบ
41
38
  edit: แก้ไข
42
- import: นำเข้าโครงการจากส่วนประกอบอื่น
43
39
  import_csv: นำเข้าผลลัพธ์จากไฟล์ CSV
44
40
  new_result: ผลลัพธ์ใหม่
45
41
  new_status: สถานะใหม่
@@ -55,27 +51,6 @@ th:
55
51
  new:
56
52
  download_export: ดาวน์โหลดการส่งออกด้วยรูปแบบ CSV
57
53
  import: นำเข้า
58
- info: |
59
- <p>เราขอแนะนำให้คุณทำตามขั้นตอนเหล่านี้:</p>
60
- <ol>
61
- <li><a href='%{link_new_status}' target='_blank'>สร้างสถานะสำหรับผลลัพธ์</a> ที่คุณต้องการเพิ่ม</li>
62
- <li><a href='%{link_new_result}' target='_blank'>สร้างผลลัพธ์อย่างน้อยหนึ่งรายการด้วยตนเอง</a>ผ่านแผงการดูแลระบบนี้ก่อนที่จะใช้การนำเข้า เพื่อให้มีความเข้าใจที่ดีขึ้นเกี่ยวกับรูปแบบและสิ่งที่คุณต้องการ เพื่อกรอก</li>
63
- <li>%{link_export_csv}</li>
64
- <li>ทำการเปลี่ยนแปลงภายในเครื่อง คุณสามารถเปลี่ยนได้เฉพาะคอลัมน์ต่อไปนี้ของ CSV:
65
- <ul>
66
- <li><b>category/id:</b> รหัสสำหรับหมวดหมู่</li>
67
- <li><b>ขอบเขต/id:</b> ID สำหรับขอบเขต</li>
68
- <li><b>parent/id:</b> ID ของ parent (สำหรับผลลัพธ์ที่เกี่ยวข้อง) ไม่บังคับ</li>
69
- <li><b>title/en:</b> ชื่อเรื่องเป็นภาษาอังกฤษ ขึ้นอยู่กับการกำหนดค่าภาษาแพลตฟอร์มของคุณ</li>
70
- <li><b>description/en:</b> คำอธิบายเป็นภาษาอังกฤษ ขึ้นอยู่กับการกำหนดค่าภาษาแพลตฟอร์มของคุณ</li>
71
- <li><b>start_date:</b> วันที่ผลลัพธ์เริ่มดำเนินการ (รูปแบบ YYYY-MM-DD)</li>
72
- <li><b>end_date:</b> วันที่ผลลัพธ์สิ้นสุดการดำเนินการ (รูปแบบ YYYY-MM-DD)</li>
73
- <li><b>status/id:</b> ID ของสถานะของผลลัพธ์นี้</li>
74
- <li><b>ความคืบหน้า:</b> เปอร์เซ็นต์ (ตั้งแต่ 0 ถึง 100) ของการดำเนินการ</li>
75
- <li><b>proposals_ids:</b> ID ภายในของข้อเสนอที่เกี่ยวข้อง (คั่นด้วยเครื่องหมายจุลภาค) จะถูกแปลงเป็น <span class='attribute-name'>proposal_url</span></li> โดยอัตโนมัติ
76
- </ul>
77
- </li>
78
- </ol>
79
54
  title: นำเข้าผลลัพธ์จากไฟล์ CSV
80
55
  imports:
81
56
  create:
@@ -86,22 +61,10 @@ th:
86
61
  name: ผลลัพธ์
87
62
  status:
88
63
  name: สถานะ
89
- projects_import:
90
- create:
91
- invalid: เกิดปัญหาในการนำเข้าโปรเจ็กต์ไปยังผลลัพธ์ โปรดปฏิบัติตามคำแนะนำอย่างละเอียด และตรวจสอบให้แน่ใจว่าคุณได้เลือกโปรเจ็กต์สำหรับนำไปใช้งาน
92
- new:
93
- create: นำเข้า
94
- import_all_selected_projects: นำเข้าโครงการทั้งหมดที่เลือกเพื่อนำไปใช้งาน
95
- no_components: ไม่มีองค์ประกอบด้านงบประมาณในพื้นที่แบบมีส่วนร่วมนี้เพื่อนำเข้าโครงการเข้าสู่ผลลัพธ์d
96
- success:
97
- other: "มี 1 โปรเจ็กต์อยู่ในคิวที่จะนำเข้า คุณจะได้รับแจ้งทางอีเมลเมื่อดำเนินการเสร็จสิ้น"
98
- title: นำเข้าโครงการจากส่วนประกอบอื่น
99
64
  results:
100
65
  create:
101
66
  invalid: เกิดปัญหาในการสร้างผลลัพธ์นี้
102
67
  success: สร้างผลลัพธ์สำเร็จแล้ว
103
- destroy:
104
- success: ลบผลลัพธ์เรียบร้อยแล้ว
105
68
  edit:
106
69
  title: แก้ไขผลลัพธ์
107
70
  update: อัพเดทผลครับ
@@ -139,19 +102,12 @@ th:
139
102
  success: สร้างรายการสําเร็จแล้ว
140
103
  destroy:
141
104
  success: ลบรายการเรียบร้อยแล้ว
142
- models:
143
- result:
144
- fields:
145
- category: หมวดหมู่
146
- scope: ขอบเขต
147
105
  results:
148
106
  home:
149
107
  empty: ยังไม่มีผลลัพธ์
150
108
  empty_filters: ไม่มีผลลัพธ์ตามเกณฑ์นี้
151
109
  home_header:
152
110
  global_status: สถานะการดำเนินการทั่วโลก
153
- nav_breadcrumb:
154
- global: การดำเนินการระดับโลก
155
111
  no_results: ไม่มีโครงการ
156
112
  search:
157
113
  search: ค้นหาการกระทำ
@@ -163,10 +119,6 @@ th:
163
119
  admin:
164
120
  filters:
165
121
  results:
166
- category_id_eq:
167
- label: หมวดหมู่
168
- scope_id_eq:
169
- label: ขอบเขต
170
122
  status_id_eq:
171
123
  label: สถานะ
172
124
  components:
@@ -180,8 +132,6 @@ th:
180
132
  comments_max_length: ความคิดเห็นความยาวสูงสุด (ปล่อยให้ 0 เป็นค่าเริ่มต้น)
181
133
  display_progress_enabled: แสดงความคืบหน้า
182
134
  intro: คำแนะนำ
183
- scope_id: ขอบเขต
184
- scopes_enabled: เปิดใช้งานขอบเขตแล้ว
185
135
  step:
186
136
  comments_blocked: ความคิดเห็นถูกบล็อก
187
137
  events:
@@ -8,12 +8,8 @@ tr:
8
8
  decidim_scope_id: kapsam
9
9
  description: Açıklama
10
10
  end_date: Bitiş tarihi
11
- meetings_ids: Görüşmeler
12
11
  progress: İlerleme
13
- project_ids: Dahil edilen projeler
14
- proposals: Dahil edilen teklifler
15
12
  start_date: Başlangıç tarihi
16
- subresults:
17
13
  title: Başlık
18
14
  updated_at: Adresinde güncellendi
19
15
  status:
@@ -41,7 +37,6 @@ tr:
41
37
  confirm_destroy: Bu %{name}silmek istediğinize emin misiniz?
42
38
  destroy: silmek
43
39
  edit: Düzenle
44
- import: Başka bir bileşenden proje aktar
45
40
  import_csv: Sonuçları CSV dosyasından içe aktarın
46
41
  new_result: Yeni sonuç
47
42
  new_status: Yeni Durum
@@ -57,27 +52,6 @@ tr:
57
52
  new:
58
53
  download_export: ' İhracat i CSV formatında indirin '
59
54
  import: İçe aktar
60
- info: |
61
- <p>Şu adımları uygulamanızı öneririz:</p>
62
- <ol>
63
- <li><a href='%{link_new_status}' target='_blank'>Eklemek istediğiniz Sonuçlar için kayıtları</a></li>
64
- Biçimi ve neye ihtiyacınız olacağını daha iyi anlamak için, İçe Aktarmayı kullanmadan önce bu Yönetici paneli aracılığıyla <li><a href='%{link_new_result}' target='_blank'>manuel olarak en az bir Sonuç oluşturun</a> doldurmak için.</li>
65
- <li>%{link_export_csv</li>
66
- <li>Değişiklikleri yerel olarak yapın. CSV'nin yalnızca aşağıdaki sütunlarını değiştirebilirsiniz:
67
- <ul>
68
- <li><b>kategori/kimlik:</b> Kategorinin kimliği</li>
69
- <li><b>kapsam/kimlik:</b> Kapsamın kimliği</li>
70
- <li><b>ebeveyn/kimlik:</b> Ebeveynin kimliği (ilgili Sonuçlar için). İsteğe bağlı</li>
71
- <li><b>title/en:</b> İngilizce dilindeki başlık. Bu, platform dili yapılandırmanıza bağlı olacaktır.</li>
72
- <li><b>description/tr:</b> İngilizce diliyle ilgili açıklama. Bu, platform dili yapılandırmanıza bağlı olacaktır.</li>
73
- <li><b>başlangıç_tarihi:</b> sonucun yürütülmeye başlayacağı tarih (YYYY-AA-GG biçiminde)</li>
74
- <li><b>bitiş_tarihi:</b> sonucun yürütülmesinin sona erdiği tarih (YYYY-AA-GG biçiminde)</li>
75
- <li><b>durum/kimlik:</b> Bu sonuca ilişkin Durumun kimliği</li>
76
- <li><b>ilerleme:</b> Yürütme yüzdesi (0'dan 100'e kadar)</li>
77
- <li><b>teklifler_kimlikleri:</b> İlgili tekliflerin dahili kimliği (virgülle ayrılmış). Otomatik olarak <span class='attribute-name'>proposal_url</span></li> biçimine dönüştürülür
78
- </ul>
79
- </li>
80
- </ol>
81
55
  title: Sonuçları CSV dosyasından içe aktarın
82
56
  imports:
83
57
  create:
@@ -88,25 +62,10 @@ tr:
88
62
  name: Sonuç
89
63
  status:
90
64
  name: durum
91
- projects_import:
92
- create:
93
- invalid: Projelerin sonuçlara aktarılmasında bir sorun oluştu. Lütfen talimatları dikkatlice takip edin ve projeleri seçtiğinizden emin olun.
94
- new:
95
- create: İçe aktar
96
- import_all_selected_projects: Seçilen tüm projeleri içe aktarın
97
- new_items:
98
- one: Seçilen 1 proje içe aktarılacak
99
- other: "Seçilen %{count} proje içe aktarılacak"
100
- no_components: Bu katılımcı alanda projeleri sonuçlara dönüştürecek bütçe bileşenleri yoktur.
101
- origin_component_id:
102
- select_component: Bir bileşen seç
103
- title: Projeleri başka bir bileşenden içe aktarın
104
65
  results:
105
66
  create:
106
67
  invalid: Sonuçlar sorgulanırken bir sorun oluştu.
107
68
  success: Sonuçlar Başarıyla oluşturuldu.
108
- destroy:
109
- success: Sonuçlar Başarıyla Silindi.
110
69
  edit:
111
70
  title: Sonucu düzenle
112
71
  update: Sonuç güncelle
@@ -190,12 +149,10 @@ tr:
190
149
  models:
191
150
  result:
192
151
  fields:
193
- category: Kategori
194
152
  created_at: Oluşturuldu
195
153
  end_date: Bitiş tarihi
196
154
  id: ID
197
155
  progress: İlerleme
198
- scope: kapsam
199
156
  start_date: Başlangıç tarihi
200
157
  status: durum
201
158
  title: Başlık
@@ -214,15 +171,11 @@ tr:
214
171
  results_count:
215
172
  one: 1 sonuç
216
173
  other: "%{count} sonuç"
217
- filters:
218
- all: Herşey
219
174
  home:
220
175
  empty: Henüz sonuç yok.
221
176
  empty_filters: Bu kriterlere uyan sonuç bulunamamıştır.
222
177
  home_header:
223
178
  global_status: Genel yürütme durumu
224
- nav_breadcrumb:
225
- global: Global yürütme
226
179
  no_results: Proje Bulunamadı
227
180
  search:
228
181
  search: İşlemleri ara
@@ -234,10 +187,6 @@ tr:
234
187
  admin:
235
188
  filters:
236
189
  results:
237
- category_id_eq:
238
- label: Kategori
239
- scope_id_eq:
240
- label: kapsam
241
190
  status_id_eq:
242
191
  label: Durum
243
192
  components:
@@ -251,8 +200,6 @@ tr:
251
200
  comments_max_length: Maksimum yorum uzunluğu (Varsayılan değer için 0 bırakın)
252
201
  display_progress_enabled: İlerlemeyi göster
253
202
  intro: Tanıtım
254
- scope_id: kapsam
255
- scopes_enabled: Kapsamlar etkinleştirildi
256
203
  step:
257
204
  comments_blocked: Yorumlar engellendi
258
205
  events:
@@ -9,8 +9,6 @@ uk:
9
9
  description: Опис
10
10
  end_date: Дата закінчення
11
11
  progress: Перебіг
12
- project_ids: Включені проекти
13
- proposals: Включені пропозиції
14
12
  start_date: Дата початку
15
13
  title: Назва
16
14
  updated_at: 'Оновлено:'
@@ -89,10 +87,8 @@ uk:
89
87
  models:
90
88
  result:
91
89
  fields:
92
- category: Категорія
93
90
  end_date: Дата закінчення
94
91
  progress: Перебіг
95
- scope: Обсяг
96
92
  start_date: Дата початку
97
93
  status: Стан
98
94
  title: Назва
@@ -112,12 +108,8 @@ uk:
112
108
  few: "%{count} підсумків"
113
109
  many: "%{count} підсумків"
114
110
  other: "%{count} підсумків"
115
- filters:
116
- all: Усі
117
111
  home_header:
118
112
  global_status: Загальний стан виконання
119
- nav_breadcrumb:
120
- global: Загальне виконання
121
113
  search:
122
114
  search: Пошук дій
123
115
  show:
@@ -125,13 +117,6 @@ uk:
125
117
  back_to_resource: Повернутися до підсумків
126
118
  timeline:
127
119
  title: Розвиток проекту
128
- admin:
129
- filters:
130
- results:
131
- category_id_eq:
132
- label: Категорія
133
- scope_id_eq:
134
- label: Обсяг
135
120
  components:
136
121
  accountability:
137
122
  name: Звітність
@@ -140,7 +125,6 @@ uk:
140
125
  comments_enabled: Коментарі увімкнено
141
126
  display_progress_enabled: Показувати перебіг
142
127
  intro: Вступ
143
- scope_id: Обсяг
144
128
  step:
145
129
  comments_blocked: Коментарі вимкнено
146
130
  events:
@@ -150,9 +134,6 @@ uk:
150
134
  email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{proposal_title}". Ви можете відписатися від цих сповіщень, перейшовши за наведеним вище посиланням.
151
135
  email_subject: Оновлення до %{proposal_title}
152
136
  notification_title: Пропозиція <a href="%{proposal_path}">%{proposal_title}</a> була включена до підсумку <a href="%{resource_path}">%{resource_title}</a>.
153
- metrics:
154
- results:
155
- title: Підсумки
156
137
  resource_links:
157
138
  included_projects:
158
139
  result_project: Проекти, включені до цих підсумків
@@ -9,8 +9,6 @@ zh-CN:
9
9
  description: 描述
10
10
  end_date: 结束日期
11
11
  progress: 进展情况
12
- project_ids: 包括项目
13
- proposals: 包括的建议
14
12
  start_date: 开始日期
15
13
  title: 标题
16
14
  updated_at: 更新于
@@ -49,9 +47,6 @@ zh-CN:
49
47
  name: 结果
50
48
  status:
51
49
  name: 状态
52
- projects_import:
53
- new:
54
- create: 导入
55
50
  results:
56
51
  edit:
57
52
  title: 编辑结果
@@ -99,10 +94,8 @@ zh-CN:
99
94
  models:
100
95
  result:
101
96
  fields:
102
- category: 类别
103
97
  end_date: 结束日期
104
98
  progress: 进展情况
105
- scope: 范围
106
99
  start_date: 开始日期
107
100
  status: 状态
108
101
  title: 标题
@@ -119,12 +112,8 @@ zh-CN:
119
112
  count:
120
113
  results_count:
121
114
  other: "%{count} 个结果"
122
- filters:
123
- all: 所有的
124
115
  home_header:
125
116
  global_status: 全局执行状态
126
- nav_breadcrumb:
127
- global: 全局执行
128
117
  search:
129
118
  search: 搜索操作
130
119
  show:
@@ -132,13 +121,6 @@ zh-CN:
132
121
  back_to_resource: 返回结果
133
122
  timeline:
134
123
  title: 项目进化
135
- admin:
136
- filters:
137
- results:
138
- category_id_eq:
139
- label: 类别
140
- scope_id_eq:
141
- label: 范围
142
124
  components:
143
125
  accountability:
144
126
  name: 问责制
@@ -148,8 +130,6 @@ zh-CN:
148
130
  comments_max_length: 评论最大长度 (默认值留0)
149
131
  display_progress_enabled: 显示进度
150
132
  intro: 简介
151
- scope_id: 范围
152
- scopes_enabled: 范围已启用
153
133
  step:
154
134
  comments_blocked: 评论已阻止
155
135
  events:
@@ -8,10 +8,7 @@ zh-TW:
8
8
  decidim_scope_id: 範圍
9
9
  description: 說明
10
10
  end_date: 結束日期
11
- meetings_ids: 包含的會議
12
11
  progress: 進度
13
- project_ids: 包含的專案
14
- proposals: 包含的建議
15
12
  start_date: 開始日期
16
13
  title: 標題
17
14
  updated_at: 更新時間
@@ -50,27 +47,6 @@ zh-TW:
50
47
  new:
51
48
  download_export: 匯出成 CSV
52
49
  import: 匯入
53
- info: |
54
- <p>建議透過下面步驟:</p>
55
- <ol>
56
- <li><a href='%{link_new_status}' target='_blank'>建立結果的狀態</a></li>
57
- <li><a href='%{link_new_result}' target='_blank'>手動建立至少一個結果</a> 在這個管理介面,這樣一來在匯入前可以先理解需要填寫的格式</li>
58
- <li>%{link_export_csv}</li>
59
- <li>下載後在電腦調整,只能夠調整 CSV 檔案的下面欄位:
60
- <ul>
61
- <li><b>category/id:</b> 類別編號</li>
62
- <li><b>scope/id:</b> 範圍編號</li>
63
- <li><b>parent/id:</b> 上層編號 (相關結果),選填</li>
64
- <li><b>title/en:</b> 英文標題,這會依據語言設定不同</li>
65
- <li><b>description/en:</b> 英文說明,這會依據語言設定不同</li>
66
- <li><b>start_date:</b> 結果開始執行時間 (格式 YYYY-MM-DD)</li>
67
- <li><b>end_date:</b> 結果結束執行時間 (格式 YYYY-MM-DD)</li>
68
- <li><b>status/id:</b> 這個結果的狀態編號</li>
69
- <li><b>progress:</b> 執行率百分比 (從 0 到 100) </li>
70
- <li><b>proposals_ids:</b> 相關提案的內部編號 (逗點分隔),會自動轉換為 <span class='attribute-name'>proposal_url</span></li>
71
- </ul>
72
- </li>
73
- </ol>
74
50
  imports:
75
51
  create:
76
52
  success: 檔案開始匯入,執行完成後會寄發 email 說明匯入結果.
@@ -79,21 +55,10 @@ zh-TW:
79
55
  name: 結果
80
56
  status:
81
57
  name: 狀態
82
- projects_import:
83
- create:
84
- invalid: 匯入專案到結果時發生錯誤,請確實依照說明小心操作,以及確認已經選擇要實做的專案
85
- new:
86
- create: 匯入
87
- import_all_selected_projects: 匯入所有選擇的專案來實現
88
- no_components: 在這個參與空間沒有預算元件來匯入專案到結果
89
- success:
90
- other: "%{count} 個專案已經排程匯入,完成後會寄送 email 通知."
91
58
  results:
92
59
  create:
93
60
  invalid: 建立結果時發生錯誤.
94
61
  success: 結果成功建立.
95
- destroy:
96
- success: 結果成功刪除.
97
62
  edit:
98
63
  title: 編輯結果
99
64
  update: 更新結果
@@ -179,12 +144,10 @@ zh-TW:
179
144
  models:
180
145
  result:
181
146
  fields:
182
- category: 類別
183
147
  created_at: 建立時間
184
148
  end_date: 結束日期
185
149
  id: 編號
186
150
  progress: 進度
187
- scope: 範圍
188
151
  start_date: 開始日期
189
152
  status: 狀態
190
153
  title: 標題
@@ -202,12 +165,8 @@ zh-TW:
202
165
  count:
203
166
  results_count:
204
167
  other: "%{count} 個結果"
205
- filters:
206
- all: 全部
207
168
  home_header:
208
169
  global_status: 全域執行狀態
209
- nav_breadcrumb:
210
- global: 全域執行
211
170
  search:
212
171
  search: 搜尋操作
213
172
  show:
@@ -218,10 +177,6 @@ zh-TW:
218
177
  admin:
219
178
  filters:
220
179
  results:
221
- category_id_eq:
222
- label: 類別
223
- scope_id_eq:
224
- label: 範圍
225
180
  status_id_eq:
226
181
  label: 狀態
227
182
  components:
@@ -235,8 +190,6 @@ zh-TW:
235
190
  comments_max_length: 留言字數上限 (0 表示使用預設)
236
191
  display_progress_enabled: 顯示進度
237
192
  intro: 介紹
238
- scope_id: 範圍
239
- scopes_enabled: 啟用的範圍
240
193
  step:
241
194
  comments_blocked: 留言已封鎖
242
195
  events:
@@ -4,6 +4,6 @@ class AddCommentableCounterCacheToResults < ActiveRecord::Migration[5.2]
4
4
  def change
5
5
  add_column :decidim_accountability_results, :comments_count, :integer, null: false, default: 0, index: true
6
6
  Decidim::Accountability::Result.reset_column_information
7
- Decidim::Accountability::Result.find_each(&:update_comments_count)
7
+ Decidim::Accountability::Result.unscoped.find_each(&:update_comments_count)
8
8
  end
9
9
  end
@@ -0,0 +1,8 @@
1
+ # frozen_string_literal: true
2
+
3
+ class AddDeletedAtToDecidimAccountabilityResults < ActiveRecord::Migration[7.0]
4
+ def change
5
+ add_column :decidim_accountability_results, :deleted_at, :datetime
6
+ add_index :decidim_accountability_results, :deleted_at
7
+ end
8
+ end
@@ -0,0 +1,9 @@
1
+ # frozen_string_literal: true
2
+
3
+ class AddGeolocationFieldsToResults < ActiveRecord::Migration[6.1]
4
+ def change
5
+ add_column :decidim_accountability_results, :address, :text
6
+ add_column :decidim_accountability_results, :latitude, :float
7
+ add_column :decidim_accountability_results, :longitude, :float
8
+ end
9
+ end
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
19
19
  "homepage_uri" => "https://decidim.org",
20
20
  "source_code_uri" => "https://github.com/decidim/decidim"
21
21
  }
22
- s.required_ruby_version = "~> 3.2.0"
22
+ s.required_ruby_version = "~> 3.3.0"
23
23
 
24
24
  s.name = "decidim-accountability"
25
25
  s.summary = "Decidim accountability module"
@@ -13,14 +13,28 @@ module Decidim
13
13
 
14
14
  routes do
15
15
  resources :statuses
16
- resources :results, except: [:show] do
16
+ resources :results, except: [:show, :destroy] do
17
+ member do
18
+ patch :soft_delete
19
+ patch :restore
20
+ end
21
+
22
+ collection do
23
+ post :update_taxonomies, controller: "results_bulk_actions"
24
+ post :update_status, controller: "results_bulk_actions"
25
+ post :update_dates, controller: "results_bulk_actions"
26
+ end
27
+
17
28
  get :proposals_picker, on: :collection
29
+ get :manage_trash, on: :collection
18
30
 
19
31
  resources :attachment_collections, except: [:show]
20
32
  resources :attachments, except: [:show]
21
33
  resources :timeline_entries, except: [:show]
22
34
  end
23
- resources :projects_import, only: [:new, :create]
35
+ resources :import_components, only: [:new, :create] do
36
+ get :preview, on: :collection
37
+ end
24
38
  get :import_results, to: "import_results#new"
25
39
  post :import_results, to: "import_results#create"
26
40
  root to: "results#index"
@@ -25,12 +25,12 @@ Decidim.register_component(:accountability) do |component|
25
25
  end
26
26
 
27
27
  component.settings(:global) do |settings|
28
- settings.attribute :scopes_enabled, type: :boolean, default: true
29
- settings.attribute :scope_id, type: :scope
28
+ settings.attribute :taxonomy_filters, type: :taxonomy_filters
30
29
  settings.attribute :comments_enabled, type: :boolean, default: true
31
30
  settings.attribute :comments_max_length, type: :integer, required: true
32
31
  settings.attribute :intro, type: :text, translated: true, editor: true
33
32
  settings.attribute :display_progress_enabled, type: :boolean, default: true
33
+ settings.attribute :geocoding_enabled, type: :boolean, default: false
34
34
  end
35
35
 
36
36
  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|
45
45
  exports.collection do |component_instance|
46
46
  Decidim::Accountability::Result
47
47
  .where(component: component_instance)
48
- .includes(:category, :scope, :status, component: { participatory_space: :organization })
48
+ .includes(:taxonomies, :status, component: { participatory_space: :organization })
49
49
  end
50
50
 
51
51
  exports.include_in_open_data = true
@@ -17,14 +17,7 @@ module Decidim
17
17
  def serialize
18
18
  {
19
19
  id: result.id,
20
- category: {
21
- id: result.category.try(:id),
22
- name: result.category.try(:name) || empty_translatable
23
- },
24
- scope: {
25
- id: result.scope.try(:id),
26
- name: result.scope.try(:name) || empty_translatable
27
- },
20
+ taxonomies:,
28
21
  parent: {
29
22
  id: result.parent.try(:id)
30
23
  },
@@ -39,9 +32,16 @@ module Decidim
39
32
  },
40
33
  progress: result.progress,
41
34
  created_at: result.created_at,
35
+ updated_at: result.updated_at,
42
36
  url:,
43
37
  component: { id: component.id },
44
- proposal_urls: proposals
38
+ proposal_urls: proposals,
39
+ reference: result.reference,
40
+ children_count: result.children_count,
41
+ comments_count: result.comments_count,
42
+ address: result.address,
43
+ latitude: result.latitude,
44
+ longitude: result.longitude
45
45
  }
46
46
  end
47
47
 
@@ -50,10 +50,6 @@ module Decidim
50
50
  attr_reader :result
51
51
  alias resource result
52
52
 
53
- def component
54
- result.component
55
- end
56
-
57
53
  def proposals
58
54
  result.linked_resources(:proposals, "included_proposals").map do |proposal|
59
55
  Decidim::ResourceLocatorPresenter.new(proposal).url