decidim-meetings 0.24.2 → 0.25.0.rc3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (216) hide show
  1. checksums.yaml +4 -4
  2. data/app/cells/decidim/meetings/join_meeting_button/registration_confirm.erb +6 -0
  3. data/app/cells/decidim/meetings/join_meeting_button/show.erb +8 -6
  4. data/app/cells/decidim/meetings/meeting_m_cell.rb +4 -0
  5. data/app/cells/decidim/meetings/meeting_url/show.erb +7 -2
  6. data/app/cells/decidim/meetings/meeting_url_cell.rb +14 -2
  7. data/app/cells/decidim/meetings/meetings_map/show.erb +1 -1
  8. data/app/cells/decidim/meetings/meetings_map_cell.rb +1 -1
  9. data/app/cells/decidim/meetings/online_meeting_cell.rb +36 -0
  10. data/app/cells/decidim/meetings/online_meeting_link/show.erb +44 -0
  11. data/app/cells/decidim/meetings/online_meeting_link_cell.rb +27 -0
  12. data/app/cells/decidim/meetings/public_participants_list/show.erb +16 -0
  13. data/app/cells/decidim/meetings/public_participants_list_cell.rb +31 -0
  14. data/app/cells/decidim/meetings/question_responses/show.erb +7 -0
  15. data/app/cells/decidim/meetings/question_responses_cell.rb +72 -0
  16. data/app/commands/decidim/meetings/admin/close_meeting.rb +3 -0
  17. data/app/commands/decidim/meetings/admin/copy_meeting.rb +0 -9
  18. data/app/commands/decidim/meetings/admin/create_meeting.rb +4 -20
  19. data/app/commands/decidim/meetings/admin/destroy_meeting.rb +2 -0
  20. data/app/commands/decidim/meetings/admin/publish_meeting.rb +72 -0
  21. data/app/commands/decidim/meetings/admin/unpublish_meeting.rb +45 -0
  22. data/app/commands/decidim/meetings/admin/update_meeting.rb +6 -3
  23. data/app/commands/decidim/meetings/admin/update_question_status.rb +57 -0
  24. data/app/commands/decidim/meetings/admin/update_questionnaire.rb +93 -0
  25. data/app/commands/decidim/meetings/close_meeting.rb +2 -0
  26. data/app/commands/decidim/meetings/create_answer.rb +52 -0
  27. data/app/commands/decidim/meetings/create_meeting.rb +3 -1
  28. data/app/commands/decidim/meetings/join_meeting.rb +2 -1
  29. data/app/commands/decidim/meetings/update_meeting.rb +2 -1
  30. data/app/controllers/concerns/decidim/meetings/admin/filterable.rb +55 -0
  31. data/app/controllers/concerns/decidim/meetings/polls_resources.rb +29 -0
  32. data/app/controllers/decidim/meetings/admin/application_controller.rb +6 -2
  33. data/app/controllers/decidim/meetings/admin/invites_controller.rb +0 -2
  34. data/app/controllers/decidim/meetings/admin/meeting_closes_controller.rb +1 -1
  35. data/app/controllers/decidim/meetings/admin/meetings_controller.rb +46 -1
  36. data/app/controllers/decidim/meetings/admin/meetings_poll_controller.rb +107 -0
  37. data/app/controllers/decidim/meetings/calendars_controller.rb +8 -0
  38. data/app/controllers/decidim/meetings/live_events_controller.rb +29 -0
  39. data/app/controllers/decidim/meetings/meeting_closes_controller.rb +1 -1
  40. data/app/controllers/decidim/meetings/polls/answers_controller.rb +37 -0
  41. data/app/controllers/decidim/meetings/polls/questions_controller.rb +45 -0
  42. data/app/events/decidim/meetings/create_meeting_event.rb +16 -0
  43. data/app/forms/decidim/meetings/admin/answer_option_form.rb +24 -0
  44. data/app/forms/decidim/meetings/admin/close_meeting_form.rb +3 -1
  45. data/app/forms/decidim/meetings/admin/meeting_form.rb +12 -1
  46. data/app/forms/decidim/meetings/admin/question_form.rb +44 -0
  47. data/app/forms/decidim/meetings/admin/questionnaire_form.rb +19 -0
  48. data/app/forms/decidim/meetings/answer_choice_form.rb +14 -0
  49. data/app/forms/decidim/meetings/answer_form.rb +65 -0
  50. data/app/forms/decidim/meetings/close_meeting_form.rb +4 -0
  51. data/app/forms/decidim/meetings/join_meeting_form.rb +1 -0
  52. data/app/forms/decidim/meetings/meeting_form.rb +9 -0
  53. data/app/helpers/decidim/meetings/admin/filterable_helper.rb +13 -0
  54. data/app/helpers/decidim/meetings/application_helper.rb +3 -2
  55. data/app/helpers/decidim/meetings/map_helper.rb +1 -1
  56. data/app/helpers/decidim/meetings/meetings_helper.rb +21 -0
  57. data/app/models/decidim/meetings/answer.rb +48 -0
  58. data/app/models/decidim/meetings/answer_choice.rb +15 -0
  59. data/app/models/decidim/meetings/answer_option.rb +24 -0
  60. data/app/models/decidim/meetings/meeting.rb +88 -42
  61. data/app/models/decidim/meetings/poll.rb +19 -0
  62. data/app/models/decidim/meetings/question.rb +54 -0
  63. data/app/models/decidim/meetings/questionnaire.rb +23 -0
  64. data/app/models/decidim/meetings/registration.rb +2 -0
  65. data/app/packs/entrypoints/decidim_meetings.js +6 -0
  66. data/app/packs/entrypoints/decidim_meetings_admin.js +5 -0
  67. data/app/{assets/images/decidim/gamification/badges/attended_meetings.svg → packs/images/decidim/gamification/badges/decidim_gamification_badges_attended_meetings.svg} +0 -0
  68. data/app/{assets/images/decidim/meetings/icon.svg → packs/images/decidim/meetings/decidim_meetings.svg} +0 -0
  69. data/app/packs/src/decidim/meetings/admin/agendas.js +159 -0
  70. data/app/{assets/javascripts/decidim/meetings/admin/destroy_meeting_alert.js.es6 → packs/src/decidim/meetings/admin/destroy_meeting_alert.js} +0 -0
  71. data/app/{assets/javascripts/decidim/meetings/admin/meetings_form.js.es6 → packs/src/decidim/meetings/admin/meetings_form.js} +7 -4
  72. data/app/{assets/javascripts/decidim/meetings/admin/registrations_form.js.es6 → packs/src/decidim/meetings/admin/registrations_form.js} +0 -0
  73. data/app/{assets/javascripts/decidim/meetings/admin/registrations_invite_form.es6 → packs/src/decidim/meetings/admin/registrations_invite_form.js} +3 -3
  74. data/app/packs/src/decidim/meetings/meetings_form.js +54 -0
  75. data/app/packs/src/decidim/meetings/meetings_polls.js +41 -0
  76. data/app/packs/src/decidim/meetings/poll.component.js +166 -0
  77. data/app/packs/stylesheets/decidim/meetings/_header.scss +52 -0
  78. data/app/packs/stylesheets/decidim/meetings/_main.scss +178 -0
  79. data/app/packs/stylesheets/decidim/meetings/_meetings.scss +2 -0
  80. data/app/permissions/decidim/meetings/admin/permissions.rb +16 -8
  81. data/app/permissions/decidim/meetings/permissions.rb +42 -17
  82. data/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb +5 -1
  83. data/app/presenters/decidim/meetings/meeting_presenter.rb +25 -25
  84. data/app/queries/decidim/meetings/filtered_meetings.rb +1 -1
  85. data/app/queries/decidim/meetings/metrics/meetings_metric_manage.rb +1 -1
  86. data/app/queries/decidim/meetings/questionnaire_user_answers.rb +29 -0
  87. data/app/serializers/decidim/meetings/data_portability_invite_serializer.rb +2 -1
  88. data/app/serializers/decidim/meetings/data_portability_registration_serializer.rb +2 -1
  89. data/app/serializers/decidim/meetings/registration_serializer.rb +3 -12
  90. data/app/services/decidim/meetings/calendar/component_calendar.rb +2 -2
  91. data/app/services/decidim/meetings/calendar/meeting_calendar.rb +33 -0
  92. data/app/services/decidim/meetings/calendar_renderer.rb +2 -0
  93. data/app/services/decidim/meetings/meeting_iframe_embedder.rb +86 -0
  94. data/app/services/decidim/meetings/meeting_search.rb +2 -2
  95. data/app/views/decidim/meetings/admin/agenda/_form.html.erb +1 -1
  96. data/app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb +4 -4
  97. data/app/views/decidim/meetings/admin/invites/_form.html.erb +1 -1
  98. data/app/views/decidim/meetings/admin/meeting_closes/_form.html.erb +16 -1
  99. data/app/views/decidim/meetings/admin/meeting_copies/_form.html.erb +1 -1
  100. data/app/views/decidim/meetings/admin/meetings/_form.html.erb +16 -1
  101. data/app/views/decidim/meetings/admin/meetings/index.html.erb +39 -11
  102. data/app/views/decidim/meetings/admin/poll/_answer_option.html.erb +34 -0
  103. data/app/views/decidim/meetings/admin/poll/_answer_option_template.html.erb +7 -0
  104. data/app/views/decidim/meetings/admin/poll/_form.html.erb +63 -0
  105. data/app/views/decidim/meetings/admin/poll/_question.html.erb +96 -0
  106. data/app/views/decidim/meetings/admin/poll/edit.html.erb +9 -0
  107. data/app/views/decidim/meetings/admin/registrations/_form.html.erb +1 -1
  108. data/app/views/decidim/meetings/directory/meetings/index.html.erb +4 -4
  109. data/app/views/decidim/meetings/directory/meetings/index.js.erb +2 -0
  110. data/app/views/decidim/meetings/layouts/live_event.html.erb +50 -0
  111. data/app/views/decidim/meetings/live_events/show.html.erb +12 -0
  112. data/app/views/decidim/meetings/meeting_closes/_form.html.erb +8 -1
  113. data/app/views/decidim/meetings/meeting_closes/edit.html.erb +1 -1
  114. data/app/views/decidim/meetings/meetings/_calendar_modal.html.erb +26 -0
  115. data/app/views/decidim/meetings/meetings/_filters.html.erb +1 -1
  116. data/app/views/decidim/meetings/meetings/_form.html.erb +6 -1
  117. data/app/views/decidim/meetings/meetings/_linked_meetings.html.erb +1 -1
  118. data/app/views/decidim/meetings/meetings/_meeting_minutes.html.erb +7 -18
  119. data/app/views/decidim/meetings/meetings/edit.html.erb +1 -1
  120. data/app/views/decidim/meetings/meetings/index.html.erb +4 -4
  121. data/app/views/decidim/meetings/meetings/index.js.erb +1 -1
  122. data/app/views/decidim/meetings/meetings/new.html.erb +1 -1
  123. data/app/views/decidim/meetings/meetings/show.html.erb +13 -14
  124. data/app/views/decidim/meetings/polls/answers/_multiple_option.html.erb +13 -0
  125. data/app/views/decidim/meetings/polls/answers/_single_option.html.erb +19 -0
  126. data/app/views/decidim/meetings/polls/answers/create.js.erb +5 -0
  127. data/app/views/decidim/meetings/polls/questions/_closed_question.html.erb +7 -0
  128. data/app/views/decidim/meetings/polls/questions/_index.html.erb +5 -0
  129. data/app/views/decidim/meetings/polls/questions/_index_admin.html.erb +43 -0
  130. data/app/views/decidim/meetings/polls/questions/_published_question.html.erb +29 -0
  131. data/app/views/decidim/meetings/polls/questions/_question.html.erb +7 -0
  132. data/app/views/decidim/meetings/polls/questions/index.js.erb +5 -0
  133. data/app/views/decidim/meetings/polls/questions/index_admin.js.erb +5 -0
  134. data/app/views/decidim/meetings/registration_mailer/confirmation.html.erb +5 -2
  135. data/app/views/devise/mailer/join_meeting.html.erb +6 -6
  136. data/config/assets.rb +11 -0
  137. data/config/locales/ar.yml +3 -24
  138. data/config/locales/ca.yml +36 -27
  139. data/config/locales/cs.yml +72 -26
  140. data/config/locales/de.yml +22 -27
  141. data/config/locales/el.yml +3 -24
  142. data/config/locales/en.yml +112 -26
  143. data/config/locales/es-MX.yml +13 -27
  144. data/config/locales/es-PY.yml +13 -27
  145. data/config/locales/es.yml +13 -27
  146. data/config/locales/eu.yml +3 -24
  147. data/config/locales/fi-plain.yml +70 -26
  148. data/config/locales/fi.yml +70 -26
  149. data/config/locales/fr-CA.yml +19 -26
  150. data/config/locales/fr-LU.yml +534 -0
  151. data/config/locales/fr.yml +19 -26
  152. data/config/locales/gl.yml +46 -24
  153. data/config/locales/hu.yml +5 -24
  154. data/config/locales/id-ID.yml +3 -24
  155. data/config/locales/is-IS.yml +2 -22
  156. data/config/locales/it.yml +117 -23
  157. data/config/locales/ja.yml +148 -58
  158. data/config/locales/lb-LU.yml +1 -0
  159. data/config/locales/lv.yml +3 -24
  160. data/config/locales/nl.yml +70 -25
  161. data/config/locales/no.yml +5 -26
  162. data/config/locales/pl.yml +27 -38
  163. data/config/locales/pt-BR.yml +178 -23
  164. data/config/locales/pt.yml +3 -24
  165. data/config/locales/ro-RO.yml +38 -27
  166. data/config/locales/ru.yml +3 -24
  167. data/config/locales/sk.yml +3 -24
  168. data/config/locales/sv.yml +36 -27
  169. data/config/locales/tr-TR.yml +5 -27
  170. data/config/locales/uk.yml +3 -24
  171. data/config/locales/zh-CN.yml +3 -24
  172. data/db/migrate/20210217124802_add_registration_custom_content_to_meetings.rb +8 -0
  173. data/db/migrate/20210413050756_add_published_at_to_meetings.rb +7 -0
  174. data/db/migrate/20210413050917_update_published_at_to_existing_meetings.rb +20 -0
  175. data/db/migrate/20210430123416_add_public_participation_to_decidim_meetings_registrations.rb +7 -0
  176. data/db/migrate/20210506180226_merge_meetings_minutes_into_meetings_table.rb +48 -0
  177. data/db/migrate/20210512055802_create_decidim_meetings_polls.rb +10 -0
  178. data/db/migrate/20210512100333_drop_decidim_meetings_minutes_table.rb +77 -0
  179. data/db/migrate/20210518133236_merge_minutes_with_closing_report_in_meetings_table.rb +57 -0
  180. data/db/migrate/20210520084247_create_decidim_meetings_questionnaires.rb +11 -0
  181. data/db/migrate/20210520084253_create_decidim_meetings_questions.rb +15 -0
  182. data/db/migrate/20210520084321_create_decidim_meetings_answers.rb +13 -0
  183. data/db/migrate/20210520084330_create_decidim_meetings_answer_options.rb +10 -0
  184. data/db/migrate/20210520084337_create_decidim_meetings_answer_choices.rb +13 -0
  185. data/db/migrate/20210520134834_add_status_to_meetings_questions.rb +7 -0
  186. data/db/migrate/20210602040614_add_setting_embed_iframe_to_meetings.rb +7 -0
  187. data/lib/decidim/api/linked_resources_interface.rb +8 -1
  188. data/lib/decidim/api/meeting_type.rb +19 -4
  189. data/lib/decidim/api/meetings_type.rb +2 -2
  190. data/lib/decidim/meetings/admin_engine.rb +5 -1
  191. data/lib/decidim/meetings/api.rb +0 -1
  192. data/lib/decidim/meetings/component.rb +41 -6
  193. data/lib/decidim/meetings/data_portability_user_answers_serializer.rb +33 -0
  194. data/lib/decidim/meetings/engine.rb +10 -11
  195. data/lib/decidim/meetings/meeting_serializer.rb +1 -0
  196. data/lib/decidim/meetings/polls.rb +10 -0
  197. data/lib/decidim/meetings/test/factories.rb +85 -9
  198. data/lib/decidim/meetings/user_answers_serializer.rb +47 -0
  199. data/lib/decidim/meetings/version.rb +1 -1
  200. data/lib/decidim/meetings.rb +10 -0
  201. metadata +103 -113
  202. data/app/assets/config/decidim_meetings_manifest.js +0 -9
  203. data/app/assets/javascripts/decidim/meetings/admin/agendas.js.es6 +0 -158
  204. data/app/assets/javascripts/decidim/meetings/meetings_form.js.es6 +0 -54
  205. data/app/commands/decidim/meetings/admin/create_minutes.rb +0 -55
  206. data/app/commands/decidim/meetings/admin/update_minutes.rb +0 -63
  207. data/app/controllers/decidim/meetings/admin/minutes_controller.rb +0 -69
  208. data/app/forms/decidim/meetings/admin/minutes_form.rb +0 -20
  209. data/app/models/decidim/meetings/minutes.rb +0 -22
  210. data/app/presenters/decidim/meetings/admin_log/minutes_presenter.rb +0 -42
  211. data/app/views/decidim/meetings/admin/minutes/_form.html.erb +0 -23
  212. data/app/views/decidim/meetings/admin/minutes/edit.html.erb +0 -7
  213. data/app/views/decidim/meetings/admin/minutes/new.html.erb +0 -7
  214. data/app/views/decidim/meetings/meetings/_online_meeting_link.html.erb +0 -11
  215. data/config/locales/ja-JP.yml +0 -494
  216. data/lib/decidim/api/minutes_type.rb +0 -20
@@ -40,6 +40,8 @@ module Decidim
40
40
  end
41
41
 
42
42
  def proposals
43
+ return [] unless Decidim::Meetings.enable_proposal_linking
44
+
43
45
  @proposals ||= meeting.authored_proposals.load
44
46
  end
45
47
  end
@@ -0,0 +1,72 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Meetings
5
+ module Admin
6
+ # A command with all the business logic that publishes an
7
+ # existing meeting.
8
+ class PublishMeeting < Rectify::Command
9
+ # Public: Initializes the command.
10
+ #
11
+ # meeting - Decidim::Meetings::Meeting
12
+ # current_user - the user performing the action
13
+ def initialize(meeting, current_user)
14
+ @meeting = meeting
15
+ @current_user = current_user
16
+ end
17
+
18
+ # Executes the command. Broadcasts these events:
19
+ #
20
+ # - :ok when everything is valid.
21
+ # - :invalid if the form wasn't valid and we couldn't proceed.
22
+ #
23
+ # Returns nothing.
24
+ def call
25
+ return broadcast(:invalid) if meeting.published?
26
+
27
+ transaction do
28
+ publish_meeting
29
+ send_notification
30
+ schedule_upcoming_meeting_notification
31
+ end
32
+
33
+ broadcast(:ok, meeting)
34
+ end
35
+
36
+ private
37
+
38
+ attr_reader :meeting, :current_user
39
+
40
+ def publish_meeting
41
+ @meeting = Decidim.traceability.perform_action!(
42
+ :publish,
43
+ meeting,
44
+ current_user,
45
+ visibility: "all"
46
+ ) do
47
+ meeting.publish!
48
+ meeting
49
+ end
50
+ end
51
+
52
+ def send_notification
53
+ Decidim::EventsManager.publish(
54
+ event: "decidim.events.meetings.meeting_created",
55
+ event_class: Decidim::Meetings::CreateMeetingEvent,
56
+ resource: meeting,
57
+ followers: meeting.participatory_space.followers,
58
+ force_send: true
59
+ )
60
+ end
61
+
62
+ def schedule_upcoming_meeting_notification
63
+ checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
64
+
65
+ Decidim::Meetings::UpcomingMeetingNotificationJob
66
+ .set(wait_until: meeting.start_time - 2.days)
67
+ .perform_later(meeting.id, checksum)
68
+ end
69
+ end
70
+ end
71
+ end
72
+ end
@@ -0,0 +1,45 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Meetings
5
+ module Admin
6
+ # A command with all the business logic that unpublishes an
7
+ # existing meeting.
8
+ class UnpublishMeeting < Rectify::Command
9
+ # Public: Initializes the command.
10
+ #
11
+ # meeting - Decidim::Meetings::Meeting
12
+ # current_user - the user performing the action
13
+ def initialize(meeting, current_user)
14
+ @meeting = meeting
15
+ @current_user = current_user
16
+ end
17
+
18
+ # Executes the command. Broadcasts these events:
19
+ #
20
+ # - :ok when everything is valid.
21
+ # - :invalid if the form wasn't valid and we couldn't proceed.
22
+ #
23
+ # Returns nothing.
24
+ def call
25
+ return broadcast(:invalid) unless meeting.published?
26
+
27
+ @meeting = Decidim.traceability.perform_action!(
28
+ :unpublish,
29
+ meeting,
30
+ current_user,
31
+ visibility: "all"
32
+ ) do
33
+ meeting.unpublish!
34
+ meeting
35
+ end
36
+ broadcast(:ok, meeting)
37
+ end
38
+
39
+ private
40
+
41
+ attr_reader :meeting, :current_user
42
+ end
43
+ end
44
+ end
45
+ end
@@ -24,7 +24,7 @@ module Decidim
24
24
  transaction do
25
25
  update_meeting!
26
26
  send_notification if should_notify_followers?
27
- schedule_upcoming_meeting_notification if start_time_changed?
27
+ schedule_upcoming_meeting_notification if meeting.published? && start_time_changed?
28
28
  update_services!
29
29
  end
30
30
 
@@ -59,7 +59,10 @@ module Decidim
59
59
  location: form.location,
60
60
  location_hints: form.location_hints,
61
61
  private_meeting: form.private_meeting,
62
- transparent: form.transparent
62
+ transparent: form.transparent,
63
+ customize_registration_email: form.customize_registration_email,
64
+ registration_email_custom_content: form.registration_email_custom_content,
65
+ show_embedded_iframe: form.show_embedded_iframe
63
66
  )
64
67
  end
65
68
 
@@ -80,7 +83,7 @@ module Decidim
80
83
  end
81
84
 
82
85
  def should_notify_followers?
83
- important_attributes.any? { |attr| meeting.previous_changes[attr].present? }
86
+ meeting.published? && important_attributes.any? { |attr| meeting.previous_changes[attr].present? }
84
87
  end
85
88
 
86
89
  def important_attributes
@@ -0,0 +1,57 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Meetings
5
+ module Admin
6
+ # This command is executed when the user changes a Questionnaire from the admin
7
+ # panel.
8
+ class UpdateQuestionStatus < Rectify::Command
9
+ class InvalidStatus < StandardError; end
10
+
11
+ # Initializes a UpdateQuestionnaire Command.
12
+ #
13
+ # form - The form from which to get the data.
14
+ # questionnaire - The current instance of the questionnaire to be updated.
15
+ def initialize(question, current_user)
16
+ @question = question
17
+ @current_user = current_user
18
+ end
19
+
20
+ # Updates the questionnaire if valid.
21
+ #
22
+ # Broadcasts :ok if successful, :invalid otherwise.
23
+ def call
24
+ Decidim::Meetings::Question.transaction do
25
+ update_question
26
+ end
27
+
28
+ broadcast(:ok)
29
+ rescue InvalidStatus
30
+ broadcast(:invalid)
31
+ end
32
+
33
+ private
34
+
35
+ attr_reader :question, :current_user
36
+
37
+ def update_question
38
+ Decidim.traceability.update!(
39
+ question,
40
+ current_user,
41
+ status: new_status(question)
42
+ )
43
+ end
44
+
45
+ def new_status(question)
46
+ if question.unpublished?
47
+ Decidim::Meetings::Question.statuses[:published]
48
+ elsif question.published?
49
+ Decidim::Meetings::Question.statuses[:closed]
50
+ else
51
+ raise InvalidStatus
52
+ end
53
+ end
54
+ end
55
+ end
56
+ end
57
+ end
@@ -0,0 +1,93 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Meetings
5
+ module Admin
6
+ # This command is executed when the user changes a Questionnaire from the admin
7
+ # panel.
8
+ class UpdateQuestionnaire < Rectify::Command
9
+ # Initializes a UpdateQuestionnaire Command.
10
+ #
11
+ # form - The form from which to get the data.
12
+ # questionnaire - The current instance of the questionnaire to be updated.
13
+ def initialize(form, questionnaire)
14
+ @form = form
15
+ @questionnaire = questionnaire
16
+ end
17
+
18
+ # Updates the questionnaire if valid.
19
+ #
20
+ # Broadcasts :ok if successful, :invalid otherwise.
21
+ def call
22
+ return broadcast(:invalid) if @form.invalid?
23
+
24
+ Decidim::Meetings::Questionnaire.transaction do
25
+ create_questionnaire_for
26
+ create_questionaire
27
+ if @questionnaire.questions_editable?
28
+ update_questionnaire_questions
29
+ delete_answers
30
+ end
31
+ end
32
+
33
+ broadcast(:ok)
34
+ end
35
+
36
+ private
37
+
38
+ def create_questionnaire_for
39
+ @questionnaire.questionnaire_for.save! if @questionnaire.questionnaire_for.new_record?
40
+ end
41
+
42
+ def create_questionaire
43
+ @questionnaire.save! if @questionnaire.new_record?
44
+ end
45
+
46
+ def update_questionnaire_questions
47
+ @form.questions.each do |form_question|
48
+ update_questionnaire_question(form_question)
49
+ end
50
+ end
51
+
52
+ def update_questionnaire_question(form_question)
53
+ question_attributes = {
54
+ body: form_question.body,
55
+ position: form_question.position,
56
+ question_type: form_question.question_type,
57
+ max_choices: form_question.max_choices
58
+ }
59
+
60
+ update_nested_model(form_question, question_attributes, @questionnaire.questions) do |question|
61
+ form_question.answer_options.each do |form_answer_option|
62
+ answer_option_attributes = {
63
+ body: form_answer_option.body
64
+ }
65
+
66
+ update_nested_model(form_answer_option, answer_option_attributes, question.answer_options)
67
+ end
68
+ end
69
+ end
70
+
71
+ def update_nested_model(form, attributes, parent_association)
72
+ record = parent_association.find_by(id: form.id) || parent_association.build(attributes)
73
+
74
+ yield record if block_given?
75
+
76
+ if record.persisted?
77
+ if form.deleted?
78
+ record.destroy!
79
+ else
80
+ record.update!(attributes)
81
+ end
82
+ else
83
+ record.save!
84
+ end
85
+ end
86
+
87
+ def delete_answers
88
+ @questionnaire.answers.destroy_all
89
+ end
90
+ end
91
+ end
92
+ end
93
+ end
@@ -41,7 +41,9 @@ module Decidim
41
41
  form.current_user
42
42
  ) do
43
43
  meeting.update!(
44
+ attendees_count: form.attendees_count,
44
45
  closed_at: form.closed_at,
46
+ closing_visible: true,
45
47
  closing_report: { I18n.locale => parsed_closing_report }
46
48
  )
47
49
  end
@@ -0,0 +1,52 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Decidim
4
+ module Meetings
5
+ # This command is executed when the user creates an Answer in a meeting poll.
6
+ class CreateAnswer < Rectify::Command
7
+ def initialize(form, current_user, questionnaire)
8
+ @form = form
9
+ @current_user = current_user
10
+ @questionnaire = questionnaire
11
+ end
12
+
13
+ # Creates the answer if valid.
14
+ #
15
+ # Broadcasts :ok if successful, :invalid otherwise.
16
+ def call
17
+ return broadcast(:invalid) if form.invalid?
18
+
19
+ transaction do
20
+ answer_question
21
+ end
22
+
23
+ broadcast(:ok)
24
+ end
25
+
26
+ private
27
+
28
+ attr_reader :form, :answer
29
+
30
+ def invalid?
31
+ form.invalid?
32
+ end
33
+
34
+ def answer_question
35
+ answer = Answer.new(
36
+ user: @current_user,
37
+ questionnaire: @questionnaire,
38
+ question: form.question
39
+ )
40
+
41
+ form.selected_choices.each do |choice|
42
+ answer.choices.build(
43
+ body: choice.body,
44
+ decidim_answer_option_id: choice.answer_option_id
45
+ )
46
+ end
47
+
48
+ answer.save!
49
+ end
50
+ end
51
+ end
52
+ end
@@ -52,7 +52,9 @@ module Decidim
52
52
  registration_terms: { I18n.locale => form.registration_terms },
53
53
  registrations_enabled: form.registrations_enabled,
54
54
  type_of_meeting: form.clean_type_of_meeting,
55
- component: form.current_component
55
+ component: form.current_component,
56
+ published_at: Time.current,
57
+ show_embedded_iframe: form.show_embedded_iframe
56
58
  }
57
59
 
58
60
  @meeting = Decidim.traceability.create!(
@@ -55,7 +55,8 @@ module Decidim
55
55
  @registration = Decidim::Meetings::Registration.create!(
56
56
  meeting: meeting,
57
57
  user: user,
58
- user_group: user_group
58
+ user_group: user_group,
59
+ public_participation: registration_form.public_participation
59
60
  )
60
61
  end
61
62
 
@@ -62,7 +62,8 @@ module Decidim
62
62
  registration_terms: { I18n.locale => form.registration_terms },
63
63
  registrations_enabled: form.registrations_enabled,
64
64
  type_of_meeting: form.clean_type_of_meeting,
65
- online_meeting_url: form.online_meeting_url
65
+ online_meeting_url: form.online_meeting_url,
66
+ show_embedded_iframe: form.show_embedded_iframe
66
67
  },
67
68
  visibility: "public-only"
68
69
  )
@@ -0,0 +1,55 @@
1
+ # frozen_string_literal: true
2
+
3
+ require "active_support/concern"
4
+
5
+ module Decidim
6
+ module Meetings
7
+ module Admin
8
+ module Filterable
9
+ extend ActiveSupport::Concern
10
+
11
+ included do
12
+ include Decidim::Admin::Filterable
13
+
14
+ helper Decidim::Meetings::Admin::FilterableHelper
15
+
16
+ private
17
+
18
+ def base_query
19
+ Meeting.not_hidden.where(component: current_component).order(start_time: :desc).page(params[:page]).per(15)
20
+ end
21
+
22
+ def filters
23
+ [
24
+ :type_eq,
25
+ :is_upcoming_true,
26
+ :scope_id_eq,
27
+ :category_id_eq,
28
+ :origin_eq,
29
+ :closed_at_present
30
+ ]
31
+ end
32
+
33
+ def filters_with_values
34
+ {
35
+ type_eq: meeting_types,
36
+ scope_id_eq: scope_ids_hash(scopes.top_level),
37
+ category_id_eq: category_ids_hash(categories.first_class),
38
+ closed_at_present: %w(true false),
39
+ is_upcoming_true: %w(true false),
40
+ origin_eq: %w(citizen official user_group)
41
+ }
42
+ end
43
+
44
+ def search_field_predicate
45
+ :id_string_or_title_cont
46
+ end
47
+
48
+ def meeting_types
49
+ Meeting::TYPE_OF_MEETING
50
+ end
51
+ end
52
+ end
53
+ end
54
+ end
55
+ end