decidim-meetings 0.30.2 → 0.31.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf2072be155206477263a0700986dfa59596a56848676dd71241e0ad753f30ab
-  data.tar.gz: 54738277914bbc88d29beb0cee291bc4f6a797fe7a7562c7189ea11113008ec4
+  metadata.gz: 2b5b62f6ed3b6a46c4fca9ff267502b3d458ca1943067664728a3e731d6d9c81
+  data.tar.gz: 5d36373d4d0d4db808762b34ee824b7bd1ed84b83e790a48be3b26ced8ded27a
 SHA512:
-  metadata.gz: 84fbedc3e1da611dc83bba0ead74349ab8574e8be2517fb32444d67ab4f455788b35ea8819a96dc54bf2cb32e6dd90cc850b02c502fbc66da6b0484199447d03
-  data.tar.gz: 89ebd88a8ce1cdb192d6e52a185feb94c7232637262ce817b1a3d19ced1fb9257617f5d327c79e2de4067ec0e7a8957d300fc9f574abe93f91a69c0a77a9b237
+  metadata.gz: 5a6c3520821cb57ccdea6c44902abec0ccb566b7e22b32ae0cfe867d66b0d0316cb76219ae2dfc10aed70ba60e7c7f278137c5afa34145944884d3701a29e103
+  data.tar.gz: 21d97317fedf76832e2f8a77384ff588ecbd94d2ee16b40df1afed2906617c7318e8551f71dc678042ad25057a76259fb355a60d7cd98ba9a7848560de147693

data/app/cells/decidim/meetings/cancel_registration_meeting_button/cancelation_modal.erb

@@ -2,10 +2,13 @@
   <%= decidim_form_for(registration_form, url: meeting_registration_path(model), method: :delete) do |form| %>
     <div data-dialog-container>
       <%= icon "door-open-line" %>
-      <h2 id="dialog-title-meeting-cancelation-confirm-<%= model.id %>" data-dialog-title><%= t("leave", scope: "decidim.meetings.meetings.show") %></h2>
+      <h2 id="dialog-title-meeting-cancelation-confirm-<%= model.id %>" data-dialog-title>
+        <%= i18n_modal_title %>
+      </h2>
       <div>
-
-        <div id="dialog-desc-meeting-cancelation-confirm-<%= model.id %>" class="meeting__cancelation-modal__description"><%= t("leave_confirmation", scope: "decidim.meetings.meetings.show") %></div>
+        <div id="dialog-desc-meeting-cancelation-confirm-<%= model.id %>" class="meeting__cancelation-modal__description">
+          <%= i18n_modal_confirmation_text %>
+        </div>
       </div>
     </div>
     <div data-dialog-actions>
@@ -13,7 +16,7 @@
         <span><%= t("close", scope: "decidim.shared.flag_modal") %></span>
       </button>
       <button type="submit" class="button button__sm md:button__lg button__transparent-secondary">
-        <span><%= t("leave", scope: "decidim.meetings.meetings.show") %></span>
+        <span><%= cancel_button_text %></span>
         <%= icon "arrow-right-line" %>
       </button>
     </div>

data/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb

@@ -7,6 +7,6 @@
   class: button_classes,
   data: { "dialog-open": "meeting-cancelation-confirm-#{model.id}" }
 ) do %>
-  <%= t("leave", scope: "decidim.meetings.meetings.show") %>
+  <%= cancel_button_text %>
   <%= icon icon_name %>
 <% end %>

data/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb

@@ -19,6 +19,42 @@ module Decidim
         model.component
       end
 
+      def registration_status
+        model.registrations.find_by(user: current_user)&.status
+      end
+
+      # i18n-tasks-use t('decidim.meetings.meetings.show.leave')
+      # i18n-tasks-use t('decidim.meetings.meetings.show.leave_confirmation')
+      # i18n-tasks-use t('decidim.meetings.meetings.show.leave_waitlist')
+      # i18n-tasks-use t('decidim.meetings.meetings.show.leave_waitlist_confirmation')
+      def action_keys
+        if registration_status == "waiting_list"
+          {
+            button: "leave_waitlist",
+            modal_title: "leave_waitlist",
+            modal_confirmation: "leave_waitlist_confirmation"
+          }
+        else
+          {
+            button: "leave",
+            modal_title: "leave",
+            modal_confirmation: "leave_confirmation"
+          }
+        end
+      end
+
+      def cancel_button_text
+        I18n.t(action_keys[:button], scope: "decidim.meetings.meetings.show")
+      end
+
+      def i18n_modal_title
+        I18n.t(action_keys[:modal_title], scope: "decidim.meetings.meetings.show")
+      end
+
+      def i18n_modal_confirmation_text
+        I18n.t(action_keys[:modal_confirmation], scope: "decidim.meetings.meetings.show")
+      end
+
       def button_classes
         "button button__sm button__transparent-secondary w-full"
       end

data/app/cells/decidim/meetings/dates_and_map_cell.rb

@@ -32,7 +32,7 @@ module Decidim
       end
 
       def display_map?
-        maps_enabled? && !online?
+        maps_enabled? && !online? && model.address.present?
       end
     end
   end

data/app/cells/decidim/meetings/join_meeting_button/registration_modal.erb

@@ -1,19 +1,18 @@
-<%= decidim_modal id: "meeting-registration-confirm-#{model.id}", class: "meeting__registration-modal" do %>
-  <%= decidim_form_for(registration_form, url: meeting_registration_path(model), method: :post) do |form| %>
+<%= decidim_modal id: "meeting-#{registration_action}-confirm-#{model.id}", class: "meeting__registration-modal" do %>
+  <%= decidim_form_for(registration_form, url: registration_path, method: :post) do |form| %>
     <div data-dialog-container>
       <%= icon "login-circle-line" %>
-      <h2 id="dialog-title-meeting-registration-confirm-<%= model.id %>" data-dialog-title><%= t("join", scope: "decidim.meetings.meetings.show") %></h2>
+      <h2 id="dialog-title-meeting-registration-confirm-<%= model.id %>" data-dialog-title><%= t(registration_translation_key, scope: "decidim.meetings.meetings.show") %></h2>
       <div>
 
         <div class="form__wrapper">
-          <%= cell("decidim/represent_user_group", form) %>
           <%= cell("decidim/public_participation", form) %>
           <div class="meeting__registration-modal__terms"><%= registration_terms_text %></div>
         </div>
       </div>
     </div>
     <div data-dialog-actions>
-      <button type="button" class="button button__sm md:button__lg button__transparent-secondary" data-dialog-close="meeting-registration-confirm-<%= model.id %>">
+      <button type="button" class="button button__sm md:button__lg button__transparent-secondary" data-dialog-close="meeting-<%= registration_action %>-confirm-<%= model.id %>">
         <span><%= i18n_cancel_text %></span>
       </button>
       <button type="submit" class="button button__sm md:button__lg button__secondary">

data/app/cells/decidim/meetings/join_meeting_button/show.erb

@@ -1,33 +1,27 @@
-<% if model.can_be_joined_by?(current_user) %>
-  <% unless model.has_registration_for? current_user %>
-    <% if model.registration_form_enabled? %>
-      <%= action_authorized_link_to(
-        :join,
-        i18n_join_text,
-        join_meeting_registration_path(model),
-        class: button_classes,
-        disabled: !model.has_available_slots?
-      ) %>
-    <% else %>
-      <% unless options[:hide_modal] %>
-        <%= render :registration_modal %>
-      <% end %>
-      <%= action_authorized_button_to(
-        :join,
-        i18n_join_text,
-        "#",
-        class: button_classes,
-        disabled: !model.has_available_slots?,
-        data: { "dialog-open": current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" },
-        resource: model
-      ) %>
-    <% end %>
-  <% end %>
+<% if render_waitlist_button? %>
+  <%= render :waitlist_button %>
 
-  <% if shows_remaining_slots? %>
-    <%= render :remaining_slots %>
+<% elsif model.can_be_joined_by?(current_user) && !model.has_registration_for?(current_user) %>
+  <% if model.registration_form_enabled? %>
+    <%= action_authorized_link_to(
+          :join,
+          i18n_join_text,
+          join_meeting_registration_path(model),
+          class: button_classes
+        ) %>
+  <% else %>
+    <% unless options[:hide_modal] %>
+      <%= render :registration_modal %>
+    <% end %>
+    <%= action_authorized_button_to(
+          :join,
+          i18n_join_text,
+          "#",
+          class: button_classes,
+          data: { "dialog-open": current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" },
+          resource: model
+        ) %>
   <% end %>
-
 <% elsif model.on_different_platform? %>
   <%= action_authorized_link_to(
     :join,
@@ -36,3 +30,6 @@
     class: button_classes
   ) %>
 <% end %>
+<% if shows_remaining_slots? %>
+  <%= render :remaining_slots unless participant_registered_for_meeting? %>
+<% end %>

data/app/cells/decidim/meetings/join_meeting_button/waitlist_button.erb

@@ -0,0 +1,22 @@
+<% if model.registration_form_enabled? %>
+  <%= action_authorized_link_to(
+        :join_waitlist,
+        join_waitlist_meeting_registration_path(model),
+        class: button_classes
+      ) do %>
+    <%= i18n_join_waitlist_text %>
+  <% end %>
+<% else %>
+  <% unless options[:hide_modal] %>
+    <%= render :registration_modal %>
+  <% end %>
+  <%= action_authorized_button_to(
+        :join_waitlist,
+        "#",
+        class: button_classes,
+        data: { "dialog-open": current_user.present? ? "meeting-waitlist-confirm-#{model.id}" : "loginModal" },
+        resource: model
+      ) do %>
+    <%= i18n_join_waitlist_text %>
+  <% end %>
+<% end %>

data/app/cells/decidim/meetings/join_meeting_button_cell.rb

@@ -12,6 +12,10 @@ module Decidim
         render
       end
 
+      def render_waitlist_button?
+        model.waitlist_enabled? && !model.has_available_slots? && model.can_be_joined_by?(current_user) && !model.has_registration_for?(current_user)
+      end
+
       private
 
       delegate :current_user, to: :controller, prefix: false
@@ -20,6 +24,10 @@ module Decidim
         model.component
       end
 
+      def available_slots?
+        @available_slots ||= model.has_available_slots?
+      end
+
       def button_classes
         "button button__xl button__secondary w-full"
       end
@@ -28,12 +36,20 @@ module Decidim
         options[:show_remaining_slots] && model.available_slots.positive?
       end
 
+      def participant_registered_for_meeting?
+        registration.present?
+      end
+
       def i18n_join_text
         return I18n.t("join", scope: "decidim.meetings.meetings.show") if model.has_available_slots?
 
         I18n.t("no_slots_available", scope: "decidim.meetings.meetings.show")
       end
 
+      def i18n_join_waitlist_text
+        I18n.t("join_waitlist", scope: "decidim.meetings.meetings.show")
+      end
+
       def i18n_confirm_text
         I18n.t("confirm", scope: "decidim.meetings.meetings.registration_confirm")
       end
@@ -49,6 +65,18 @@ module Decidim
       def registration_form
         @registration_form ||= Decidim::Meetings::JoinMeetingForm.new
       end
+
+      def registration_action
+        @registration_action ||= model.has_available_slots? ? "registration" : "waitlist"
+      end
+
+      def registration_path
+        model.has_available_slots? ? meeting_registration_path(model) : join_waitlist_meeting_registration_path(model)
+      end
+
+      def registration_translation_key
+        model.has_available_slots? ? :join : :join_waitlist
+      end
     end
   end
 end

data/app/cells/decidim/meetings/question_responses/show.erb

@@ -1,11 +1,11 @@
-<% answer_options_with_percentages.each do |(answer_option_body, answer_percentage)| %>
-  <div class="meeting-polls__answer">
-    <div class="meeting-polls__answer--bar">
-      <div style="width: <%= answer_percentage %>"></div>
+<% response_options_with_percentages.each do |(response_option_body, response_percentage)| %>
+  <div class="meeting-polls__response">
+    <div class="meeting-polls__response--bar">
+      <div style="width: <%= response_percentage %>"></div>
     </div>
-    <div class="meeting-polls__answer--value">
-      <span><%= translated_attribute(answer_option_body) %></span>
-      <span><%= answer_percentage %></span>
+    <div class="meeting-polls__response--value">
+      <span><%= translated_attribute(response_option_body) %></span>
+      <span><%= response_percentage %></span>
     </div>
   </div>
 <% end %>

data/app/cells/decidim/meetings/question_responses_cell.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Meetings
     # This cell renders the percentage of responses which chose
-    # the given answer option in a meeting poll question
+    # the given response option in a meeting poll question
     class QuestionResponsesCell < Decidim::ViewModel
       def show
         render
@@ -12,35 +12,35 @@ module Decidim
       private
 
       # Returns an array of arrays, where the internal array contains
-      #   - the body of the answer option
-      #   - the percentage of answers for that option
+      #   - the body of the response option
+      #   - the percentage of responses for that option
       #
-      def answer_options_with_percentages
-        # This query joins answer options with answer choices and answers
-        # and returns for each answer option the count of times it has been answered
-        # grouping by answer options and answers.
+      def response_options_with_percentages
+        # This query joins response options with response choices and responses
+        # and returns for each response option the count of times it has been responded
+        # grouping by response options and responses.
         #
-        # This calculation is a bit complex because of multiple option answers
-        question_answers_choices = Decidim::Meetings::AnswerOption.where(decidim_question_id: model.id)
-                                                                  .joins([choices: :answer])
-                                                                  .group(Arel.sql("#{answers_table_name}.id, #{answer_options_table_name}.id"))
-                                                                  .select(<<~SELECT
-                                                                    #{answer_options_table_name}.id AS id,
-                                                                    #{answer_options_table_name}.body,
-                                                                    #{answers_table_name}.id AS answer_id,
-                                                                    COUNT(decidim_answer_option_id) AS count
-                                                                  SELECT
-                                                                         )
+        # This calculation is a bit complex because of multiple option responses
+        question_responses_choices = Decidim::Meetings::ResponseOption.where(decidim_question_id: model.id)
+                                                                      .joins([choices: :response])
+                                                                      .group(Arel.sql("#{responses_table_name}.id, #{response_options_table_name}.id"))
+                                                                      .select(<<~SELECT
+                                                                        #{response_options_table_name}.id AS id,
+                                                                        #{response_options_table_name}.body,
+                                                                        #{responses_table_name}.id AS response_id,
+                                                                        COUNT(decidim_response_option_id) AS count
+                                                                      SELECT
+                                                                             )
 
-        # Extract the number of uniq answers by the answer_id attribute
-        total_answers = question_answers_choices.map(&:answer_id).compact.uniq.size
+        # Extract the number of uniq responses by the response_id attribute
+        total_responses = question_responses_choices.map(&:response_id).compact.uniq.size
 
-        # A second grouping is necessary to count the number of answers for each answer_option id
+        # A second grouping is necessary to count the number of responses for each response_option id
         # and calculate the percentages
         options_with_percentages = []
-        question_answers_choices.group_by(&:id).each do |_id, values|
-          answers_count = values.sum(&:count)
-          options_with_percentages << [values.first.body, calculate_and_format_percentage(answers_count, total_answers)]
+        question_responses_choices.group_by(&:id).each do |_id, values|
+          responses_count = values.sum(&:count)
+          options_with_percentages << [values.first.body, calculate_and_format_percentage(responses_count, total_responses)]
         end
 
         options_with_percentages
@@ -58,12 +58,12 @@ module Decidim
         format_percentage(calculate_percentage(part, total))
       end
 
-      def answer_options_table_name
-        @answer_options_table_name ||= Decidim::Meetings::AnswerOption.table_name
+      def response_options_table_name
+        @response_options_table_name ||= Decidim::Meetings::ResponseOption.table_name
       end
 
-      def answers_table_name
-        @answers_table_name ||= Decidim::Meetings::Answer.table_name
+      def responses_table_name
+        @responses_table_name ||= Decidim::Meetings::Response.table_name
       end
     end
   end

data/app/commands/decidim/meetings/admin/copy_meeting.rb

@@ -38,8 +38,8 @@ module Decidim
         attr_reader :form, :meeting, :copied_meeting
 
         def copy_meeting!
-          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: meeting.organization).rewrite
-          parsed_description = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.description, current_organization: meeting.organization).rewrite
+          parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: meeting.organization).rewrite
+          parsed_description = Decidim::ContentProcessor.parse_with_processor(:inline_images, form.description, current_organization: meeting.organization).rewrite
 
           @copied_meeting = Decidim.traceability.create!(
             Meeting,
@@ -68,6 +68,9 @@ module Decidim
             comments_end_time: form.comments_end_time,
             registration_type: form.registration_type,
             registration_url: form.registration_url,
+            reminder_enabled: form.reminder_enabled,
+            send_reminders_before_hours: form.send_reminders_before_hours,
+            reminder_message_custom_content: form.reminder_message_custom_content || meeting.reminder_message_custom_content,
             **fields_from_meeting
           )
         end

data/app/commands/decidim/meetings/admin/create_agenda.rb

@@ -21,7 +21,7 @@ module Decidim
         def create_agenda_item(form_agenda_item)
           agenda_item_attributes = {
             title: form_agenda_item.title,
-            description: form_agenda_item.description,
+            description: process_description(form_agenda_item.description),
             position: form_agenda_item.position,
             duration: form_agenda_item.duration,
             parent_id: form_agenda_item.parent_id,
@@ -32,7 +32,7 @@ module Decidim
             form_agenda_item.agenda_item_children.each do |form_agenda_item_child|
               agenda_item_child_attributes = {
                 title: form_agenda_item_child.title,
-                description: form_agenda_item_child.description,
+                description: process_description(form_agenda_item_child.description),
                 position: form_agenda_item_child.position,
                 duration: form_agenda_item_child.duration,
                 parent_id: agenda_item.id,
@@ -59,6 +59,10 @@ module Decidim
             record.save!
           end
         end
+
+        def process_description(description)
+          Decidim::ContentProcessor.parse(description, current_organization: form.current_organization).rewrite
+        end
       end
     end
   end

data/app/commands/decidim/meetings/admin/create_meeting.rb

@@ -9,7 +9,8 @@ module Decidim
         fetch_form_attributes :end_time, :start_time, :online_meeting_url, :registration_type,
                               :registration_url, :address, :latitude, :longitude, :location, :location_hints,
                               :private_meeting, :transparent, :registrations_enabled, :component, :iframe_embed_type,
-                              :comments_enabled, :taxonomizations, :comments_start_time, :comments_end_time, :iframe_access_level
+                              :comments_enabled, :taxonomizations, :comments_start_time, :comments_end_time, :iframe_access_level,
+                              :reminder_enabled
 
         protected
 
@@ -20,15 +21,18 @@ module Decidim
         end
 
         def attributes
-          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+          parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
           parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
+
           super.merge({
                         title: parsed_title,
                         description: parsed_description,
                         type_of_meeting: form.clean_type_of_meeting,
                         author: form.current_organization,
                         registration_terms: form.current_component.settings.default_registration_terms,
-                        questionnaire: Decidim::Forms::Questionnaire.new
+                        questionnaire: Decidim::Forms::Questionnaire.new,
+                        send_reminders_before_hours: form.reminder_enabled ? form.send_reminders_before_hours : nil,
+                        reminder_message_custom_content: form.reminder_enabled ? form.reminder_message_custom_content : ""
                       })
         end
 

data/app/commands/decidim/meetings/admin/mark_as_attendee.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      # This command is executed when the user marks a registration as attendee
+      # from the admin panel.
+      class MarkAsAttendee < Decidim::Command
+        def initialize(registration)
+          @registration = registration
+        end
+
+        def call
+          return broadcast(:invalid) if registration.validated?
+
+          mark_attendee
+          send_notification
+
+          broadcast(:ok)
+        end
+
+        attr_reader :registration
+
+        protected
+
+        def mark_attendee
+          registration.update!(validated_at: Time.current)
+        end
+
+        def send_notification
+          Decidim::EventsManager.publish(
+            event: "decidim.events.meetings.registration_marked_as_attendee",
+            event_class: Decidim::Meetings::RegistrationMarkedAsAttendeeEvent,
+            resource: meeting,
+            affected_users: [registration.user],
+            extra: {
+              registration: registration
+            }
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/meetings/admin/publish_meeting.rb

@@ -61,11 +61,12 @@ module Decidim
 
         def schedule_upcoming_meeting_notification
           return if meeting.start_time < Time.zone.now
+          return unless meeting.reminder_enabled
 
           checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
 
           Decidim::Meetings::UpcomingMeetingNotificationJob
-            .set(wait_until: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
+            .set(wait_until: meeting.start_time - meeting.send_reminders_before_hours.hours)
             .perform_later(meeting.id, checksum)
         end
       end

data/app/commands/decidim/meetings/admin/update_agenda.rb

@@ -19,7 +19,7 @@ module Decidim
         def update_agenda_item(form_agenda_item)
           agenda_item_attributes = {
             title: form_agenda_item.title,
-            description: form_agenda_item.description,
+            description: process_description(form_agenda_item.description),
             position: form_agenda_item.position,
             duration: form_agenda_item.duration,
             parent_id: form_agenda_item.parent_id
@@ -29,7 +29,7 @@ module Decidim
             form_agenda_item.agenda_item_children.each do |form_agenda_item_child|
               agenda_item_child_attributes = {
                 title: form_agenda_item_child.title,
-                description: form_agenda_item_child.description,
+                description: process_description(form_agenda_item_child.description),
                 position: form_agenda_item_child.position,
                 duration: form_agenda_item_child.duration,
                 parent_id: agenda_item.id,
@@ -56,6 +56,10 @@ module Decidim
             record.save!
           end
         end
+
+        def process_description(description)
+          Decidim::ContentProcessor.parse(description, current_organization: form.current_organization).rewrite
+        end
       end
     end
   end

data/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -10,7 +10,7 @@ module Decidim
                               :registration_url, :registrations_enabled, :address, :latitude, :longitude, :location,
                               :location_hints, :taxonomizations,
                               :private_meeting, :transparent, :iframe_embed_type, :comments_enabled,
-                              :comments_start_time, :comments_end_time, :iframe_access_level
+                              :comments_start_time, :comments_end_time, :iframe_access_level, :reminder_enabled
 
         protected
 
@@ -22,12 +22,15 @@ module Decidim
         end
 
         def attributes
-          parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
+          parsed_title = Decidim::ContentProcessor.parse(form.title, current_organization: form.current_organization).rewrite
           parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
+
           super.merge({
                         title: parsed_title,
                         description: parsed_description,
-                        type_of_meeting: form.clean_type_of_meeting
+                        type_of_meeting: form.clean_type_of_meeting,
+                        send_reminders_before_hours: form.reminder_enabled ? form.send_reminders_before_hours : nil,
+                        reminder_message_custom_content: form.reminder_enabled ? form.reminder_message_custom_content : {}
                       })
         end
 
@@ -48,7 +51,8 @@ module Decidim
             event: "decidim.events.meetings.meeting_updated",
             event_class: Decidim::Meetings::UpdateMeetingEvent,
             resource:,
-            followers: resource.followers
+            followers: resource.followers,
+            extra: { changed_fields: resource.previous_changes.keys & important_attributes }
           )
         end
 
@@ -57,20 +61,25 @@ module Decidim
         end
 
         def important_attributes
-          %w(start_time end_time address)
+          %w(start_time end_time address location)
         end
 
         def start_time_changed?
           resource.previous_changes["start_time"].present?
         end
 
+        def address_changed?
+          resource.previous_changes["address"].present? || resource.previous_changes["location"].present?
+        end
+
         def schedule_upcoming_meeting_notification
           return if resource.start_time < Time.zone.now
+          return unless resource.reminder_enabled
 
           checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(resource)
 
           Decidim::Meetings::UpcomingMeetingNotificationJob
-            .set(wait_until: resource.start_time - Decidim::Meetings.upcoming_meeting_notification)
+            .set(wait_until: resource.start_time - resource.send_reminders_before_hours.hours)
             .perform_later(resource.id, checksum)
         end
       end

data/app/commands/decidim/meetings/admin/update_questionnaire.rb

@@ -73,12 +73,12 @@ module Decidim
           }
 
           update_nested_model(form_question, question_attributes, @questionnaire.questions) do |question|
-            form_question.answer_options.each do |form_answer_option|
-              answer_option_attributes = {
-                body: form_answer_option.body
+            form_question.response_options.each do |form_response_option|
+              response_option_attributes = {
+                body: form_response_option.body
               }
 
-              update_nested_model(form_answer_option, answer_option_attributes, question.answer_options)
+              update_nested_model(form_response_option, response_option_attributes, question.response_options)
             end
           end
         end