+ <%= form.check_box :reminder_enabled, label: t("reminder_enabled", scope: "decidim.meetings.admin.meetings.form"), "data-toggle": "customize_reminder_times" %>
+
+
+
+ <%= form.check_box :reminder_enabled, label: t("reminder_enabled", scope: "decidim.meetings.admin.meetings.form"), "data-toggle": "customize_reminder_times" %>
+
+
+
<%= form.select(
:user_group_id,
diff --git a/decidim-meetings/config/locales/en.yml b/decidim-meetings/config/locales/en.yml
index 067d5c7408c39..67d844f945819 100644
--- a/decidim-meetings/config/locales/en.yml
+++ b/decidim-meetings/config/locales/en.yml
@@ -191,10 +191,10 @@ en:
email_subject: The "%{resource_title}" meeting has enabled registrations.
notification_title: The
%{resource_title} meeting has enabled registrations.
upcoming_meeting:
- email_intro: The "%{resource_title}" meeting will start in less than 48h.
- email_outro: You have received this notification because you are following the "%{resource_title}" meeting. You can unfollow it from the previous link.
- email_subject: The "%{resource_title}" meeting will start in less than 48h.
- notification_title: The
%{resource_title} meeting will start in less than 48h.
+ email_intro: The "%{resource_title}" meeting will start in less than %{reminders_before_hours}h.
+ email_outro: You have received this notification because you are following the %{resource_title} meeting. You can unfollow it from the previous link.
+ email_subject: The "%{resource_title}" meeting will start in less than %{reminders_before_hours}h.
+ notification_title: The
%{resource_title} meeting will start in less than %{reminders_before_hours}h.
forms:
meetings:
attendees_count_help_text: Don't forget to include the total number of attendees at your meeting, whether in person, online or hybrid.
@@ -318,9 +318,14 @@ en:
location_hints_help: 'Location hints: additional info. Example: the floor of the building if it is an in-person meeting, or the meeting password if it is an online meeting with restricted access.'
online_meeting_url_help: 'Link: allow participants to connect directly to your meeting'
registration_url_help: 'Link: allow participants to go on the external service you are using for registrations'
+ reminder_enabled: Reminder enabled
+ reminder_help_text: Participants will receive an email the number of hours specified in advance of themeeting. If left empty or zero, the reminder will be sent at the default configured value of %{default_value} hours.
+ reminder_message: Reminder message
+ reminder_message_help_text: Customize the message if necessary. This will be ignored if no reminder is scheduled.
select_a_meeting_type: Please select a meeting type
select_a_registration_type: Please select a registration type
select_an_iframe_access_level: Please select an iframe access level
+ send_reminder: Send a reminder for this meeting
show_embedded_iframe_help: 'Only a few services allow embedding in meeting or live event from the following domains: %{domains}'
index:
title: Meetings
diff --git a/decidim-meetings/db/migrate/20250213114031_add_reminder_customization_to_decidim_meetings.rb b/decidim-meetings/db/migrate/20250213114031_add_reminder_customization_to_decidim_meetings.rb
new file mode 100644
index 0000000000000..4ee18474f3b0d
--- /dev/null
+++ b/decidim-meetings/db/migrate/20250213114031_add_reminder_customization_to_decidim_meetings.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddReminderCustomizationToDecidimMeetings < ActiveRecord::Migration[6.0]
+ def change
+ add_column :decidim_meetings_meetings, :reminder_enabled, :boolean
+ add_column :decidim_meetings_meetings, :send_reminders_before_hours, :integer
+ add_column :decidim_meetings_meetings, :reminder_message_custom_content, :jsonb
+ end
+end
diff --git a/decidim-meetings/lib/decidim/meetings.rb b/decidim-meetings/lib/decidim/meetings.rb
index b9653c5fa2074..1f82ffc623475 100644
--- a/decidim-meetings/lib/decidim/meetings.rb
+++ b/decidim-meetings/lib/decidim/meetings.rb
@@ -26,7 +26,7 @@ module Meetings
# Public Setting that defines the interval when the upcoming meeting will be sent
config_accessor :upcoming_meeting_notification do
- 2.days
+ 48.hours
end
config_accessor :embeddable_services do
diff --git a/decidim-meetings/lib/decidim/meetings/test/factories.rb b/decidim-meetings/lib/decidim/meetings/test/factories.rb
index 75d723b6f6108..014461b430d5c 100644
--- a/decidim-meetings/lib/decidim/meetings/test/factories.rb
+++ b/decidim-meetings/lib/decidim/meetings/test/factories.rb
@@ -44,6 +44,9 @@
registration_type { :on_this_platform }
type_of_meeting { :in_person }
component { build(:meeting_component) }
+ reminder_enabled { true }
+ send_reminders_before_hours { 48 }
+ reminder_message_custom_content { {} }
iframe_access_level { :all }
iframe_embed_type { :none }
diff --git a/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb b/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb
index f4002671c2fcf..13671a50f7c49 100644
--- a/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/admin/copy_meeting_spec.rb
@@ -50,6 +50,9 @@ module Decidim::Meetings
comments_enabled: meeting.comments_enabled,
comments_start_time: meeting.comments_start_time,
comments_end_time: meeting.comments_end_time,
+ reminder_enabled: meeting.reminder_enabled,
+ send_reminders_before_hours: meeting.send_reminders_before_hours,
+ reminder_message_custom_content: meeting.reminder_message_custom_content,
registration_type: :on_this_platform,
registration_url: meeting.registration_url,
type_of_meeting: meeting.type_of_meeting
@@ -77,6 +80,7 @@ module Decidim::Meetings
expect(new_meeting.category).to eq(old_meeting.category)
expect(new_meeting.component).to eq(old_meeting.component)
expect(new_meeting.component).not_to eq(be_published)
+ expect(new_meeting.reminder_message_custom_content).to eq(old_meeting.reminder_message_custom_content)
new_meeting.services.each_with_index do |service, index|
expect(service.title).to eq(services[index]["title"])
diff --git a/decidim-meetings/spec/commands/admin/create_meeting_spec.rb b/decidim-meetings/spec/commands/admin/create_meeting_spec.rb
index f1e97a2febc97..9a203a9fca71f 100644
--- a/decidim-meetings/spec/commands/admin/create_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/admin/create_meeting_spec.rb
@@ -25,6 +25,9 @@ module Decidim::Meetings
let(:registration_url) { "http://decidim.org" }
let(:registration_type) { "on_this_platform" }
let(:registrations_enabled) { true }
+ let(:reminder_enabled) { true }
+ let(:send_reminders_before_hours) { 50 }
+ let(:reminder_message_custom_content) { { "en" => "Custom reminder message" } }
let(:iframe_embed_type) { "embed_in_meeting_page" }
let(:iframe_access_level) { "all" }
let(:services) do
@@ -72,6 +75,9 @@ module Decidim::Meetings
comments_enabled: true,
comments_start_time: nil,
comments_end_time: nil,
+ reminder_enabled: reminder_enabled,
+ send_reminders_before_hours: send_reminders_before_hours,
+ reminder_message_custom_content: reminder_message_custom_content,
iframe_access_level: iframe_access_level
)
end
@@ -123,6 +129,28 @@ module Decidim::Meetings
expect(last_meeting.longitude).to eq(longitude)
end
+ it "sets the reminder message" do
+ subject.call
+ expect(meeting.reminder_message_custom_content).to eq(reminder_message_custom_content)
+ end
+
+ it "sets the send_reminders_before_hours" do
+ subject.call
+ expect(meeting.send_reminders_before_hours).to eq(send_reminders_before_hours)
+ expect(meeting.reminder_message_custom_content).to eq(reminder_message_custom_content)
+ end
+
+ context "when reminder is not enabled" do
+ let(:reminder_enabled) { false }
+
+ it "sends reminders before hours is nil" do
+ subject.call
+
+ expect(meeting.send_reminders_before_hours).to be_nil
+ expect(meeting.reminder_message_custom_content).to be_empty
+ end
+ end
+
it "sets the services" do
subject.call
diff --git a/decidim-meetings/spec/commands/admin/update_meeting_spec.rb b/decidim-meetings/spec/commands/admin/update_meeting_spec.rb
index e0c6077a96e0f..479af13847429 100644
--- a/decidim-meetings/spec/commands/admin/update_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/admin/update_meeting_spec.rb
@@ -29,6 +29,9 @@ module Decidim::Meetings
let(:registration_url) { "http://decidim.org" }
let(:registration_type) { "on_this_platform" }
let(:registrations_enabled) { true }
+ let(:reminder_enabled) { true }
+ let(:send_reminders_before_hours) { 50 }
+ let(:reminder_message_custom_content) { { "en" => "Custom reminder message!" } }
let(:iframe_embed_type) { "none" }
let(:iframe_access_level) { nil }
@@ -60,6 +63,9 @@ module Decidim::Meetings
comments_enabled: true,
comments_start_time: nil,
comments_end_time: nil,
+ reminder_enabled: reminder_enabled,
+ send_reminders_before_hours: send_reminders_before_hours,
+ reminder_message_custom_content: reminder_message_custom_content,
iframe_access_level: iframe_access_level
)
end
@@ -104,6 +110,13 @@ module Decidim::Meetings
expect(meeting.registrations_enabled).to eq registrations_enabled
end
+ it "sets the reminder settings" do
+ subject.call
+ expect(meeting.reminder_enabled).to eq reminder_enabled
+ expect(meeting.send_reminders_before_hours).to eq send_reminders_before_hours
+ expect(meeting.reminder_message_custom_content).to eq reminder_message_custom_content
+ end
+
it "sets the services" do
subject.call
meeting.services.each_with_index do |service, index|
@@ -163,6 +176,9 @@ module Decidim::Meetings
comments_enabled: true,
comments_start_time: nil,
comments_end_time: nil,
+ reminder_enabled: reminder_enabled,
+ send_reminders_before_hours: send_reminders_before_hours,
+ reminder_message_custom_content: reminder_message_custom_content,
iframe_access_level: iframe_access_level
)
end
diff --git a/decidim-meetings/spec/commands/create_meeting_spec.rb b/decidim-meetings/spec/commands/create_meeting_spec.rb
index 66d99615bb0a8..1fa986b5d0252 100644
--- a/decidim-meetings/spec/commands/create_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/create_meeting_spec.rb
@@ -27,6 +27,8 @@ module Decidim::Meetings
let(:registrations_enabled) { true }
let(:available_slots) { 0 }
let(:registration_terms) { Faker::Lorem.sentence(word_count: 3) }
+ let(:reminder_enabled) { true }
+ let(:send_reminders_before_hours) { 50 }
let(:form) do
double(
invalid?: invalid,
@@ -53,7 +55,10 @@ module Decidim::Meetings
clean_type_of_meeting: type_of_meeting,
online_meeting_url: online_meeting_url,
iframe_embed_type: iframe_embed_type,
- iframe_access_level: iframe_access_level
+ iframe_access_level: iframe_access_level,
+ reminder_enabled: reminder_enabled,
+ send_reminders_before_hours: send_reminders_before_hours,
+ reminder_message_custom_content: "Custom reminder message!"
)
end
@@ -91,6 +96,23 @@ module Decidim::Meetings
expect(meeting.category).to eq category
end
+ it "sets the reminder settings" do
+ subject.call
+ expect(meeting.reminder_enabled).to eq reminder_enabled
+ expect(meeting.send_reminders_before_hours).to eq send_reminders_before_hours
+ expect(meeting.reminder_message_custom_content).to include("en" => "Custom reminder message!")
+ end
+
+ context "when reminder is not enabled" do
+ let(:reminder_enabled) { false }
+
+ it "sends reminders before hours is nil" do
+ subject.call
+ expect(meeting.send_reminders_before_hours).to be_nil
+ expect(meeting.reminder_message_custom_content).to be_empty
+ end
+ end
+
it "sets the registration_terms" do
subject.call
expect(meeting.registration_terms).to eq("en" => registration_terms)
diff --git a/decidim-meetings/spec/commands/update_meeting_spec.rb b/decidim-meetings/spec/commands/update_meeting_spec.rb
index 1ed153b6af23e..69ce2ab2b7193 100644
--- a/decidim-meetings/spec/commands/update_meeting_spec.rb
+++ b/decidim-meetings/spec/commands/update_meeting_spec.rb
@@ -26,6 +26,8 @@ module Decidim::Meetings
let(:registration_url) { "http://decidim.org" }
let(:iframe_embed_type) { "none" }
let(:iframe_access_level) { nil }
+ let(:reminder_enabled) { true }
+ let(:send_reminders_before_hours) { 50 }
let(:form) do
double(
invalid?: invalid,
@@ -51,7 +53,10 @@ module Decidim::Meetings
clean_type_of_meeting: type_of_meeting,
online_meeting_url: online_meeting_url,
iframe_embed_type: iframe_embed_type,
- iframe_access_level: iframe_access_level
+ iframe_access_level: iframe_access_level,
+ reminder_enabled: reminder_enabled,
+ send_reminders_before_hours: send_reminders_before_hours,
+ reminder_message_custom_content: "Custom reminder message!"
)
end
@@ -87,6 +92,13 @@ module Decidim::Meetings
expect(meeting.longitude).to eq(longitude)
end
+ it "sets the reminder settings" do
+ subject.call
+ expect(meeting.reminder_enabled).to eq reminder_enabled
+ expect(meeting.send_reminders_before_hours).to eq send_reminders_before_hours
+ expect(meeting.reminder_message_custom_content).to include("en" => "Custom reminder message!")
+ end
+
context "when the author is a user_group" do
let(:user_group) { create :user_group, :verified, users: [current_user], organization: organization }
let(:user_group_id) { user_group.id }
@@ -150,7 +162,10 @@ module Decidim::Meetings
clean_type_of_meeting: type_of_meeting,
online_meeting_url: online_meeting_url,
iframe_embed_type: iframe_embed_type,
- iframe_access_level: iframe_access_level
+ iframe_access_level: iframe_access_level,
+ reminder_enabled: reminder_enabled,
+ send_reminders_before_hours: send_reminders_before_hours,
+ reminder_message_custom_content: "Custom reminder message!"
)
end
diff --git a/decidim-meetings/spec/forms/admin/meeting_form_spec.rb b/decidim-meetings/spec/forms/admin/meeting_form_spec.rb
index 84327fd00b29e..a6d3c0e30992a 100644
--- a/decidim-meetings/spec/forms/admin/meeting_form_spec.rb
+++ b/decidim-meetings/spec/forms/admin/meeting_form_spec.rb
@@ -55,6 +55,9 @@ module Decidim::Meetings
let(:registration_type) { "on_this_platform" }
let(:registrations_enabled) { true }
let(:available_slots) { 0 }
+ let(:reminder_enabled) { true }
+ let(:send_reminders_before_hours) { 48 }
+ let(:reminder_message_custom_content) { { en: "Custom reminder message" } }
let(:iframe_embed_type) { "none" }
let(:attributes) do
{
@@ -77,7 +80,10 @@ module Decidim::Meetings
type_of_meeting: type_of_meeting,
online_meeting_url: online_meeting_url,
iframe_embed_type: iframe_embed_type,
- registrations_enabled: registrations_enabled
+ registrations_enabled: registrations_enabled,
+ reminder_enabled: reminder_enabled,
+ send_reminders_before_hours: send_reminders_before_hours,
+ reminder_message_custom_content: reminder_message_custom_content
}
end
@@ -150,6 +156,52 @@ module Decidim::Meetings
it { is_expected.not_to be_valid }
end
+ describe "when reminder_enabled is false" do
+ let(:reminder_enabled) { false }
+
+ it { is_expected.to be_valid }
+ end
+
+ describe "when reminder_enabled is true" do
+ context "and send_reminders_before_hours is missing" do
+ let(:send_reminders_before_hours) { nil }
+
+ it { is_expected.to be_valid }
+
+ it "returns the default value" do
+ expect(form.send_reminders_before_hours).to eq(Decidim::Meetings.upcoming_meeting_notification.in_hours.to_i)
+ end
+ end
+
+ context "and send_reminders_before_hours is zero" do
+ let(:send_reminders_before_hours) { 0 }
+
+ it { is_expected.to be_valid }
+
+ it "returns the default value" do
+ expect(form.send_reminders_before_hours).to eq(Decidim::Meetings.upcoming_meeting_notification.in_hours.to_i)
+ end
+ end
+
+ context "and send_reminders_before_hours is present" do
+ let(:send_reminders_before_hours) { 50 }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "and send_reminders_before_hours is not valid" do
+ let(:send_reminders_before_hours) { -1 }
+
+ it { is_expected.not_to be_valid }
+ end
+
+ context "and reminder_message_custom_content is missing" do
+ let(:reminder_message_custom_content) { nil }
+
+ it { is_expected.to be_valid }
+ end
+ end
+
it "validates address and store its coordinates" do
expect(subject).to be_valid
expect(subject.latitude).to eq(latitude)
diff --git a/decidim-meetings/spec/forms/meeting_form_spec.rb b/decidim-meetings/spec/forms/meeting_form_spec.rb
index a639a38a60b2b..8f7c2e5f2937c 100644
--- a/decidim-meetings/spec/forms/meeting_form_spec.rb
+++ b/decidim-meetings/spec/forms/meeting_form_spec.rb
@@ -38,6 +38,9 @@ module Decidim::Meetings
let(:available_slots) { 0 }
let(:registration_url) { "http://decidim.org" }
let(:online_meeting_url) { "http://decidim.org" }
+ let(:reminder_enabled) { true }
+ let(:send_reminders_before_hours) { 48 }
+ let(:reminder_message_custom_content) { {} }
let(:iframe_embed_type) { "none" }
let(:registration_terms) { Faker::Lorem.sentence(word_count: 3) }
let(:attributes) do
@@ -61,6 +64,9 @@ module Decidim::Meetings
registration_terms: registration_terms,
registrations_enabled: true,
registration_url: registration_url,
+ reminder_enabled: reminder_enabled,
+ send_reminders_before_hours: send_reminders_before_hours,
+ reminder_message_custom_content: reminder_message_custom_content,
iframe_embed_type: iframe_embed_type
}
end
@@ -134,6 +140,52 @@ module Decidim::Meetings
it { is_expected.not_to be_valid }
end
+ describe "when reminder_enabled is false" do
+ let(:reminder_enabled) { false }
+
+ it { is_expected.to be_valid }
+ end
+
+ describe "when reminder_enabled is true" do
+ context "and send_reminders_before_hours is missing" do
+ let(:send_reminders_before_hours) { nil }
+
+ it { is_expected.to be_valid }
+
+ it "returns the default value" do
+ expect(form.send_reminders_before_hours).to eq(Decidim::Meetings.upcoming_meeting_notification.in_hours.to_i)
+ end
+ end
+
+ context "and send_reminders_before_hours is zero" do
+ let(:send_reminders_before_hours) { 0 }
+
+ it { is_expected.to be_valid }
+
+ it "returns the default value" do
+ expect(form.send_reminders_before_hours).to eq Decidim::Meetings.upcoming_meeting_notification.in_hours.to_i
+ end
+ end
+
+ context "and send_reminders_before_hours is present" do
+ let(:send_reminders_before_hours) { 50 }
+
+ it { is_expected.to be_valid }
+ end
+
+ context "and send_reminders_before_hours is not valid" do
+ let(:send_reminders_before_hours) { -1 }
+
+ it { is_expected.not_to be_valid }
+ end
+
+ context "and reminder_message_custom_content is missing" do
+ let(:reminder_message_custom_content) { nil }
+
+ it { is_expected.to be_valid }
+ end
+ end
+
it "validates address and store its coordinates" do
expect(subject).to be_valid
expect(subject.latitude).to eq(latitude)