decidim-meetings 0.23.5 → 0.24.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (126) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/config/decidim_meetings_manifest.js +1 -0
  3. data/app/assets/javascripts/decidim/meetings/admin/meetings_form.js.es6 +47 -0
  4. data/app/assets/javascripts/decidim/meetings/meetings_form.js.es6 +45 -0
  5. data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/elements.erb +16 -0
  6. data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/heading.erb +1 -0
  7. data/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb +27 -0
  8. data/app/cells/decidim/meetings/join_meeting_button/show.erb +7 -0
  9. data/app/cells/decidim/meetings/meeting_cell.rb +2 -4
  10. data/app/cells/decidim/meetings/meeting_highlighted_list_item/show.erb +21 -0
  11. data/app/cells/decidim/meetings/meeting_highlighted_list_item_cell.rb +10 -0
  12. data/app/cells/decidim/meetings/meeting_m/address.erb +5 -1
  13. data/app/cells/decidim/meetings/meeting_m_cell.rb +2 -0
  14. data/app/cells/decidim/meetings/meeting_url/show.erb +15 -0
  15. data/app/cells/decidim/meetings/meeting_url_cell.rb +17 -0
  16. data/app/cells/decidim/meetings/reported_content/show.erb +3 -0
  17. data/app/cells/decidim/meetings/reported_content_cell.rb +13 -0
  18. data/app/commands/decidim/meetings/admin/create_meeting.rb +5 -0
  19. data/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb +1 -1
  20. data/app/commands/decidim/meetings/admin/update_meeting.rb +5 -0
  21. data/app/commands/decidim/meetings/admin/validate_registration_code.rb +2 -0
  22. data/app/commands/decidim/meetings/close_meeting.rb +66 -0
  23. data/app/commands/decidim/meetings/create_meeting.rb +7 -1
  24. data/app/commands/decidim/meetings/leave_meeting.rb +2 -2
  25. data/app/commands/decidim/meetings/update_meeting.rb +8 -1
  26. data/app/controllers/decidim/meetings/admin/application_controller.rb +1 -1
  27. data/app/controllers/decidim/meetings/admin/meeting_closes_controller.rb +2 -2
  28. data/app/controllers/decidim/meetings/directory/meetings_controller.rb +2 -2
  29. data/app/controllers/decidim/meetings/meeting_closes_controller.rb +43 -0
  30. data/app/controllers/decidim/meetings/meetings_controller.rb +9 -5
  31. data/app/forms/decidim/meetings/admin/close_meeting_form.rb +4 -4
  32. data/app/forms/decidim/meetings/admin/meeting_form.rb +62 -4
  33. data/app/forms/decidim/meetings/admin/meeting_registrations_form.rb +14 -4
  34. data/app/forms/decidim/meetings/close_meeting_form.rb +31 -0
  35. data/app/forms/decidim/meetings/meeting_form.rb +71 -3
  36. data/app/helpers/decidim/meetings/application_helper.rb +20 -0
  37. data/app/helpers/decidim/meetings/map_helper.rb +1 -1
  38. data/app/models/decidim/meetings/agenda_item.rb +1 -1
  39. data/app/models/decidim/meetings/meeting.rb +52 -1
  40. data/app/permissions/decidim/meetings/permissions.rb +12 -2
  41. data/app/presenters/decidim/meetings/meeting_presenter.rb +33 -0
  42. data/app/services/decidim/meetings/meeting_search.rb +20 -0
  43. data/app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb +1 -1
  44. data/app/views/decidim/meetings/admin/invites/index.html.erb +1 -1
  45. data/app/views/decidim/meetings/admin/meetings/_form.html.erb +31 -1
  46. data/app/views/decidim/meetings/admin/meetings/edit.html.erb +2 -2
  47. data/app/views/decidim/meetings/admin/meetings/index.html.erb +23 -1
  48. data/app/views/decidim/meetings/admin/meetings/new.html.erb +2 -2
  49. data/app/views/decidim/meetings/admin/minutes/edit.html.erb +1 -1
  50. data/app/views/decidim/meetings/admin/registrations/edit.html.erb +20 -18
  51. data/app/views/decidim/meetings/directory/meetings/index.html.erb +1 -0
  52. data/app/views/decidim/meetings/directory/meetings/index.js.erb +0 -3
  53. data/app/views/decidim/meetings/meeting_closes/_form.html.erb +7 -0
  54. data/app/views/decidim/meetings/meeting_closes/edit.html.erb +25 -0
  55. data/app/views/decidim/meetings/meeting_closes/proposals_picker.html.erb +1 -0
  56. data/app/views/decidim/meetings/meetings/_filters.html.erb +6 -0
  57. data/app/views/decidim/meetings/meetings/_filters_small_view.html.erb +1 -1
  58. data/app/views/decidim/meetings/meetings/_form.html.erb +36 -2
  59. data/app/views/decidim/meetings/meetings/_online_meeting_link.html.erb +11 -0
  60. data/app/views/decidim/meetings/meetings/edit.html.erb +1 -1
  61. data/app/views/decidim/meetings/meetings/index.js.erb +0 -3
  62. data/app/views/decidim/meetings/meetings/new.html.erb +1 -1
  63. data/app/views/decidim/meetings/meetings/show.html.erb +28 -21
  64. data/app/views/decidim/meetings/registration_mailer/confirmation.html.erb +3 -1
  65. data/app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb +1 -1
  66. data/config/locales/ar.yml +0 -7
  67. data/config/locales/ca.yml +47 -9
  68. data/config/locales/cs.yml +49 -11
  69. data/config/locales/de.yml +45 -7
  70. data/config/locales/el.yml +0 -10
  71. data/config/locales/en.yml +47 -9
  72. data/config/locales/es-MX.yml +47 -9
  73. data/config/locales/es-PY.yml +47 -9
  74. data/config/locales/es.yml +47 -9
  75. data/config/locales/eu.yml +0 -7
  76. data/config/locales/fi-plain.yml +45 -7
  77. data/config/locales/fi.yml +47 -9
  78. data/config/locales/fr-CA.yml +47 -9
  79. data/config/locales/fr.yml +47 -9
  80. data/config/locales/gl.yml +0 -11
  81. data/config/locales/hu.yml +0 -10
  82. data/config/locales/id-ID.yml +0 -7
  83. data/config/locales/is-IS.yml +0 -6
  84. data/config/locales/it.yml +0 -9
  85. data/config/locales/ja.yml +0 -9
  86. data/config/locales/lv.yml +0 -10
  87. data/config/locales/nl.yml +43 -8
  88. data/config/locales/no.yml +11 -10
  89. data/config/locales/pl.yml +47 -9
  90. data/config/locales/pt-BR.yml +0 -7
  91. data/config/locales/pt.yml +0 -9
  92. data/config/locales/ro-RO.yml +47 -9
  93. data/config/locales/ru.yml +0 -7
  94. data/config/locales/sk.yml +0 -10
  95. data/config/locales/sl.yml +0 -4
  96. data/config/locales/sv.yml +32 -7
  97. data/config/locales/tr-TR.yml +44 -9
  98. data/config/locales/uk.yml +0 -6
  99. data/config/locales/zh-CN.yml +0 -9
  100. data/db/migrate/20180809134748_add_upcoming_events_as_content_block.rb +1 -1
  101. data/db/migrate/20201006140511_add_online_meeting_url.rb +7 -0
  102. data/db/migrate/20201009124057_add_type_of_meeting.rb +7 -0
  103. data/db/migrate/20201016112641_add_registration_type_and_url_to_meetings.rb +19 -0
  104. data/db/migrate/20210310120731_add_followable_counter_cache_to_meetings.rb +16 -0
  105. data/lib/decidim/api/agenda_item_type.rb +22 -0
  106. data/lib/decidim/api/agenda_type.rb +19 -0
  107. data/lib/decidim/api/linked_resources_interface.rb +7 -6
  108. data/lib/decidim/api/meeting_type.rb +63 -0
  109. data/lib/decidim/api/meetings_type.rb +26 -0
  110. data/lib/decidim/api/minutes_type.rb +20 -0
  111. data/{app/types/decidim/meetings → lib/decidim/api}/service_type.rb +4 -4
  112. data/lib/decidim/api/services_interface.rb +3 -3
  113. data/lib/decidim/meetings.rb +1 -1
  114. data/lib/decidim/meetings/api.rb +6 -0
  115. data/lib/decidim/meetings/component.rb +53 -23
  116. data/lib/decidim/meetings/engine.rb +3 -17
  117. data/lib/decidim/meetings/test/factories.rb +16 -3
  118. data/lib/decidim/meetings/version.rb +1 -1
  119. metadata +42 -38
  120. data/app/types/decidim/meetings/agenda_item_type.rb +0 -28
  121. data/app/types/decidim/meetings/agenda_type.rb +0 -25
  122. data/app/types/decidim/meetings/meeting_type.rb +0 -65
  123. data/app/types/decidim/meetings/meetings_type.rb +0 -32
  124. data/app/types/decidim/meetings/minutes_type.rb +0 -26
  125. data/app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_meetings.html.erb +0 -15
  126. data/app/views/decidim/participatory_processes/participatory_process_groups/_meeting.html.erb +0 -10
@@ -18,6 +18,9 @@ module Decidim
18
18
 
19
19
  routes do
20
20
  resources :meetings, only: [:index, :show, :new, :create, :edit, :update] do
21
+ resources :meeting_closes, only: [:edit, :update] do
22
+ get :proposals_picker, on: :collection
23
+ end
21
24
  resource :registration, only: [:create, :destroy] do
22
25
  collection do
23
26
  get :create
@@ -38,23 +41,6 @@ module Decidim
38
41
  view_context.cell("decidim/meetings/highlighted_meetings", view_context.current_participatory_space)
39
42
  end
40
43
 
41
- if defined? Decidim::ParticipatoryProcesses
42
- Decidim::ParticipatoryProcesses.view_hooks.register(:process_group_highlighted_elements, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
43
- published_components = Decidim::Component.where(participatory_space: view_context.participatory_processes).published
44
- meetings = Decidim::Meetings::Meeting.where(component: published_components)
45
-
46
- next unless meetings.any?
47
-
48
- view_context.render(
49
- partial: "decidim/participatory_processes/participatory_process_groups/highlighted_meetings",
50
- locals: {
51
- past_meetings: meetings.past.order(end_time: :desc, start_time: :desc).limit(3),
52
- upcoming_meetings: meetings.upcoming.order(:start_time, :end_time).limit(3)
53
- }
54
- )
55
- end
56
- end
57
-
58
44
  # This view hook is used in card cells. It renders the next upcoming
59
45
  # meeting for the given participatory space.
60
46
  Decidim.view_hooks.register(:upcoming_meeting_for_card, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|
@@ -25,7 +25,7 @@ FactoryBot.define do
25
25
  description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
26
26
  location { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
27
27
  location_hints { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
28
- address { Faker::Lorem.sentence(3) }
28
+ address { Faker::Lorem.sentence(word_count: 3) }
29
29
  latitude { Faker::Address.latitude }
30
30
  longitude { Faker::Address.longitude }
31
31
  start_time { 1.day.from_now }
@@ -34,12 +34,25 @@ FactoryBot.define do
34
34
  transparent { true }
35
35
  questionnaire { build(:questionnaire) }
36
36
  registration_form_enabled { true }
37
+ registration_terms { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
38
+ registration_type { :on_this_platform }
39
+ type_of_meeting { :in_person }
37
40
  component { build(:component, manifest_name: "meetings") }
38
41
 
39
42
  author do
40
43
  component.try(:organization)
41
44
  end
42
45
 
46
+ trait :online do
47
+ type_of_meeting { :online }
48
+ online_meeting_url { "https://decidim.org" }
49
+ end
50
+
51
+ trait :hybrid do
52
+ type_of_meeting { :hybrid }
53
+ online_meeting_url { "https://decidim.org" }
54
+ end
55
+
43
56
  trait :official do
44
57
  author { component.organization if component }
45
58
  end
@@ -86,11 +99,11 @@ FactoryBot.define do
86
99
 
87
100
  trait :past do
88
101
  start_time { end_time.ago(2.hours) }
89
- end_time { Faker::Time.between(10.days.ago, 1.day.ago) }
102
+ end_time { Faker::Time.between(from: 10.days.ago, to: 1.day.ago) }
90
103
  end
91
104
 
92
105
  trait :upcoming do
93
- start_time { Faker::Time.between(1.day.from_now, 10.days.from_now) }
106
+ start_time { Faker::Time.between(from: 1.day.from_now, to: 10.days.from_now) }
94
107
  end
95
108
  end
96
109
 
@@ -4,7 +4,7 @@ module Decidim
4
4
  # This holds the decidim-meetings version.
5
5
  module Meetings
6
6
  def self.version
7
- "0.23.5"
7
+ "0.24.2"
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-meetings
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.23.5
4
+ version: 0.24.2
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-04-08 00:00:00.000000000 Z
13
+ date: 2021-05-07 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: cells-erb
@@ -46,42 +46,28 @@ dependencies:
46
46
  requirements:
47
47
  - - '='
48
48
  - !ruby/object:Gem::Version
49
- version: 0.23.5
49
+ version: 0.24.2
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - '='
55
55
  - !ruby/object:Gem::Version
56
- version: 0.23.5
56
+ version: 0.24.2
57
57
  - !ruby/object:Gem::Dependency
58
58
  name: decidim-forms
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
61
  - - '='
62
62
  - !ruby/object:Gem::Version
63
- version: 0.23.5
63
+ version: 0.24.2
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
68
  - - '='
69
69
  - !ruby/object:Gem::Version
70
- version: 0.23.5
71
- - !ruby/object:Gem::Dependency
72
- name: httparty
73
- requirement: !ruby/object:Gem::Requirement
74
- requirements:
75
- - - "~>"
76
- - !ruby/object:Gem::Version
77
- version: '0.17'
78
- type: :runtime
79
- prerelease: false
80
- version_requirements: !ruby/object:Gem::Requirement
81
- requirements:
82
- - - "~>"
83
- - !ruby/object:Gem::Version
84
- version: '0.17'
70
+ version: 0.24.2
85
71
  - !ruby/object:Gem::Dependency
86
72
  name: icalendar
87
73
  requirement: !ruby/object:Gem::Requirement
@@ -150,56 +136,56 @@ dependencies:
150
136
  requirements:
151
137
  - - '='
152
138
  - !ruby/object:Gem::Version
153
- version: 0.23.5
139
+ version: 0.24.2
154
140
  type: :development
155
141
  prerelease: false
156
142
  version_requirements: !ruby/object:Gem::Requirement
157
143
  requirements:
158
144
  - - '='
159
145
  - !ruby/object:Gem::Version
160
- version: 0.23.5
146
+ version: 0.24.2
161
147
  - !ruby/object:Gem::Dependency
162
148
  name: decidim-assemblies
163
149
  requirement: !ruby/object:Gem::Requirement
164
150
  requirements:
165
151
  - - '='
166
152
  - !ruby/object:Gem::Version
167
- version: 0.23.5
153
+ version: 0.24.2
168
154
  type: :development
169
155
  prerelease: false
170
156
  version_requirements: !ruby/object:Gem::Requirement
171
157
  requirements:
172
158
  - - '='
173
159
  - !ruby/object:Gem::Version
174
- version: 0.23.5
160
+ version: 0.24.2
175
161
  - !ruby/object:Gem::Dependency
176
162
  name: decidim-dev
177
163
  requirement: !ruby/object:Gem::Requirement
178
164
  requirements:
179
165
  - - '='
180
166
  - !ruby/object:Gem::Version
181
- version: 0.23.5
167
+ version: 0.24.2
182
168
  type: :development
183
169
  prerelease: false
184
170
  version_requirements: !ruby/object:Gem::Requirement
185
171
  requirements:
186
172
  - - '='
187
173
  - !ruby/object:Gem::Version
188
- version: 0.23.5
174
+ version: 0.24.2
189
175
  - !ruby/object:Gem::Dependency
190
176
  name: decidim-participatory_processes
191
177
  requirement: !ruby/object:Gem::Requirement
192
178
  requirements:
193
179
  - - '='
194
180
  - !ruby/object:Gem::Version
195
- version: 0.23.5
181
+ version: 0.24.2
196
182
  type: :development
197
183
  prerelease: false
198
184
  version_requirements: !ruby/object:Gem::Requirement
199
185
  requirements:
200
186
  - - '='
201
187
  - !ruby/object:Gem::Version
202
- version: 0.23.5
188
+ version: 0.24.2
203
189
  description: A meetings component for decidim's participatory spaces.
204
190
  email:
205
191
  - josepjaume@gmail.com
@@ -220,6 +206,9 @@ files:
220
206
  - app/assets/javascripts/decidim/meetings/admin/registrations_form.js.es6
221
207
  - app/assets/javascripts/decidim/meetings/admin/registrations_invite_form.es6
222
208
  - app/assets/javascripts/decidim/meetings/meetings_form.js.es6
209
+ - app/cells/decidim/meetings/content_blocks/highlighted_meetings/elements.erb
210
+ - app/cells/decidim/meetings/content_blocks/highlighted_meetings/heading.erb
211
+ - app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb
223
212
  - app/cells/decidim/meetings/content_blocks/upcoming_events/show.erb
224
213
  - app/cells/decidim/meetings/content_blocks/upcoming_events_cell.rb
225
214
  - app/cells/decidim/meetings/highlighted_meetings/show.erb
@@ -231,6 +220,8 @@ files:
231
220
  - app/cells/decidim/meetings/join_meeting_button_cell.rb
232
221
  - app/cells/decidim/meetings/meeting_activity_cell.rb
233
222
  - app/cells/decidim/meetings/meeting_cell.rb
223
+ - app/cells/decidim/meetings/meeting_highlighted_list_item/show.erb
224
+ - app/cells/decidim/meetings/meeting_highlighted_list_item_cell.rb
234
225
  - app/cells/decidim/meetings/meeting_list_item/show.erb
235
226
  - app/cells/decidim/meetings/meeting_list_item_cell.rb
236
227
  - app/cells/decidim/meetings/meeting_m/address.erb
@@ -243,8 +234,12 @@ files:
243
234
  - app/cells/decidim/meetings/meeting_m_cell.rb
244
235
  - app/cells/decidim/meetings/meeting_s/show.erb
245
236
  - app/cells/decidim/meetings/meeting_s_cell.rb
237
+ - app/cells/decidim/meetings/meeting_url/show.erb
238
+ - app/cells/decidim/meetings/meeting_url_cell.rb
246
239
  - app/cells/decidim/meetings/meetings_map/show.erb
247
240
  - app/cells/decidim/meetings/meetings_map_cell.rb
241
+ - app/cells/decidim/meetings/reported_content/show.erb
242
+ - app/cells/decidim/meetings/reported_content_cell.rb
248
243
  - app/commands/decidim/meetings/admin/close_meeting.rb
249
244
  - app/commands/decidim/meetings/admin/copy_meeting.rb
250
245
  - app/commands/decidim/meetings/admin/create_agenda.rb
@@ -258,6 +253,7 @@ files:
258
253
  - app/commands/decidim/meetings/admin/update_minutes.rb
259
254
  - app/commands/decidim/meetings/admin/update_registrations.rb
260
255
  - app/commands/decidim/meetings/admin/validate_registration_code.rb
256
+ - app/commands/decidim/meetings/close_meeting.rb
261
257
  - app/commands/decidim/meetings/create_meeting.rb
262
258
  - app/commands/decidim/meetings/decline_invitation.rb
263
259
  - app/commands/decidim/meetings/join_meeting.rb
@@ -277,6 +273,7 @@ files:
277
273
  - app/controllers/decidim/meetings/application_controller.rb
278
274
  - app/controllers/decidim/meetings/calendars_controller.rb
279
275
  - app/controllers/decidim/meetings/directory/meetings_controller.rb
276
+ - app/controllers/decidim/meetings/meeting_closes_controller.rb
280
277
  - app/controllers/decidim/meetings/meetings_controller.rb
281
278
  - app/controllers/decidim/meetings/registrations_controller.rb
282
279
  - app/controllers/decidim/meetings/versions_controller.rb
@@ -299,6 +296,7 @@ files:
299
296
  - app/forms/decidim/meetings/admin/meeting_service_form.rb
300
297
  - app/forms/decidim/meetings/admin/minutes_form.rb
301
298
  - app/forms/decidim/meetings/admin/validate_registration_code_form.rb
299
+ - app/forms/decidim/meetings/close_meeting_form.rb
302
300
  - app/forms/decidim/meetings/join_meeting_form.rb
303
301
  - app/forms/decidim/meetings/meeting_form.rb
304
302
  - app/helpers/decidim/meetings/admin/application_helper.rb
@@ -341,12 +339,6 @@ files:
341
339
  - app/services/decidim/meetings/calendar_renderer.rb
342
340
  - app/services/decidim/meetings/diff_renderer.rb
343
341
  - app/services/decidim/meetings/meeting_search.rb
344
- - app/types/decidim/meetings/agenda_item_type.rb
345
- - app/types/decidim/meetings/agenda_type.rb
346
- - app/types/decidim/meetings/meeting_type.rb
347
- - app/types/decidim/meetings/meetings_type.rb
348
- - app/types/decidim/meetings/minutes_type.rb
349
- - app/types/decidim/meetings/service_type.rb
350
342
  - app/views/decidim/meetings/_calendar_modal.html.erb
351
343
  - app/views/decidim/meetings/admin/agenda/_agenda_item.html.erb
352
344
  - app/views/decidim/meetings/admin/agenda/_agenda_item_child.html.erb
@@ -378,6 +370,9 @@ files:
378
370
  - app/views/decidim/meetings/directory/meetings/_meetings.html.erb
379
371
  - app/views/decidim/meetings/directory/meetings/index.html.erb
380
372
  - app/views/decidim/meetings/directory/meetings/index.js.erb
373
+ - app/views/decidim/meetings/meeting_closes/_form.html.erb
374
+ - app/views/decidim/meetings/meeting_closes/edit.html.erb
375
+ - app/views/decidim/meetings/meeting_closes/proposals_picker.html.erb
381
376
  - app/views/decidim/meetings/meetings/_count.html.erb
382
377
  - app/views/decidim/meetings/meetings/_datetime.html.erb
383
378
  - app/views/decidim/meetings/meetings/_filters.html.erb
@@ -387,6 +382,7 @@ files:
387
382
  - app/views/decidim/meetings/meetings/_meeting_agenda.html.erb
388
383
  - app/views/decidim/meetings/meetings/_meeting_minutes.html.erb
389
384
  - app/views/decidim/meetings/meetings/_meetings.html.erb
385
+ - app/views/decidim/meetings/meetings/_online_meeting_link.html.erb
390
386
  - app/views/decidim/meetings/meetings/edit.html.erb
391
387
  - app/views/decidim/meetings/meetings/index.html.erb
392
388
  - app/views/decidim/meetings/meetings/index.js.erb
@@ -395,8 +391,6 @@ files:
395
391
  - app/views/decidim/meetings/registration_mailer/confirmation.html.erb
396
392
  - app/views/decidim/meetings/versions/index.html.erb
397
393
  - app/views/decidim/meetings/versions/show.html.erb
398
- - app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_meetings.html.erb
399
- - app/views/decidim/participatory_processes/participatory_process_groups/_meeting.html.erb
400
394
  - app/views/decidim/participatory_spaces/_conference_venues.html.erb
401
395
  - app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb
402
396
  - app/views/devise/mailer/join_meeting.html.erb
@@ -498,9 +492,19 @@ files:
498
492
  - db/migrate/20200702123209_create_meeting_services_table.rb
499
493
  - db/migrate/20200702123210_move_meeting_services_to_own_model.rb
500
494
  - db/migrate/20200827153856_add_commentable_counter_cache_to_meetings.rb
495
+ - db/migrate/20201006140511_add_online_meeting_url.rb
496
+ - db/migrate/20201009124057_add_type_of_meeting.rb
501
497
  - db/migrate/20201016065302_fix_meetings_registration_terms.rb
498
+ - db/migrate/20201016112641_add_registration_type_and_url_to_meetings.rb
502
499
  - db/migrate/20201111133246_add_salt_to_decidim_meetings.rb
500
+ - db/migrate/20210310120731_add_followable_counter_cache_to_meetings.rb
501
+ - lib/decidim/api/agenda_item_type.rb
502
+ - lib/decidim/api/agenda_type.rb
503
503
  - lib/decidim/api/linked_resources_interface.rb
504
+ - lib/decidim/api/meeting_type.rb
505
+ - lib/decidim/api/meetings_type.rb
506
+ - lib/decidim/api/minutes_type.rb
507
+ - lib/decidim/api/service_type.rb
504
508
  - lib/decidim/api/services_interface.rb
505
509
  - lib/decidim/meetings.rb
506
510
  - lib/decidim/meetings/admin.rb
@@ -530,14 +534,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
530
534
  requirements:
531
535
  - - ">="
532
536
  - !ruby/object:Gem::Version
533
- version: '2.6'
537
+ version: '2.7'
534
538
  required_rubygems_version: !ruby/object:Gem::Requirement
535
539
  requirements:
536
540
  - - ">="
537
541
  - !ruby/object:Gem::Version
538
542
  version: '0'
539
543
  requirements: []
540
- rubygems_version: 3.0.3
544
+ rubygems_version: 3.1.2
541
545
  signing_key:
542
546
  specification_version: 4
543
547
  summary: Decidim meetings module
@@ -1,28 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Decidim
4
- module Meetings
5
- AgendaItemType = GraphQL::ObjectType.define do
6
- name "MeetingAgendaItem"
7
- description "A meeting agenda item"
8
-
9
- field :id, !types.ID, "The ID for this agenda item"
10
- field :title, Decidim::Core::TranslatedFieldType, "The title for this agenda item"
11
- field :description, Decidim::Core::TranslatedFieldType, "The description for this agenda item"
12
- field :items, !types[AgendaItemType], "Sub-items (children) of this agenda item", property: :agenda_item_children
13
- field :parent, AgendaItemType, "Parent agenda item, if available"
14
- field :agenda, AgendaType, "Belonging agenda"
15
- field :duration, !types.Int, "Duration in number of minutes for this item in this agenda"
16
- field :position, !types.Int, "Order position for this agenda item"
17
-
18
- field :createdAt, Decidim::Core::DateTimeType do
19
- description "The date and time this agenda item was created"
20
- property :created_at
21
- end
22
- field :updatedAt, Decidim::Core::DateTimeType do
23
- description "The date and time this agenda item was updated"
24
- property :updated_at
25
- end
26
- end
27
- end
28
- end
@@ -1,25 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Decidim
4
- module Meetings
5
- AgendaType = GraphQL::ObjectType.define do
6
- name "MeetingAgenda"
7
- description "A meeting agenda"
8
-
9
- field :id, !types.ID, "The ID for the agenda"
10
- field :title, Decidim::Core::TranslatedFieldType, "The title for the agenda"
11
- field :items, !types[AgendaItemType], "Items and sub-items of the agenda", property: :agenda_items
12
- # probably useful in the future, when handling user permissions
13
- # field :visible, !types.Boolean, "Whether this minutes is public or not", property: :visible
14
-
15
- field :createdAt, Decidim::Core::DateTimeType do
16
- description "The date and time this agenda was created"
17
- property :created_at
18
- end
19
- field :updatedAt, Decidim::Core::DateTimeType do
20
- description "The date and time this agenda was updated"
21
- property :updated_at
22
- end
23
- end
24
- end
25
- end
@@ -1,65 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- module Decidim
4
- module Meetings
5
- MeetingType = GraphQL::ObjectType.define do
6
- name "Meeting"
7
- description "A meeting"
8
-
9
- interfaces [
10
- -> { Decidim::Comments::CommentableInterface },
11
- -> { Decidim::Core::CategorizableInterface },
12
- -> { Decidim::Core::ScopableInterface },
13
- -> { Decidim::Core::AttachableInterface },
14
- -> { Decidim::Core::TimestampsInterface },
15
- -> { Decidim::Meetings::ServicesInterface },
16
- -> { Decidim::Meetings::LinkedResourcesInterface },
17
- -> { Decidim::Forms::QuestionnaireEntityInterface }
18
- ]
19
-
20
- field :id, !types.ID, "ID of this meeting"
21
- field :reference, !types.String, "Reference for this meeting"
22
- field :title, !Decidim::Core::TranslatedFieldType, "The title of this meeting."
23
- field :description, Decidim::Core::TranslatedFieldType, "The description of this meeting."
24
- field :startTime, !Decidim::Core::DateTimeType, "The time this meeting starts", property: :start_time
25
- field :endTime, !Decidim::Core::DateTimeType, "The time this meeting ends", property: :end_time
26
- field :author, Decidim::Core::AuthorInterface, "If specified, the author of this meeting"
27
- field :agenda, AgendaType, "Agenda for this meeting, if available" do
28
- resolve ->(meeting, _args, _ctx) {
29
- meeting.agenda if meeting.agenda&.visible?
30
- }
31
- end
32
-
33
- field :closed, !types.Boolean, "Whether this meeting is closed or not.", property: :closed?
34
- field :closingReport, Decidim::Core::TranslatedFieldType, "The closing report of this meeting.", property: :closing_report
35
- field :attendingOrganizations, types.String, "list of attending organizations", property: :attending_organizations
36
- field :attendeeCount, types.Int, "Amount of attendees to this meeting", property: :attendees_count
37
- field :contributionCount, types.Int, "Amount of contributions to this meeting", property: :contributions_count
38
- field :minutes, MinutesType, "Minutes for this meeting, if available" do
39
- resolve ->(meeting, _args, _ctx) {
40
- meeting.minutes if meeting.minutes&.visible?
41
- }
42
- end
43
- field :privateMeeting, !types.Boolean, "Whether the meeting is private or not (it can only be true if transparent)", property: :private_meeting
44
- field :transparent, !types.Boolean, "For private meetings, information is public if transparent", property: :transparent
45
- field :registrationsEnabled, !types.Boolean, "Whether the registrations are enabled or not", property: :registrations_enabled
46
- field :registrationTerms, Decidim::Core::TranslatedFieldType, "The registration terms", property: :registration_terms
47
- field :remainingSlots, types.Int, "Amount of slots available for this meeting", property: :remaining_slots
48
- field :registrationFormEnabled, !types.Boolean, "Whether the registrations have a form or not", property: :registration_form_enabled
49
- field :registrationForm, Decidim::Forms::QuestionnaireType do
50
- description "If registration requires to fill a form, this is the questionnaire"
51
- resolve ->(meeting, _args, _ctx) {
52
- meeting.questionnaire if meeting.registration_form_enabled?
53
- }
54
- end
55
- field :location, Decidim::Core::TranslatedFieldType, "The location of this meeting (free format)"
56
- field :locationHints, Decidim::Core::TranslatedFieldType, "The location of this meeting (free format)", property: :location_hints
57
- field :address, types.String, "The physical address of this meeting (used for geolocation)"
58
- field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this meeting" do
59
- resolve ->(meeting, _args, _ctx) {
60
- [meeting.latitude, meeting.longitude]
61
- }
62
- end
63
- end
64
- end
65
- end