decidim-accountability 0.23.3 → 0.24.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (76) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/decidim/accountability/accountability/_categories.scss +5 -4
  3. data/app/cells/decidim/accountability/content_blocks/highlighted_results/elements.erb +5 -0
  4. data/app/cells/decidim/accountability/content_blocks/highlighted_results/heading.erb +1 -0
  5. data/app/cells/decidim/accountability/content_blocks/highlighted_results_cell.rb +18 -0
  6. data/app/cells/decidim/accountability/result_cell.rb +21 -0
  7. data/app/cells/decidim/accountability/result_m/data.erb +23 -0
  8. data/app/cells/decidim/accountability/result_m/footer.erb +22 -0
  9. data/app/cells/decidim/accountability/result_m/tags.erb +1 -0
  10. data/app/cells/decidim/accountability/result_m_cell.rb +37 -0
  11. data/app/controllers/concerns/decidim/accountability/admin/filterable.rb +59 -0
  12. data/app/controllers/decidim/accountability/admin/attachment_collections_controller.rb +32 -0
  13. data/app/controllers/decidim/accountability/admin/attachments_controller.rb +32 -0
  14. data/app/controllers/decidim/accountability/admin/results_controller.rb +7 -2
  15. data/app/helpers/decidim/accountability/admin/filterable_helper.rb +10 -0
  16. data/app/helpers/decidim/accountability/breadcrumb_helper.rb +3 -1
  17. data/app/models/decidim/accountability/result.rb +15 -2
  18. data/app/models/decidim/accountability/status.rb +5 -0
  19. data/app/views/decidim/accountability/admin/results/index.html.erb +52 -2
  20. data/app/views/decidim/accountability/results/_show_leaf.html.erb +2 -0
  21. data/app/views/decidim/accountability/results/_show_parent.html.erb +2 -0
  22. data/config/locales/ar.yml +0 -4
  23. data/config/locales/bg.yml +0 -4
  24. data/config/locales/ca.yml +14 -4
  25. data/config/locales/cs.yml +24 -4
  26. data/config/locales/da.yml +0 -4
  27. data/config/locales/de.yml +24 -4
  28. data/config/locales/el.yml +0 -4
  29. data/config/locales/en.yml +24 -4
  30. data/config/locales/es-MX.yml +12 -4
  31. data/config/locales/es-PY.yml +12 -4
  32. data/config/locales/es.yml +12 -4
  33. data/config/locales/eu.yml +0 -4
  34. data/config/locales/fi-plain.yml +24 -4
  35. data/config/locales/fi.yml +24 -4
  36. data/config/locales/fr-CA.yml +24 -4
  37. data/config/locales/fr.yml +24 -4
  38. data/config/locales/gl.yml +24 -4
  39. data/config/locales/hu.yml +0 -4
  40. data/config/locales/id-ID.yml +0 -4
  41. data/config/locales/is-IS.yml +24 -4
  42. data/config/locales/it.yml +24 -4
  43. data/config/locales/ja.yml +24 -4
  44. data/config/locales/lv.yml +0 -4
  45. data/config/locales/nl.yml +24 -4
  46. data/config/locales/no.yml +21 -4
  47. data/config/locales/pl.yml +24 -4
  48. data/config/locales/pt-BR.yml +0 -4
  49. data/config/locales/pt.yml +0 -4
  50. data/config/locales/ro-RO.yml +4 -4
  51. data/config/locales/ru.yml +0 -4
  52. data/config/locales/si-LK.yml +3 -0
  53. data/config/locales/sk.yml +7 -4
  54. data/config/locales/sl.yml +0 -4
  55. data/config/locales/sr-CS.yml +0 -4
  56. data/config/locales/sv.yml +24 -4
  57. data/config/locales/tr-TR.yml +22 -4
  58. data/config/locales/uk.yml +0 -4
  59. data/config/locales/zh-CN.yml +0 -4
  60. data/lib/decidim/accountability.rb +1 -0
  61. data/lib/decidim/accountability/admin_engine.rb +2 -0
  62. data/lib/decidim/accountability/api.rb +10 -0
  63. data/lib/decidim/accountability/component.rb +20 -8
  64. data/lib/decidim/accountability/engine.rb +0 -17
  65. data/lib/decidim/accountability/version.rb +1 -1
  66. data/lib/decidim/api/accountability_type.rb +26 -0
  67. data/lib/decidim/api/result_type.rb +32 -0
  68. data/lib/decidim/api/status_type.rb +19 -0
  69. data/lib/decidim/api/timeline_entry_type.rb +17 -0
  70. metadata +41 -30
  71. data/app/types/decidim/accountability/accountability_type.rb +0 -32
  72. data/app/types/decidim/accountability/result_type.rb +0 -35
  73. data/app/types/decidim/accountability/status_type.rb +0 -20
  74. data/app/types/decidim/accountability/timeline_entry_type.rb +0 -18
  75. data/app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_results.html.erb +0 -12
  76. data/app/views/decidim/participatory_processes/participatory_process_groups/_result.html.erb +0 -32
@@ -0,0 +1,17 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Accountability
5
+ class TimelineEntryType < Decidim::Api::Types::BaseObject
6
+ description "A Timeline Entry"
7
+
8
+ field :id, GraphQL::Types::ID, "The internal ID for this timeline entry", null: false
9
+ field :entry_date, Decidim::Core::DateType, "The entry date for this timeline entry", null: true
10
+ field :description, Decidim::Core::TranslatedFieldType, "The description for this timeline entry", null: true
11
+ field :created_at, Decidim::Core::DateTimeType, "When this timeline entry was created", null: true
12
+ field :updated_at, Decidim::Core::DateTimeType, "When this timeline entry was updated", null: true
13
+
14
+ field :result, Decidim::Accountability::ResultType, "The result for this timeline entry", null: true
15
+ end
16
+ end
17
+ 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.23.3
4
+ version: 0.24.0.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: 2021-02-23 00:00:00.000000000 Z
13
+ date: 2021-03-01 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: decidim-comments
@@ -18,28 +18,28 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 0.23.3
21
+ version: 0.24.0.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.23.3
28
+ version: 0.24.0.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.23.3
35
+ version: 0.24.0.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.23.3
42
+ version: 0.24.0.rc1
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: kaminari
45
45
  requirement: !ruby/object:Gem::Requirement
@@ -80,98 +80,98 @@ dependencies:
80
80
  requirements:
81
81
  - - '='
82
82
  - !ruby/object:Gem::Version
83
- version: 0.23.3
83
+ version: 0.24.0.rc1
84
84
  type: :development
85
85
  prerelease: false
86
86
  version_requirements: !ruby/object:Gem::Requirement
87
87
  requirements:
88
88
  - - '='
89
89
  - !ruby/object:Gem::Version
90
- version: 0.23.3
90
+ version: 0.24.0.rc1
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: decidim-assemblies
93
93
  requirement: !ruby/object:Gem::Requirement
94
94
  requirements:
95
95
  - - '='
96
96
  - !ruby/object:Gem::Version
97
- version: 0.23.3
97
+ version: 0.24.0.rc1
98
98
  type: :development
99
99
  prerelease: false
100
100
  version_requirements: !ruby/object:Gem::Requirement
101
101
  requirements:
102
102
  - - '='
103
103
  - !ruby/object:Gem::Version
104
- version: 0.23.3
104
+ version: 0.24.0.rc1
105
105
  - !ruby/object:Gem::Dependency
106
106
  name: decidim-comments
107
107
  requirement: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - - '='
110
110
  - !ruby/object:Gem::Version
111
- version: 0.23.3
111
+ version: 0.24.0.rc1
112
112
  type: :development
113
113
  prerelease: false
114
114
  version_requirements: !ruby/object:Gem::Requirement
115
115
  requirements:
116
116
  - - '='
117
117
  - !ruby/object:Gem::Version
118
- version: 0.23.3
118
+ version: 0.24.0.rc1
119
119
  - !ruby/object:Gem::Dependency
120
120
  name: decidim-dev
121
121
  requirement: !ruby/object:Gem::Requirement
122
122
  requirements:
123
123
  - - '='
124
124
  - !ruby/object:Gem::Version
125
- version: 0.23.3
125
+ version: 0.24.0.rc1
126
126
  type: :development
127
127
  prerelease: false
128
128
  version_requirements: !ruby/object:Gem::Requirement
129
129
  requirements:
130
130
  - - '='
131
131
  - !ruby/object:Gem::Version
132
- version: 0.23.3
132
+ version: 0.24.0.rc1
133
133
  - !ruby/object:Gem::Dependency
134
134
  name: decidim-meetings
135
135
  requirement: !ruby/object:Gem::Requirement
136
136
  requirements:
137
137
  - - '='
138
138
  - !ruby/object:Gem::Version
139
- version: 0.23.3
139
+ version: 0.24.0.rc1
140
140
  type: :development
141
141
  prerelease: false
142
142
  version_requirements: !ruby/object:Gem::Requirement
143
143
  requirements:
144
144
  - - '='
145
145
  - !ruby/object:Gem::Version
146
- version: 0.23.3
146
+ version: 0.24.0.rc1
147
147
  - !ruby/object:Gem::Dependency
148
148
  name: decidim-participatory_processes
149
149
  requirement: !ruby/object:Gem::Requirement
150
150
  requirements:
151
151
  - - '='
152
152
  - !ruby/object:Gem::Version
153
- version: 0.23.3
153
+ version: 0.24.0.rc1
154
154
  type: :development
155
155
  prerelease: false
156
156
  version_requirements: !ruby/object:Gem::Requirement
157
157
  requirements:
158
158
  - - '='
159
159
  - !ruby/object:Gem::Version
160
- version: 0.23.3
160
+ version: 0.24.0.rc1
161
161
  - !ruby/object:Gem::Dependency
162
162
  name: decidim-proposals
163
163
  requirement: !ruby/object:Gem::Requirement
164
164
  requirements:
165
165
  - - '='
166
166
  - !ruby/object:Gem::Version
167
- version: 0.23.3
167
+ version: 0.24.0.rc1
168
168
  type: :development
169
169
  prerelease: false
170
170
  version_requirements: !ruby/object:Gem::Requirement
171
171
  requirements:
172
172
  - - '='
173
173
  - !ruby/object:Gem::Version
174
- version: 0.23.3
174
+ version: 0.24.0.rc1
175
175
  description: An accountability component for decidim's participatory spaces.
176
176
  email:
177
177
  - josepjaume@gmail.com
@@ -194,11 +194,19 @@ files:
194
194
  - app/assets/stylesheets/decidim/accountability/accountability/_categories.scss
195
195
  - app/assets/stylesheets/decidim/accountability/accountability/_lines_breadcrumb.scss
196
196
  - app/assets/stylesheets/decidim/accountability/accountability/_results.scss
197
+ - app/cells/decidim/accountability/content_blocks/highlighted_results/elements.erb
198
+ - app/cells/decidim/accountability/content_blocks/highlighted_results/heading.erb
199
+ - app/cells/decidim/accountability/content_blocks/highlighted_results_cell.rb
197
200
  - app/cells/decidim/accountability/highlighted_results/show.erb
198
201
  - app/cells/decidim/accountability/highlighted_results_cell.rb
199
202
  - app/cells/decidim/accountability/highlighted_results_for_component/show.erb
200
203
  - app/cells/decidim/accountability/highlighted_results_for_component_cell.rb
201
204
  - app/cells/decidim/accountability/result_activity_cell.rb
205
+ - app/cells/decidim/accountability/result_cell.rb
206
+ - app/cells/decidim/accountability/result_m/data.erb
207
+ - app/cells/decidim/accountability/result_m/footer.erb
208
+ - app/cells/decidim/accountability/result_m/tags.erb
209
+ - app/cells/decidim/accountability/result_m_cell.rb
202
210
  - app/commands/decidim/accountability/admin/create_imported_result.rb
203
211
  - app/commands/decidim/accountability/admin/create_result.rb
204
212
  - app/commands/decidim/accountability/admin/create_status.rb
@@ -208,7 +216,10 @@ files:
208
216
  - app/commands/decidim/accountability/admin/update_result.rb
209
217
  - app/commands/decidim/accountability/admin/update_status.rb
210
218
  - app/commands/decidim/accountability/admin/update_timeline_entry.rb
219
+ - app/controllers/concerns/decidim/accountability/admin/filterable.rb
211
220
  - app/controllers/decidim/accountability/admin/application_controller.rb
221
+ - app/controllers/decidim/accountability/admin/attachment_collections_controller.rb
222
+ - app/controllers/decidim/accountability/admin/attachments_controller.rb
212
223
  - app/controllers/decidim/accountability/admin/import_results_controller.rb
213
224
  - app/controllers/decidim/accountability/admin/results_controller.rb
214
225
  - app/controllers/decidim/accountability/admin/statuses_controller.rb
@@ -222,6 +233,7 @@ files:
222
233
  - app/forms/decidim/accountability/admin/status_form.rb
223
234
  - app/forms/decidim/accountability/admin/timeline_entry_form.rb
224
235
  - app/helpers/decidim/accountability/admin/application_helper.rb
236
+ - app/helpers/decidim/accountability/admin/filterable_helper.rb
225
237
  - app/helpers/decidim/accountability/application_helper.rb
226
238
  - app/helpers/decidim/accountability/breadcrumb_helper.rb
227
239
  - app/jobs/application_job.rb
@@ -241,10 +253,6 @@ files:
241
253
  - app/services/decidim/accountability/result_stats_calculator.rb
242
254
  - app/services/decidim/accountability/results_calculator.rb
243
255
  - 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
256
  - app/views/decidim/accountability/admin/import_results/new.html.erb
249
257
  - app/views/decidim/accountability/admin/results/_form.html.erb
250
258
  - app/views/decidim/accountability/admin/results/edit.html.erb
@@ -281,8 +289,6 @@ files:
281
289
  - app/views/decidim/accountability/results/show.html.erb
282
290
  - app/views/decidim/accountability/versions/index.html.erb
283
291
  - app/views/decidim/accountability/versions/show.html.erb
284
- - app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_results.html.erb
285
- - app/views/decidim/participatory_processes/participatory_process_groups/_result.html.erb
286
292
  - app/views/decidim/participatory_spaces/_result.html.erb
287
293
  - config/locales/am-ET.yml
288
294
  - config/locales/ar-SA.yml
@@ -367,11 +373,16 @@ files:
367
373
  - lib/decidim/accountability.rb
368
374
  - lib/decidim/accountability/admin.rb
369
375
  - lib/decidim/accountability/admin_engine.rb
376
+ - lib/decidim/accountability/api.rb
370
377
  - lib/decidim/accountability/component.rb
371
378
  - lib/decidim/accountability/engine.rb
372
379
  - lib/decidim/accountability/result_serializer.rb
373
380
  - lib/decidim/accountability/test/factories.rb
374
381
  - lib/decidim/accountability/version.rb
382
+ - lib/decidim/api/accountability_type.rb
383
+ - lib/decidim/api/result_type.rb
384
+ - lib/decidim/api/status_type.rb
385
+ - lib/decidim/api/timeline_entry_type.rb
375
386
  - vendor/assets/javascripts/diff.js
376
387
  homepage: https://github.com/decidim/decidim
377
388
  licenses:
@@ -385,14 +396,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
385
396
  requirements:
386
397
  - - ">="
387
398
  - !ruby/object:Gem::Version
388
- version: '2.6'
399
+ version: '2.7'
389
400
  required_rubygems_version: !ruby/object:Gem::Requirement
390
401
  requirements:
391
- - - ">="
402
+ - - ">"
392
403
  - !ruby/object:Gem::Version
393
- version: '0'
404
+ version: 1.3.1
394
405
  requirements: []
395
- rubygems_version: 3.0.3
406
+ rubygems_version: 3.1.2
396
407
  signing_key:
397
408
  specification_version: 4
398
409
  summary: Decidim accountability module
@@ -1,32 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Decidim
4
- module Accountability
5
- AccountabilityType = GraphQL::ObjectType.define do
6
- interfaces [-> { Decidim::Core::ComponentInterface }]
7
-
8
- name "Accountability"
9
- description "An accountability component of a participatory space."
10
-
11
- connection :results, ResultType.connection_type do
12
- resolve ->(component, _args, _ctx) {
13
- ResultTypeHelper.base_scope(component).includes(:component)
14
- }
15
- end
16
-
17
- field(:result, ResultType) do
18
- argument :id, !types.ID
19
-
20
- resolve ->(component, args, _ctx) {
21
- ResultTypeHelper.base_scope(component).find_by(id: args[:id])
22
- }
23
- end
24
- end
25
-
26
- module ResultTypeHelper
27
- def self.base_scope(component)
28
- Result.where(component: component)
29
- end
30
- end
31
- end
32
- end
@@ -1,35 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Decidim
4
- module Accountability
5
- ResultType = GraphQL::ObjectType.define do
6
- interfaces [
7
- -> { Decidim::Core::ComponentInterface },
8
- -> { Decidim::Core::CategorizableInterface },
9
- -> { Decidim::Comments::CommentableInterface },
10
- -> { Decidim::Core::ScopableInterface }
11
- ]
12
-
13
- name "Result"
14
- description "A result"
15
-
16
- field :id, !types.ID, "The internal ID for this result"
17
- field :title, Decidim::Core::TranslatedFieldType, "The title for this result"
18
- field :description, Decidim::Core::TranslatedFieldType, "The description for this result"
19
- field :reference, types.String, "The reference for this result"
20
- field :startDate, Decidim::Core::DateType, "The start date for this result", property: :start_date
21
- field :endDate, Decidim::Core::DateType, "The end date for this result", property: :end_date
22
- field :progress, types.Float, "The progress for this result"
23
- field :createdAt, Decidim::Core::DateTimeType, "When this result was created", property: :created_at
24
- field :updatedAt, Decidim::Core::DateTimeType, "When this result was updated", property: :updated_at
25
- field :childrenCount, types.Int, "The number of children results", property: :children_count
26
- field :weight, !types.Int, "The order of this result"
27
- field :externalId, types.String, "The external ID for this result", property: :external_id
28
-
29
- field :children, types[Decidim::Accountability::ResultType], "The childrens results"
30
- field :parent, Decidim::Accountability::ResultType, "The parent result"
31
- field :status, Decidim::Accountability::StatusType, "The status for this result"
32
- field :timelineEntries, types[Decidim::Accountability::TimelineEntryType], "The timeline entries for this result", property: :timeline_entries
33
- end
34
- end
35
- end
@@ -1,20 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Decidim
4
- module Accountability
5
- StatusType = GraphQL::ObjectType.define do
6
- name "Status"
7
- description "A status"
8
-
9
- field :id, !types.ID, "The internal ID for this status"
10
- field :key, types.String, "The key for this status"
11
- field :name, Decidim::Core::TranslatedFieldType, "The name for this status"
12
- field :createdAt, Decidim::Core::DateType, "When this status was created", property: :created_at
13
- field :updatedAt, Decidim::Core::DateType, "When this status was updated", property: :updated_at
14
- field :description, Decidim::Core::TranslatedFieldType, "The description for this status"
15
- field :progress, types.Int, "The progress for this status"
16
-
17
- field :results, types[Decidim::Accountability::ResultType], "The results for this status"
18
- end
19
- end
20
- end
@@ -1,18 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Decidim
4
- module Accountability
5
- TimelineEntryType = GraphQL::ObjectType.define do
6
- name "TimelineEntry"
7
- description "A Timeline Entry"
8
-
9
- field :id, !types.ID, "The internal ID for this timeline entry"
10
- field :entryDate, Decidim::Core::DateType, "The entry date for this timeline entry", property: :entry_date
11
- field :description, Decidim::Core::TranslatedFieldType, "The description for this timeline entry"
12
- field :createdAt, Decidim::Core::DateTimeType, "When this timeline entry was created", property: :created_at
13
- field :updatedAt, Decidim::Core::DateTimeType, "When this timeline entry was updated", property: :updated_at
14
-
15
- field :result, Decidim::Accountability::ResultType, "The result for this timeline entry"
16
- end
17
- end
18
- end
@@ -1,12 +0,0 @@
1
- <% if results.any? %>
2
- <section class="section row collapse highlighted_results">
3
- <h2 class="section-heading"><%= t(".results") %></h2>
4
- <div class="row">
5
- <div class="columns accountability">
6
- <div class="card card--action card--list">
7
- <%= render partial: "decidim/participatory_processes/participatory_process_groups/result", collection: results %>
8
- </div>
9
- </div>
10
- </div>
11
- </section>
12
- <% end %>
@@ -1,32 +0,0 @@
1
- <div class="card--list__item">
2
- <%= icon "actions", class: "card--list__icon", remove_icon_class: true %>
3
-
4
- <%= link_to resource_locator(result).path, class: "card--list__text card__link card__link--block" do %>
5
- <h5 class="card--list__heading">
6
- <%= translated_attribute(result.title) %>
7
- </h5>
8
-
9
- <div class="text-small card--meta">
10
- <% if result.start_date %>
11
- <strong><%= t("models.result.fields.start_date", scope: "decidim.accountability") %></strong>
12
- <span><%= result.start_date %></span>
13
- <% end %>
14
-
15
- <% if result.end_date %>
16
- <strong><%= t("models.result.fields.end_date", scope: "decidim.accountability") %></strong>
17
- <span><%= result.end_date %></span>
18
- <% end %>
19
-
20
- <% if result.status %>
21
- <strong><%= t("models.result.fields.status", scope: "decidim.accountability") %></strong>
22
- <span><%= translated_attribute(result.status.name) %></span>
23
- <% end %>
24
- </div>
25
- <% end %>
26
-
27
- <% if result.progress.present? %>
28
- <div class="card--list__data">
29
- <span class="card--list__data__number"><%= display_percentage result.progress %></span>
30
- </div>
31
- <% end %>
32
- </div>