decidim-meetings 0.23.6 → 0.24.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/config/decidim_meetings_manifest.js +1 -0
- data/app/assets/javascripts/decidim/meetings/admin/meetings_form.js.es6 +47 -0
- data/app/assets/javascripts/decidim/meetings/meetings_form.js.es6 +45 -0
- data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/elements.erb +16 -0
- data/app/cells/decidim/meetings/content_blocks/highlighted_meetings/heading.erb +1 -0
- data/app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb +27 -0
- data/app/cells/decidim/meetings/join_meeting_button/show.erb +7 -0
- data/app/cells/decidim/meetings/meeting_activity_cell.rb +5 -13
- data/app/cells/decidim/meetings/meeting_cell.rb +2 -4
- data/app/cells/decidim/meetings/meeting_highlighted_list_item/show.erb +21 -0
- data/app/cells/decidim/meetings/meeting_highlighted_list_item_cell.rb +10 -0
- data/app/cells/decidim/meetings/meeting_m/address.erb +5 -1
- data/app/cells/decidim/meetings/meeting_m_cell.rb +2 -0
- data/app/cells/decidim/meetings/meeting_url/show.erb +15 -0
- data/app/cells/decidim/meetings/meeting_url_cell.rb +17 -0
- data/app/cells/decidim/meetings/reported_content/show.erb +3 -0
- data/app/cells/decidim/meetings/reported_content_cell.rb +13 -0
- data/app/commands/decidim/meetings/admin/create_meeting.rb +5 -0
- data/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb +1 -1
- data/app/commands/decidim/meetings/admin/update_meeting.rb +5 -0
- data/app/commands/decidim/meetings/admin/validate_registration_code.rb +2 -0
- data/app/commands/decidim/meetings/close_meeting.rb +66 -0
- data/app/commands/decidim/meetings/create_meeting.rb +7 -1
- data/app/commands/decidim/meetings/leave_meeting.rb +2 -2
- data/app/commands/decidim/meetings/update_meeting.rb +8 -1
- data/app/controllers/decidim/meetings/admin/application_controller.rb +1 -1
- data/app/controllers/decidim/meetings/admin/meeting_closes_controller.rb +2 -2
- data/app/controllers/decidim/meetings/directory/meetings_controller.rb +2 -2
- data/app/controllers/decidim/meetings/meeting_closes_controller.rb +43 -0
- data/app/controllers/decidim/meetings/meetings_controller.rb +9 -5
- data/app/forms/decidim/meetings/admin/close_meeting_form.rb +4 -4
- data/app/forms/decidim/meetings/admin/meeting_form.rb +62 -4
- data/app/forms/decidim/meetings/close_meeting_form.rb +31 -0
- data/app/forms/decidim/meetings/meeting_form.rb +71 -3
- data/app/helpers/decidim/meetings/application_helper.rb +20 -0
- data/app/helpers/decidim/meetings/map_helper.rb +1 -1
- data/app/models/decidim/meetings/agenda_item.rb +1 -1
- data/app/models/decidim/meetings/meeting.rb +52 -1
- data/app/permissions/decidim/meetings/permissions.rb +12 -2
- data/app/presenters/decidim/meetings/meeting_presenter.rb +33 -0
- data/app/services/decidim/meetings/meeting_search.rb +20 -0
- data/app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb +1 -1
- data/app/views/decidim/meetings/admin/invites/index.html.erb +1 -1
- data/app/views/decidim/meetings/admin/meetings/_form.html.erb +31 -1
- data/app/views/decidim/meetings/admin/meetings/edit.html.erb +2 -2
- data/app/views/decidim/meetings/admin/meetings/index.html.erb +23 -1
- data/app/views/decidim/meetings/admin/meetings/new.html.erb +2 -2
- data/app/views/decidim/meetings/admin/minutes/edit.html.erb +1 -1
- data/app/views/decidim/meetings/admin/registrations/edit.html.erb +20 -18
- data/app/views/decidim/meetings/directory/meetings/index.html.erb +1 -0
- data/app/views/decidim/meetings/directory/meetings/index.js.erb +0 -3
- data/app/views/decidim/meetings/meeting_closes/_form.html.erb +7 -0
- data/app/views/decidim/meetings/meeting_closes/edit.html.erb +25 -0
- data/app/views/decidim/meetings/meeting_closes/proposals_picker.html.erb +1 -0
- data/app/views/decidim/meetings/meetings/_filters.html.erb +6 -0
- data/app/views/decidim/meetings/meetings/_form.html.erb +36 -2
- data/app/views/decidim/meetings/meetings/_online_meeting_link.html.erb +11 -0
- data/app/views/decidim/meetings/meetings/edit.html.erb +1 -1
- data/app/views/decidim/meetings/meetings/index.js.erb +0 -3
- data/app/views/decidim/meetings/meetings/new.html.erb +1 -1
- data/app/views/decidim/meetings/meetings/show.html.erb +25 -21
- data/app/views/decidim/meetings/registration_mailer/confirmation.html.erb +3 -1
- data/app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb +1 -1
- data/config/locales/ar.yml +0 -7
- data/config/locales/ca.yml +8 -10
- data/config/locales/cs.yml +53 -16
- data/config/locales/de.yml +45 -8
- data/config/locales/el.yml +0 -10
- data/config/locales/en.yml +47 -10
- data/config/locales/es-MX.yml +18 -10
- data/config/locales/es-PY.yml +18 -10
- data/config/locales/es.yml +18 -10
- data/config/locales/eu.yml +0 -7
- data/config/locales/fi-plain.yml +45 -8
- data/config/locales/fi.yml +47 -10
- data/config/locales/fr-CA.yml +47 -10
- data/config/locales/fr.yml +49 -12
- data/config/locales/gl.yml +0 -12
- data/config/locales/hu.yml +0 -10
- data/config/locales/id-ID.yml +0 -7
- data/config/locales/is-IS.yml +0 -6
- data/config/locales/it.yml +0 -9
- data/config/locales/ja.yml +0 -9
- data/config/locales/lv.yml +0 -10
- data/config/locales/nl.yml +43 -9
- data/config/locales/no.yml +11 -10
- data/config/locales/pl.yml +39 -13
- data/config/locales/pt-BR.yml +0 -7
- data/config/locales/pt.yml +0 -9
- data/config/locales/ro-RO.yml +0 -22
- data/config/locales/ru.yml +0 -7
- data/config/locales/sk.yml +0 -10
- data/config/locales/sl.yml +0 -4
- data/config/locales/sv.yml +11 -11
- data/config/locales/tr-TR.yml +44 -9
- data/config/locales/uk.yml +0 -6
- data/config/locales/zh-CN.yml +0 -9
- data/db/migrate/20180809134748_add_upcoming_events_as_content_block.rb +1 -1
- data/db/migrate/20201006140511_add_online_meeting_url.rb +7 -0
- data/db/migrate/20201009124057_add_type_of_meeting.rb +7 -0
- data/db/migrate/20201016112641_add_registration_type_and_url_to_meetings.rb +19 -0
- data/lib/decidim/api/agenda_item_type.rb +22 -0
- data/lib/decidim/api/agenda_type.rb +19 -0
- data/lib/decidim/api/linked_resources_interface.rb +7 -6
- data/lib/decidim/api/meeting_type.rb +63 -0
- data/lib/decidim/api/meetings_type.rb +26 -0
- data/lib/decidim/api/minutes_type.rb +20 -0
- data/{app/types/decidim/meetings → lib/decidim/api}/service_type.rb +4 -4
- data/lib/decidim/api/services_interface.rb +3 -3
- data/lib/decidim/meetings/api.rb +6 -0
- data/lib/decidim/meetings/component.rb +53 -23
- data/lib/decidim/meetings/engine.rb +3 -17
- data/lib/decidim/meetings/test/factories.rb +16 -3
- data/lib/decidim/meetings/version.rb +1 -1
- data/lib/decidim/meetings.rb +1 -1
- metadata +43 -40
- data/app/types/decidim/meetings/agenda_item_type.rb +0 -28
- data/app/types/decidim/meetings/agenda_type.rb +0 -25
- data/app/types/decidim/meetings/meeting_type.rb +0 -65
- data/app/types/decidim/meetings/meetings_type.rb +0 -32
- data/app/types/decidim/meetings/minutes_type.rb +0 -26
- data/app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_meetings.html.erb +0 -15
- data/app/views/decidim/participatory_processes/participatory_process_groups/_meeting.html.erb +0 -10
@@ -17,6 +17,11 @@ module Decidim
|
|
17
17
|
attribute :decidim_category_id, Integer
|
18
18
|
attribute :private_meeting, Boolean
|
19
19
|
attribute :transparent, Boolean
|
20
|
+
attribute :online_meeting_url, String
|
21
|
+
attribute :type_of_meeting, String
|
22
|
+
attribute :registration_type, String
|
23
|
+
attribute :registration_url, String
|
24
|
+
attribute :available_slots, Integer, default: 0
|
20
25
|
|
21
26
|
translatable_attribute :title, String
|
22
27
|
translatable_attribute :description, String
|
@@ -25,10 +30,15 @@ module Decidim
|
|
25
30
|
|
26
31
|
validates :title, translatable_presence: true
|
27
32
|
validates :description, translatable_presence: true
|
28
|
-
validates :
|
29
|
-
|
30
|
-
validates :
|
31
|
-
validates :
|
33
|
+
validates :registration_type, presence: true
|
34
|
+
validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: ->(form) { form.on_this_platform? }
|
35
|
+
validates :registration_url, presence: true, url: true, if: ->(form) { form.on_different_platform? }
|
36
|
+
validates :type_of_meeting, presence: true
|
37
|
+
validates :location, translatable_presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
|
38
|
+
|
39
|
+
validates :address, presence: true, if: ->(form) { form.needs_address? }
|
40
|
+
validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? && form.needs_address? }
|
41
|
+
validates :online_meeting_url, presence: true, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
|
32
42
|
validates :start_time, presence: true, date: { before: :end_time }
|
33
43
|
validates :end_time, presence: true, date: { after: :start_time }
|
34
44
|
|
@@ -36,6 +46,7 @@ module Decidim
|
|
36
46
|
validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
|
37
47
|
validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
|
38
48
|
validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
|
49
|
+
validates :clean_type_of_meeting, presence: true
|
39
50
|
|
40
51
|
delegate :categories, to: :current_component
|
41
52
|
|
@@ -49,6 +60,7 @@ module Decidim
|
|
49
60
|
|
50
61
|
self.title = presenter.title(all_locales: title.is_a?(Hash))
|
51
62
|
self.description = presenter.description(all_locales: description.is_a?(Hash))
|
63
|
+
self.type_of_meeting = model.type_of_meeting
|
52
64
|
end
|
53
65
|
|
54
66
|
def services_to_persist
|
@@ -89,9 +101,55 @@ module Decidim
|
|
89
101
|
geocoding_enabled? && address.present?
|
90
102
|
end
|
91
103
|
|
104
|
+
def needs_address?
|
105
|
+
in_person_meeting? || hybrid_meeting?
|
106
|
+
end
|
107
|
+
|
92
108
|
def geocoded?
|
93
109
|
latitude.present? && longitude.present?
|
94
110
|
end
|
111
|
+
|
112
|
+
def online_meeting?
|
113
|
+
type_of_meeting == "online"
|
114
|
+
end
|
115
|
+
|
116
|
+
def in_person_meeting?
|
117
|
+
type_of_meeting == "in_person"
|
118
|
+
end
|
119
|
+
|
120
|
+
def hybrid_meeting?
|
121
|
+
type_of_meeting == "hybrid"
|
122
|
+
end
|
123
|
+
|
124
|
+
def clean_type_of_meeting
|
125
|
+
type_of_meeting.presence
|
126
|
+
end
|
127
|
+
|
128
|
+
def type_of_meeting_select
|
129
|
+
Decidim::Meetings::Meeting::TYPE_OF_MEETING.map do |type|
|
130
|
+
[
|
131
|
+
I18n.t("type_of_meeting.#{type}", scope: "decidim.meetings"),
|
132
|
+
type
|
133
|
+
]
|
134
|
+
end
|
135
|
+
end
|
136
|
+
|
137
|
+
def on_this_platform?
|
138
|
+
registration_type == "on_this_platform"
|
139
|
+
end
|
140
|
+
|
141
|
+
def on_different_platform?
|
142
|
+
registration_type == "on_different_platform"
|
143
|
+
end
|
144
|
+
|
145
|
+
def registration_type_select
|
146
|
+
Decidim::Meetings::Meeting::REGISTRATION_TYPE.map do |type|
|
147
|
+
[
|
148
|
+
I18n.t("registration_type.#{type}", scope: "decidim.meetings"),
|
149
|
+
type
|
150
|
+
]
|
151
|
+
end
|
152
|
+
end
|
95
153
|
end
|
96
154
|
end
|
97
155
|
end
|
@@ -0,0 +1,31 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Decidim
|
4
|
+
module Meetings
|
5
|
+
# This class holds a Form to close a meeting from Decidim's public views.
|
6
|
+
class CloseMeetingForm < Decidim::Form
|
7
|
+
attribute :closing_report, String
|
8
|
+
attribute :proposal_ids, Array[Integer]
|
9
|
+
attribute :proposals
|
10
|
+
attribute :closed_at, Decidim::Attributes::TimeWithZone, default: ->(_form, _attribute) { Time.current }
|
11
|
+
|
12
|
+
validates :closing_report, presence: true
|
13
|
+
|
14
|
+
# Private: Gets the proposals from the meeting and injects them to the form.
|
15
|
+
#
|
16
|
+
# Returns nothing.
|
17
|
+
def map_model(model)
|
18
|
+
self.proposal_ids = model.linked_resources(:proposals, "proposals_from_meeting").pluck(:id)
|
19
|
+
presenter = MeetingPresenter.new(model)
|
20
|
+
self.closing_report = presenter.closing_report(all_locales: false)
|
21
|
+
end
|
22
|
+
|
23
|
+
def proposals
|
24
|
+
@proposals ||= Decidim.find_resource_manifest(:proposals)
|
25
|
+
.try(:resource_scope, current_component)
|
26
|
+
&.where(id: proposal_ids)
|
27
|
+
&.order(title: :asc)
|
28
|
+
end
|
29
|
+
end
|
30
|
+
end
|
31
|
+
end
|
@@ -17,12 +17,25 @@ module Decidim
|
|
17
17
|
attribute :decidim_scope_id, Integer
|
18
18
|
attribute :decidim_category_id, Integer
|
19
19
|
attribute :user_group_id, Integer
|
20
|
+
attribute :online_meeting_url, String
|
21
|
+
attribute :type_of_meeting, String
|
22
|
+
attribute :registration_type, String
|
23
|
+
attribute :registrations_enabled, Boolean, default: false
|
24
|
+
attribute :registration_url, String
|
25
|
+
attribute :available_slots, Integer, default: 0
|
26
|
+
attribute :registration_terms, String
|
20
27
|
|
21
28
|
validates :title, presence: true
|
22
29
|
validates :description, presence: true
|
23
|
-
validates :
|
24
|
-
validates :
|
25
|
-
validates :address,
|
30
|
+
validates :type_of_meeting, presence: true
|
31
|
+
validates :location, presence: true, if: ->(form) { form.in_person_meeting? || form.hybrid_meeting? }
|
32
|
+
validates :address, presence: true, if: ->(form) { form.needs_address? }
|
33
|
+
validates :address, geocoding: true, if: ->(form) { form.has_address? && !form.geocoded? && form.needs_address? }
|
34
|
+
validates :online_meeting_url, presence: true, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
|
35
|
+
validates :registration_type, presence: true
|
36
|
+
validates :available_slots, numericality: { greater_than_or_equal_to: 0 }, presence: true, if: ->(form) { form.on_this_platform? }
|
37
|
+
validates :registration_terms, presence: true, if: ->(form) { form.on_this_platform? }
|
38
|
+
validates :registration_url, presence: true, url: true, if: ->(form) { form.on_different_platform? }
|
26
39
|
validates :start_time, presence: true, date: { before: :end_time }
|
27
40
|
validates :end_time, presence: true, date: { after: :start_time }
|
28
41
|
|
@@ -30,6 +43,7 @@ module Decidim
|
|
30
43
|
validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
|
31
44
|
validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
|
32
45
|
validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
|
46
|
+
validates :clean_type_of_meeting, presence: true
|
33
47
|
|
34
48
|
delegate :categories, to: :current_component
|
35
49
|
|
@@ -38,6 +52,10 @@ module Decidim
|
|
38
52
|
presenter = MeetingPresenter.new(model)
|
39
53
|
self.title = presenter.title(all_locales: false)
|
40
54
|
self.description = presenter.description(all_locales: false)
|
55
|
+
self.location = presenter.location(all_locales: false)
|
56
|
+
self.location_hints = presenter.location_hints(all_locales: false)
|
57
|
+
self.registration_terms = presenter.registration_terms(all_locales: false)
|
58
|
+
self.type_of_meeting = model.type_of_meeting
|
41
59
|
end
|
42
60
|
|
43
61
|
alias component current_component
|
@@ -70,9 +88,59 @@ module Decidim
|
|
70
88
|
geocoding_enabled? && address.present?
|
71
89
|
end
|
72
90
|
|
91
|
+
def needs_address?
|
92
|
+
in_person_meeting? || hybrid_meeting?
|
93
|
+
end
|
94
|
+
|
73
95
|
def geocoded?
|
74
96
|
latitude.present? && longitude.present?
|
75
97
|
end
|
98
|
+
|
99
|
+
def online_meeting?
|
100
|
+
type_of_meeting == "online"
|
101
|
+
end
|
102
|
+
|
103
|
+
def in_person_meeting?
|
104
|
+
type_of_meeting == "in_person"
|
105
|
+
end
|
106
|
+
|
107
|
+
def hybrid_meeting?
|
108
|
+
type_of_meeting == "hybrid"
|
109
|
+
end
|
110
|
+
|
111
|
+
def clean_type_of_meeting
|
112
|
+
type_of_meeting.presence
|
113
|
+
end
|
114
|
+
|
115
|
+
def type_of_meeting_select
|
116
|
+
Decidim::Meetings::Meeting::TYPE_OF_MEETING.map do |type|
|
117
|
+
[
|
118
|
+
I18n.t("type_of_meeting.#{type}", scope: "decidim.meetings"),
|
119
|
+
type
|
120
|
+
]
|
121
|
+
end
|
122
|
+
end
|
123
|
+
|
124
|
+
def on_this_platform?
|
125
|
+
registration_type == "on_this_platform"
|
126
|
+
end
|
127
|
+
|
128
|
+
def on_different_platform?
|
129
|
+
registration_type == "on_different_platform"
|
130
|
+
end
|
131
|
+
|
132
|
+
def registration_type_select
|
133
|
+
Decidim::Meetings::Meeting::REGISTRATION_TYPE.map do |type|
|
134
|
+
[
|
135
|
+
I18n.t("registration_type.#{type}", scope: "decidim.meetings"),
|
136
|
+
type
|
137
|
+
]
|
138
|
+
end
|
139
|
+
end
|
140
|
+
|
141
|
+
def registrations_enabled
|
142
|
+
on_this_platform?
|
143
|
+
end
|
76
144
|
end
|
77
145
|
end
|
78
146
|
end
|
@@ -27,6 +27,18 @@ module Decidim
|
|
27
27
|
)
|
28
28
|
end
|
29
29
|
|
30
|
+
def filter_type_values
|
31
|
+
type_values = []
|
32
|
+
Decidim::Meetings::Meeting::TYPE_OF_MEETING.each do |type|
|
33
|
+
type_values << TreePoint.new(type, t("decidim.meetings.meetings.filters.type_values.#{type}"))
|
34
|
+
end
|
35
|
+
|
36
|
+
TreeNode.new(
|
37
|
+
TreePoint.new("", t("decidim.meetings.meetings.filters.type_values.all")),
|
38
|
+
type_values
|
39
|
+
)
|
40
|
+
end
|
41
|
+
|
30
42
|
def filter_date_values
|
31
43
|
TreeNode.new(
|
32
44
|
TreePoint.new("", t("decidim.meetings.meetings.filters.date_values.all")),
|
@@ -36,6 +48,14 @@ module Decidim
|
|
36
48
|
]
|
37
49
|
)
|
38
50
|
end
|
51
|
+
|
52
|
+
# Options to filter meetings by activity.
|
53
|
+
def activity_filter_values
|
54
|
+
[
|
55
|
+
["all", t("decidim.meetings.meetings.filters.all")],
|
56
|
+
["my_meetings", t("decidim.meetings.meetings.filters.my_meetings")]
|
57
|
+
]
|
58
|
+
end
|
39
59
|
end
|
40
60
|
end
|
41
61
|
end
|
@@ -12,7 +12,7 @@ module Decidim
|
|
12
12
|
geocoded_meetings = meetings.select(&:geocoded?)
|
13
13
|
geocoded_meetings.map do |meeting|
|
14
14
|
meeting.slice(:latitude, :longitude, :address).merge(title: translated_attribute(meeting.title),
|
15
|
-
description: translated_attribute(meeting.description),
|
15
|
+
description: html_truncate(translated_attribute(meeting.description), length: 200),
|
16
16
|
startTimeDay: l(meeting.start_time, format: "%d"),
|
17
17
|
startTimeMonth: l(meeting.start_time, format: "%B"),
|
18
18
|
startTimeYear: l(meeting.start_time, format: "%Y"),
|
@@ -14,7 +14,7 @@ module Decidim
|
|
14
14
|
belongs_to :agenda, -> { order(:position) }, foreign_key: "decidim_agenda_id", class_name: "Decidim::Meetings::Agenda"
|
15
15
|
|
16
16
|
has_many :agenda_item_children, foreign_key: "parent_id", class_name: "Decidim::Meetings::AgendaItem", inverse_of: :parent, dependent: :destroy
|
17
|
-
belongs_to :parent,
|
17
|
+
belongs_to :parent, class_name: "Decidim::Meetings::AgendaItem", inverse_of: :agenda_item_children, optional: true
|
18
18
|
|
19
19
|
default_scope { order(:position) }
|
20
20
|
|
@@ -24,6 +24,9 @@ module Decidim
|
|
24
24
|
include Decidim::Authorable
|
25
25
|
include Decidim::TranslatableResource
|
26
26
|
|
27
|
+
TYPE_OF_MEETING = %w(in_person online hybrid).freeze
|
28
|
+
REGISTRATION_TYPE = %w(registration_disabled on_this_platform on_different_platform).freeze
|
29
|
+
|
27
30
|
translatable_fields :title, :description, :location, :location_hints, :closing_report, :registration_terms
|
28
31
|
|
29
32
|
has_many :registrations, class_name: "Decidim::Meetings::Registration", foreign_key: "decidim_meeting_id", dependent: :destroy
|
@@ -79,6 +82,10 @@ module Decidim
|
|
79
82
|
|
80
83
|
scope :visible, -> { where("decidim_meetings_meetings.private_meeting != ? OR decidim_meetings_meetings.transparent = ?", true, true) }
|
81
84
|
|
85
|
+
TYPE_OF_MEETING.each do |type|
|
86
|
+
scope type.to_sym, -> { where(type_of_meeting: type.to_sym) }
|
87
|
+
end
|
88
|
+
|
82
89
|
searchable_fields({
|
83
90
|
scope_id: :decidim_scope_id,
|
84
91
|
participatory_space: { component: :participatory_space },
|
@@ -120,6 +127,10 @@ module Decidim
|
|
120
127
|
closed_at.present?
|
121
128
|
end
|
122
129
|
|
130
|
+
def past?
|
131
|
+
end_time < Time.current
|
132
|
+
end
|
133
|
+
|
123
134
|
def has_available_slots?
|
124
135
|
return true if available_slots.zero?
|
125
136
|
|
@@ -174,7 +185,7 @@ module Decidim
|
|
174
185
|
end
|
175
186
|
|
176
187
|
def current_user_can_visit_meeting?(user)
|
177
|
-
Decidim::Meetings::Meeting.visible_meeting_for(user).
|
188
|
+
Decidim::Meetings::Meeting.visible_meeting_for(user).exists?(id: id)
|
178
189
|
end
|
179
190
|
|
180
191
|
# Return the duration of the meeting in minutes
|
@@ -183,6 +194,8 @@ module Decidim
|
|
183
194
|
end
|
184
195
|
|
185
196
|
def resource_visible?
|
197
|
+
return false if hidden?
|
198
|
+
|
186
199
|
!private_meeting? || transparent?
|
187
200
|
end
|
188
201
|
|
@@ -218,6 +231,44 @@ module Decidim
|
|
218
231
|
ResourceLocatorPresenter.new(self).url
|
219
232
|
end
|
220
233
|
|
234
|
+
# Public: Overrides the `reported_attributes` Reportable concern method.
|
235
|
+
def reported_attributes
|
236
|
+
[:description]
|
237
|
+
end
|
238
|
+
|
239
|
+
# Public: Overrides the `reported_searchable_content_extras` Reportable concern method.
|
240
|
+
def reported_searchable_content_extras
|
241
|
+
[normalized_author.name]
|
242
|
+
end
|
243
|
+
|
244
|
+
def hybrid_meeting?
|
245
|
+
type_of_meeting == "hybrid"
|
246
|
+
end
|
247
|
+
|
248
|
+
def online_meeting?
|
249
|
+
type_of_meeting == "online"
|
250
|
+
end
|
251
|
+
|
252
|
+
def registration_disabled?
|
253
|
+
registration_type == "registration_disabled"
|
254
|
+
end
|
255
|
+
|
256
|
+
def on_this_platform?
|
257
|
+
registration_type == "on_this_platform"
|
258
|
+
end
|
259
|
+
|
260
|
+
def on_different_platform?
|
261
|
+
registration_type == "on_different_platform"
|
262
|
+
end
|
263
|
+
|
264
|
+
def has_contributions?
|
265
|
+
!!contributions_count && contributions_count.positive?
|
266
|
+
end
|
267
|
+
|
268
|
+
def has_attendees?
|
269
|
+
!!attendees_count && attendees_count.positive?
|
270
|
+
end
|
271
|
+
|
221
272
|
private
|
222
273
|
|
223
274
|
def can_participate_in_meeting?(user)
|
@@ -23,6 +23,8 @@ module Decidim
|
|
23
23
|
toggle_allow(can_create_meetings?)
|
24
24
|
when :update
|
25
25
|
toggle_allow(can_update_meeting?)
|
26
|
+
when :close
|
27
|
+
toggle_allow(can_close_meeting?)
|
26
28
|
when :register
|
27
29
|
toggle_allow(can_register_invitation_meeting?)
|
28
30
|
end
|
@@ -47,7 +49,7 @@ module Decidim
|
|
47
49
|
|
48
50
|
def can_decline_invitation?
|
49
51
|
meeting.registrations_enabled? &&
|
50
|
-
meeting.invites.
|
52
|
+
meeting.invites.exists?(user: user)
|
51
53
|
end
|
52
54
|
|
53
55
|
def can_create_meetings?
|
@@ -56,7 +58,15 @@ module Decidim
|
|
56
58
|
|
57
59
|
def can_update_meeting?
|
58
60
|
component_settings&.creation_enabled_for_participants? &&
|
59
|
-
meeting.authored_by?(user)
|
61
|
+
meeting.authored_by?(user) &&
|
62
|
+
!meeting.closed?
|
63
|
+
end
|
64
|
+
|
65
|
+
def can_close_meeting?
|
66
|
+
component_settings&.creation_enabled_for_participants? &&
|
67
|
+
meeting.authored_by?(user) &&
|
68
|
+
!meeting.closed? &&
|
69
|
+
meeting.past?
|
60
70
|
end
|
61
71
|
|
62
72
|
def can_register_invitation_meeting?
|
@@ -32,6 +32,39 @@ module Decidim
|
|
32
32
|
end
|
33
33
|
end
|
34
34
|
|
35
|
+
def location(all_locales: false)
|
36
|
+
return unless meeting
|
37
|
+
|
38
|
+
handle_locales(meeting.location, all_locales) do |content|
|
39
|
+
content
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
def location_hints(all_locales: false)
|
44
|
+
return unless meeting
|
45
|
+
|
46
|
+
handle_locales(meeting.location_hints, all_locales) do |content|
|
47
|
+
content
|
48
|
+
end
|
49
|
+
end
|
50
|
+
|
51
|
+
def registration_terms(all_locales: false)
|
52
|
+
return unless meeting
|
53
|
+
|
54
|
+
handle_locales(meeting.registration_terms, all_locales) do |content|
|
55
|
+
content
|
56
|
+
end
|
57
|
+
end
|
58
|
+
|
59
|
+
def closing_report(links: false, all_locales: false)
|
60
|
+
return unless meeting
|
61
|
+
|
62
|
+
handle_locales(meeting.closing_report, all_locales) do |content|
|
63
|
+
renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize(content))
|
64
|
+
renderer.render(links: links).html_safe
|
65
|
+
end
|
66
|
+
end
|
67
|
+
|
35
68
|
# Next methods are used for present a Meeting As Proposal Author
|
36
69
|
def name
|
37
70
|
title
|
@@ -27,6 +27,26 @@ module Decidim
|
|
27
27
|
|
28
28
|
query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].classify })
|
29
29
|
end
|
30
|
+
|
31
|
+
def search_type
|
32
|
+
fields = Decidim::Meetings::Meeting::TYPE_OF_MEETING
|
33
|
+
filtered = []
|
34
|
+
options[:type].each do |inquiry|
|
35
|
+
filtered.push(inquiry) if fields.include?(inquiry)
|
36
|
+
end
|
37
|
+
filtered.size.positive? ? query.where(decidim_meetings_meetings: { type_of_meeting: filtered }) : query
|
38
|
+
end
|
39
|
+
|
40
|
+
# Handle the activity filter
|
41
|
+
def search_activity
|
42
|
+
case activity
|
43
|
+
when "my_meetings"
|
44
|
+
query
|
45
|
+
.where(decidim_author_id: user.id)
|
46
|
+
else
|
47
|
+
query
|
48
|
+
end
|
49
|
+
end
|
30
50
|
end
|
31
51
|
end
|
32
52
|
end
|
@@ -4,5 +4,5 @@
|
|
4
4
|
<%= t ".invited_you_to_join_a_meeting", invited_by: @invited_by.name, application: @user.organization.name %>
|
5
5
|
</p>
|
6
6
|
|
7
|
-
<p><%= link_to t(".decline", meeting_title: present(@meeting).title),routes.
|
7
|
+
<p><%= link_to t(".decline", meeting_title: present(@meeting).title),routes.decline_invitation_meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
|
8
8
|
<p><%= link_to t(".join", meeting_title: present(@meeting).title),routes.meeting_registration_url(meeting_id: @meeting, participatory_space_id: @meeting.component.participatory_space) %>
|
@@ -12,11 +12,18 @@
|
|
12
12
|
</div>
|
13
13
|
|
14
14
|
<div class="row column">
|
15
|
+
<%= form.select :type_of_meeting,
|
16
|
+
@form.type_of_meeting_select,
|
17
|
+
{ include_blank: t(".select_a_meeting_type") },
|
18
|
+
{ multiple: false } %>
|
19
|
+
</div>
|
20
|
+
|
21
|
+
<div class="field" data-meeting-type="in_person">
|
15
22
|
<%= form.geocoding_field :address %>
|
16
23
|
<p class="help-text"><%= t(".address_help") %></p>
|
17
24
|
</div>
|
18
25
|
|
19
|
-
<div class="
|
26
|
+
<div class="field" data-meeting-type="in_person">
|
20
27
|
<%= form.translated :text_area, :location %>
|
21
28
|
<p class="help-text"><%= t(".location_help") %></p>
|
22
29
|
</div>
|
@@ -26,6 +33,11 @@
|
|
26
33
|
<p class="help-text"><%= t(".location_hints_help") %></p>
|
27
34
|
</div>
|
28
35
|
|
36
|
+
<div class="field" data-meeting-type="online">
|
37
|
+
<%= form.text_field :online_meeting_url %>
|
38
|
+
<p class="help-text"><%= t(".online_meeting_url_help") %></p>
|
39
|
+
</div>
|
40
|
+
|
29
41
|
<div class="row">
|
30
42
|
<div class="columns xlarge-6">
|
31
43
|
<%= form.datetime_field :start_time %>
|
@@ -47,6 +59,24 @@
|
|
47
59
|
</div>
|
48
60
|
</div>
|
49
61
|
|
62
|
+
<div class="row column">
|
63
|
+
<%= form.select :registration_type,
|
64
|
+
@form.registration_type_select,
|
65
|
+
{ include_blank: t(".select_a_registration_type") },
|
66
|
+
{ multiple: false } %>
|
67
|
+
</div>
|
68
|
+
|
69
|
+
<div class="row column" id="meeting_available_slots">
|
70
|
+
<%= form.number_field :available_slots %>
|
71
|
+
<p class="help-text"><%= t(".available_slots_help") %></p>
|
72
|
+
</div>
|
73
|
+
|
74
|
+
<div class="field" id="meeting_registration_url">
|
75
|
+
<%= form.text_field :registration_url %>
|
76
|
+
<p class="help-text"><%= t(".registration_url_help") %></p>
|
77
|
+
<label><%= t(".disclaimer", organization: current_component.organization.name) %></label><br>
|
78
|
+
</div>
|
79
|
+
|
50
80
|
<div class="row column" id="private_meeting">
|
51
81
|
<%= form.check_box :private_meeting %>
|
52
82
|
</div>
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<%= decidim_form_for(@form, url: { action: "update" }, html: { class: "form edit_meeting" }) do |f| %>
|
2
|
-
<%= render partial: "form", object: f %>
|
1
|
+
<%= decidim_form_for(@form, url: { action: "update" }, html: { class: "form meetings_form edit_meeting" }) do |f| %>
|
2
|
+
<%= render partial: "form", object: f, locals: { title: t(".title") } %>
|
3
3
|
|
4
4
|
<div class="button--double form-general-submit">
|
5
5
|
<%= f.submit t(".update") %>
|
@@ -55,25 +55,45 @@
|
|
55
55
|
|
56
56
|
<% if allowed_to? :copy, :meeting, meeting: meeting %>
|
57
57
|
<%= icon_link_to "clipboard", new_meeting_copy_path(meeting), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
|
58
|
+
<% else %>
|
59
|
+
<span class="action-space icon"></span>
|
60
|
+
<% end %>
|
61
|
+
|
62
|
+
<% if allowed_to? :update, :meeting, meeting: meeting %>
|
63
|
+
<% if meeting.registration_disabled? %>
|
64
|
+
<%= icon "people", class: "action-icon action-icon--disabled", role: "img" %>
|
65
|
+
<% else %>
|
66
|
+
<%= icon_link_to "people", meeting.on_this_platform? ? edit_meeting_registrations_path(meeting) : meeting.registration_url, t("actions.registrations", scope: "decidim.meetings"), class: "action-icon--registrations" %>
|
67
|
+
<% end %>
|
58
68
|
<% end %>
|
59
69
|
|
60
70
|
<% if allowed_to? :update, :meeting, meeting: meeting %>
|
61
71
|
<%= icon_link_to "pencil", edit_meeting_path(meeting), t("actions.edit", scope: "decidim.meetings"), class: "action-icon--edit" %>
|
62
|
-
<%= icon_link_to "people", edit_meeting_registrations_path(meeting), t("actions.registrations", scope: "decidim.meetings"), class: "action-icon--registrations" %>
|
63
72
|
<%= icon_link_to "clock", meeting.minutes.present? ? edit_meeting_minute_path(meeting, meeting.minutes) : new_meeting_minute_path(meeting), t("actions.minutes", scope: "decidim.meetings"), class: "action-icon--minutes" %>
|
64
73
|
<%= icon_link_to "calendar", meeting.agenda.present? ? edit_meeting_agenda_path(meeting, meeting.agenda) : new_meeting_agenda_path(meeting), t("actions.agenda", scope: "decidim.meetings"), class: "action-icon--agenda" %>
|
74
|
+
<% else %>
|
75
|
+
<span class="action-space icon"></span>
|
76
|
+
<span class="action-space icon"></span>
|
77
|
+
<span class="action-space icon"></span>
|
78
|
+
<span class="action-space icon"></span>
|
65
79
|
<% end %>
|
66
80
|
|
67
81
|
<% if allowed_to? :close, :meeting, meeting: meeting %>
|
68
82
|
<%= icon_link_to "lock-locked", edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), t("actions.close", scope: "decidim.meetings"), class: "action-icon--close" %>
|
83
|
+
<% else %>
|
84
|
+
<span class="action-space icon"></span>
|
69
85
|
<% end %>
|
70
86
|
|
71
87
|
<% if allowed_to? :update, :meeting, meeting: meeting %>
|
72
88
|
<%= icon_link_to "folder", meeting_attachment_collections_path(meeting), t("actions.attachment_collections", scope: "decidim.meetings"), class: "action-icon--attachment_collections" %>
|
89
|
+
<% else %>
|
90
|
+
<span class="action-space icon"></span>
|
73
91
|
<% end %>
|
74
92
|
|
75
93
|
<% if allowed_to? :update, :meeting, meeting: meeting %>
|
76
94
|
<%= icon_link_to "paperclip", meeting_attachments_path(meeting), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
|
95
|
+
<% else %>
|
96
|
+
<span class="action-space icon"></span>
|
77
97
|
<% end %>
|
78
98
|
|
79
99
|
<%= resource_permissions_link(meeting) %>
|
@@ -95,6 +115,8 @@
|
|
95
115
|
end
|
96
116
|
%>
|
97
117
|
<% end %>
|
118
|
+
<% else %>
|
119
|
+
<span class="action-space icon"></span>
|
98
120
|
<% end %>
|
99
121
|
</td>
|
100
122
|
</tr>
|
@@ -1,7 +1,7 @@
|
|
1
|
-
<%= decidim_form_for(@form, html: { class: "form new_meeting" }) do |f| %>
|
1
|
+
<%= decidim_form_for(@form, html: { class: "form meetings_form new_meeting" }) do |f| %>
|
2
2
|
<%= render partial: "form", object: f, locals: { title: t(".title") } %>
|
3
3
|
|
4
4
|
<div class="button--double form-general-submit">
|
5
|
-
|
5
|
+
<%= f.submit t(".create") %>
|
6
6
|
</div>
|
7
7
|
<% end %>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<%= decidim_form_for(@form, url: meeting_minute_path(@current_meeting, @minutes), html: { class: "form edit_minutes" }) do |f| %>
|
2
|
-
<%= render partial: "form", object: f %>
|
2
|
+
<%= render partial: "form", object: f, locals: { title: t(".title") } %>
|
3
3
|
|
4
4
|
<div class="button--double form-general-submit">
|
5
5
|
<%= f.submit t(".update") %>
|