decidim-meetings 0.30.2 → 0.31.0.rc1

data/app/models/decidim/meetings/meeting.rb

@@ -51,10 +51,10 @@ module Decidim
       has_many :meeting_links, dependent: :destroy, class_name: "Decidim::Meetings::MeetingLink", foreign_key: "decidim_meeting_id"
       has_many :components, through: :meeting_links, class_name: "Decidim::Component", foreign_key: "decidim_component_id"
 
-      enum iframe_access_level: [:all, :signed_in, :registered], _prefix: true
-      enum iframe_embed_type: [:none, :embed_in_meeting_page, :open_in_live_event_page, :open_in_new_tab], _prefix: true
-      enum type_of_meeting: TYPE_OF_MEETING
-      enum registration_type: REGISTRATION_TYPES, _scopes: false
+      enum :iframe_access_level, [:all, :signed_in, :registered], prefix: true
+      enum :iframe_embed_type, [:none, :embed_in_meeting_page, :open_in_live_event_page, :open_in_new_tab], prefix: true
+      enum :type_of_meeting, TYPE_OF_MEETING
+      enum :registration_type, REGISTRATION_TYPES, scopes: false
 
       component_manifest_name "meetings"
 
@@ -165,11 +165,6 @@ module Decidim
         iframe_embed_types.except(:open_in_live_event_page)
       end
 
-      # Return registrations of a particular meeting made by users representing a group
-      def user_group_registrations
-        registrations.where.not(decidim_user_group_id: nil)
-      end
-
       # Returns the presenter for this author, to be used in the views.
       # Required by ActsAsAuthor.
       def presenter
@@ -205,20 +200,28 @@ module Decidim
         false
       end
 
+      def waitlist_enabled?
+        Decidim::Meetings.waiting_list_enabled
+      end
+
       def has_available_slots?
         return true if available_slots.zero?
 
-        (available_slots - reserved_slots) > registrations.count
+        (available_slots - reserved_slots) > registrations.registered.count
       end
 
       def remaining_slots
-        available_slots - reserved_slots - registrations.count
+        available_slots - reserved_slots - registrations.registered.count
       end
 
       def has_registration_for?(user)
         registrations.where(user:).any?
       end
 
+      def pending_location?
+        !online? && location.except("machine_translations").values.all?(&:blank?)
+      end
+
       def maps_enabled?
         component.settings.maps_enabled?
       end
@@ -315,7 +318,7 @@ module Decidim
       end
 
       def authored_proposals
-        return [] unless Decidim::Meetings.enable_proposal_linking
+        return [] unless Decidim.module_installed?(:proposals)
 
         Decidim::Proposals::Proposal
           .joins(:coauthorships)

data/app/models/decidim/meetings/question.rb

@@ -9,18 +9,18 @@ module Decidim
       QUESTION_TYPES = %w(single_option multiple_option).freeze
 
       translatable_fields :body
-      enum status: { unpublished: 0, published: 1, closed: 2 }
+      enum :status, { unpublished: 0, published: 1, closed: 2 }
 
       belongs_to :questionnaire, class_name: "Decidim::Meetings::Questionnaire", foreign_key: "decidim_questionnaire_id"
 
-      has_many :answers,
-               class_name: "Decidim::Meetings::Answer",
+      has_many :responses,
+               class_name: "Decidim::Meetings::Response",
                foreign_key: "decidim_question_id",
                dependent: :destroy,
                inverse_of: :question
 
-      has_many :answer_options,
-               class_name: "Decidim::Meetings::AnswerOption",
+      has_many :response_options,
+               class_name: "Decidim::Meetings::ResponseOption",
                foreign_key: "decidim_question_id",
                dependent: :destroy,
                inverse_of: :question
@@ -28,27 +28,27 @@ module Decidim
       validates :question_type, inclusion: { in: QUESTION_TYPES }
 
       scope :visible, -> { where(status: [:published, :closed]) }
-      scope :unanswered, -> { where.missing(:answers) }
+      scope :unanswered, -> { where.missing(:responses) }
 
       def multiple_choice?
         %w(single_option multiple_option).include?(question_type)
       end
 
-      # Public: returns whether the questionnaire is answered by the user or not.
-      def answered_by?(user)
-        questionnaire.answers.where({ user:, question: self }).any? if questionnaire.questions.present? && user.present?
+      # Public: returns whether the questionnaire is responded by the user or not.
+      def responded_by?(user)
+        questionnaire.responses.where({ user:, question: self }).any? if questionnaire.questions.present? && user.present?
       end
 
       def number_of_options
-        answer_options.size
+        response_options.size
       end
 
       def translated_body
         Decidim::Forms::QuestionPresenter.new(self).translated_body
       end
 
-      def answers_count
-        questionnaire.answers.where(question: self).count
+      def responses_count
+        questionnaire.responses.where(question: self).count
       end
     end
   end

data/app/models/decidim/meetings/questionnaire.rb

@@ -9,7 +9,7 @@ module Decidim
       belongs_to :questionnaire_for, polymorphic: true
 
       has_many :questions, -> { order(:position) }, class_name: "Question", foreign_key: "decidim_questionnaire_id", dependent: :destroy
-      has_many :answers, class_name: "Answer", foreign_key: "decidim_questionnaire_id", dependent: :destroy
+      has_many :responses, class_name: "Response", foreign_key: "decidim_questionnaire_id", dependent: :destroy
 
       def all_questions_unpublished?
         questions.all?(&:unpublished?)

data/app/models/decidim/meetings/registration.rb

@@ -8,7 +8,6 @@ module Decidim
 
       belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
-      belongs_to :user_group, foreign_key: "decidim_user_group_id", class_name: "Decidim::UserGroup", optional: true
 
       validates :user, uniqueness: { scope: :meeting }
       validates :code, uniqueness: { allow_blank: true, scope: :meeting }
@@ -16,7 +15,12 @@ module Decidim
 
       before_validation :generate_code, on: :create
 
-      scope :public_participant, -> { where(decidim_user_group_id: nil, public_participation: true) }
+      enum :status, { registered: "registered", waiting_list: "waiting_list" }
+
+      scope :on_waiting_list, -> { waiting_list.order(:created_at) }
+      scope :public_participant, -> { where(public_participation: true) }
+
+      delegate :component, :organization, to: :meeting
 
       def self.user_collection(user)
         where(decidim_user_id: user.id)
@@ -26,11 +30,6 @@ module Decidim
         Decidim::Meetings::DownloadYourDataRegistrationSerializer
       end
 
-      # Pluck all Decidim::UserGroup ID's
-      def self.user_group_ids
-        pluck(:decidim_user_group_id)
-      end
-
       # Public: Checks if the registration has been validated.
       #
       # Returns Boolean.
@@ -38,6 +37,19 @@ module Decidim
         validated_at?
       end
 
+      def presenter
+        Decidim::Meetings::RegistrationPresenter.new(self)
+      end
+
+      def validation_code_short_link
+        Decidim::ShortLink.to(
+          self,
+          meeting.component.mounted_admin_engine,
+          route_name: :qr_mark_as_attendee_meeting_registrations_attendee,
+          params: { meeting_id: meeting.id, id: code }
+        )
+      end
+
       private
 
       def generate_code

data/app/models/decidim/meetings/{answer.rb → response.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Meetings
-    # The data store for an Answer in the Decidim::Meetings
-    class Answer < Meetings::ApplicationRecord
+    # The data store for an Response in the Decidim::Meetings
+    class Response < Meetings::ApplicationRecord
       include Decidim::DownloadYourData
 
       belongs_to :user, class_name: "Decidim::User", foreign_key: "decidim_user_id", optional: true
@@ -11,10 +11,10 @@ module Decidim
       belongs_to :question, class_name: "Question", foreign_key: "decidim_question_id"
 
       has_many :choices,
-               class_name: "AnswerChoice",
-               foreign_key: "decidim_answer_id",
+               class_name: "ResponseChoice",
+               foreign_key: "decidim_response_id",
                dependent: :destroy,
-               inverse_of: :answer
+               inverse_of: :response
 
       validate :user_questionnaire_same_organization
       validate :question_belongs_to_questionnaire
@@ -24,7 +24,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Meetings::DownloadYourDataUserAnswersSerializer
+        Decidim::Forms::DownloadYourDataUserResponsesSerializer
       end
 
       def organization

data/app/models/decidim/meetings/response_choice.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class ResponseChoice < Meetings::ApplicationRecord
+      belongs_to :response,
+                 class_name: "Decidim::Meetings::Response",
+                 foreign_key: "decidim_response_id"
+
+      belongs_to :response_option,
+                 class_name: "Decidim::Meetings::ResponseOption",
+                 foreign_key: "decidim_response_option_id"
+    end
+  end
+end

data/app/models/decidim/meetings/{answer_option.rb → response_option.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module Meetings
-    class AnswerOption < Meetings::ApplicationRecord
+    class ResponseOption < Meetings::ApplicationRecord
       include Decidim::TranslatableResource
 
       default_scope { order(arel_table[:id].asc) }
@@ -11,13 +11,13 @@ module Decidim
 
       belongs_to :question, class_name: "Decidim::Meetings::Question", foreign_key: "decidim_question_id"
       has_many :choices,
-               class_name: "AnswerChoice",
-               foreign_key: "decidim_answer_option_id",
+               class_name: "ResponseChoice",
+               foreign_key: "decidim_response_option_id",
                dependent: :destroy,
-               inverse_of: :answer_option
+               inverse_of: :response_option
 
       def translated_body
-        Decidim::Forms::AnswerOptionPresenter.new(self).translated_body
+        Decidim::Forms::ResponseOptionPresenter.new(self).translated_body
       end
     end
   end

data/app/packs/src/decidim/meetings/admin/destroy_meeting_alert.js

@@ -2,7 +2,7 @@ const removeNewlineAdjacentSpaces = (text) => {
   return text.replace(/\n\s/g, "\n");
 }
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   const $confirmButton = $(".destroy-meeting-alert");
 
   if ($confirmButton.length > 0) {

data/app/packs/src/decidim/meetings/admin/meetings_components_form.js

@@ -1,5 +1,4 @@
 import TomSelect from "tom-select/dist/cjs/tom-select.popular";
-import createTooltip from "src/decidim/tooltips"
 
 /**
  * This module manages the Linked Spaces section from the
@@ -40,12 +39,6 @@ const handleAddButton = () => {
 
   body.appendChild(clone);
 
-  const tooltips = body.querySelectorAll("[data-tooltip]")
-
-  if (tooltips.length) {
-    createTooltip(tooltips[tooltips.length - 1]);
-  }
-
   select.value = "";
   table.classList.remove("hidden");
 };
@@ -65,7 +58,7 @@ const setupTomSelect = () => {
   return null;
 }
 
-document.addEventListener("DOMContentLoaded", () => {
+document.addEventListener("turbo:load", () => {
   document.querySelectorAll(".js-remove-component").forEach(handleRemoveButton);
   const addButton = document.querySelector(".js-add-component")
 

data/app/packs/src/decidim/meetings/admin/meetings_form.js

@@ -5,7 +5,7 @@ import createDynamicFields from "src/decidim/admin/dynamic_fields.component"
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 import attachGeocoding from "src/decidim/geocoding/attach_input"
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   const wrapperSelector = ".meeting-services";
   const fieldSelector = ".meeting-service";
 

data/app/packs/src/decidim/meetings/admin/registrations_form.js

@@ -1,4 +1,4 @@
-$(() => {
+document.addEventListener("turbo:load", () => {
   const $form = $(".edit_meeting_registrations");
 
   if ($form.length > 0) {

data/app/packs/src/decidim/meetings/admin/registrations_invite_form.js

@@ -1,6 +1,6 @@
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   const $attendeeType = $('[name="meeting_registration_invite[existing_user]"');
 
   createFieldDependentInputs({

data/app/packs/src/decidim/meetings/meetings_form.js

@@ -1,7 +1,7 @@
 import attachGeocoding from "src/decidim/geocoding/attach_input"
 import createFieldDependentInputs from "src/decidim/admin/field_dependent_inputs.component"
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   // Adds the latitude/longitude inputs after the geocoding is done
   const $meetingAddress = $("#meeting_address");
   if ($meetingAddress.length > 0) {

data/app/packs/src/decidim/meetings/meetings_polls.js

@@ -1,7 +1,7 @@
 import MeetingsPollComponent from "src/decidim/meetings/poll.component"
 const OPEN_CLASS = "is-open";
 
-$(() => {
+document.addEventListener("turbo:load", () => {
   // Mount polls component for users
   const $container = $("[data-decidim-meetings-poll]");
   const $counter = $("#visible-questions-count");

data/app/packs/src/decidim/meetings/poll.component.js

@@ -28,7 +28,7 @@ export default class PollComponent {
     this.mounted = false;
     this.questions = {};
     this.questionsStatuses = {};
-    this.answersStatuses = {};
+    this.responsesStatuses = {};
   }
 
   /**
@@ -102,7 +102,7 @@ export default class PollComponent {
 
       this.questionsStatuses[questionId] = $el.data("status");
       if (elForm.length > 0) {
-        this.answersStatuses[questionId] = Object.fromEntries(new FormData(elForm[0]));
+        this.responsesStatuses[questionId] = Object.fromEntries(new FormData(elForm[0]));
       }
       if ($el[0].open === true) {
         this.questions[questionId] = OPEN;
@@ -137,7 +137,7 @@ export default class PollComponent {
     // Current question state
     const state = this.questions[questionId];
     const questionStatus = this.questionsStatuses[questionId];
-    const answersStatuses = this.answersStatuses[questionId];
+    const responsesStatuses = this.responsesStatuses[questionId];
 
     // New questions have a special class
     if (!state) {
@@ -151,8 +151,8 @@ export default class PollComponent {
       document.getElementById(`closed-announcement-${questionId}`).hidden = false;
     }
 
-    if (answersStatuses) {
-      for (const [key, value] of Object.entries(answersStatuses)) {
+    if (responsesStatuses) {
+      for (const [key, value] of Object.entries(responsesStatuses)) {
         if (key.includes("[choices]")) {
           $el.find(`[name='${key}'][value='${value}']`).prop("checked", true);
         }

data/app/packs/stylesheets/decidim/meetings/_item.scss

@@ -148,6 +148,10 @@
       &__list {
         @apply ml-4 list-disc text-gray-2 text-sm;
       }
+
+      &__item {
+        @apply items-center gap-2;
+      }
     }
 
     &-actions {
@@ -228,7 +232,7 @@
     }
   }
 
-  &__answer {
+  &__response {
     label {
       @apply block p-4 ring-4 ring-background rounded transition;
 

data/app/packs/stylesheets/decidim/meetings/meetings.scss

@@ -1,4 +1,4 @@
-@import "stylesheets/decidim/meetings/list.scss";
-@import "stylesheets/decidim/meetings/item.scss";
-@import "stylesheets/decidim/meetings/calendar.scss";
-@import "stylesheets/decidim/meetings/live_event.scss";
+@use "stylesheets/decidim/meetings/list";
+@use "stylesheets/decidim/meetings/item";
+@use "stylesheets/decidim/meetings/calendar";
+@use "stylesheets/decidim/meetings/live_event";

data/app/permissions/decidim/meetings/admin/agenda_permissions.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      class AgendaPermissions < Decidim::DefaultPermissions
+        def permissions
+          return permission_action unless user
+          return permission_action unless permission_action.scope == :admin
+          return permission_action unless subject == :agenda
+
+          case permission_action.action
+          when :create
+            toggle_allow(meeting.present?)
+          when :update
+            toggle_allow(agenda.present? && meeting.present?)
+          end
+
+          permission_action
+        end
+
+        private
+
+        def agenda
+          @agenda ||= context.fetch(:agenda, nil)
+        end
+
+        def meeting
+          @meeting ||= context.fetch(:meeting, nil)
+        end
+      end
+    end
+  end
+end

data/app/permissions/decidim/meetings/admin/meeting_permissions.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      class MeetingPermissions < Decidim::DefaultPermissions
+        def permissions # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+          return permission_action unless user
+          return permission_action unless permission_action.scope == :admin
+          return permission_action unless subject == :meeting
+
+          if meeting && !meeting.official?
+            disallow!
+
+            return permission_action
+          end
+
+          case permission_action.action
+          when :close, :copy, :export_registrations, :update, :read_invites
+            toggle_allow(meeting.present?)
+          when :invite_attendee
+            toggle_allow(meeting.present? && meeting.registrations_enabled?)
+          when :validate_registration_code
+            toggle_allow(
+              meeting.present? &&
+              meeting.registrations_enabled? &&
+              meeting.component.settings.registration_code_enabled
+            )
+          when :create
+            allow!
+          end
+
+          permission_action
+        end
+
+        private
+
+        def meeting
+          @meeting ||= context.fetch(:meeting, nil)
+        end
+      end
+    end
+  end
+end

data/app/permissions/decidim/meetings/admin/permissions.rb

@@ -8,11 +8,11 @@ module Decidim
           return permission_action unless user
           return permission_action unless permission_action.scope == :admin
 
-          allowed_registration_form_action?
-          allowed_meeting_action?
-          allowed_agenda_action?
-          allowed_poll_action?
-          allowed_export_answers?
+          return Decidim::Meetings::Admin::MeetingPermissions.new(user, permission_action, context).permissions if subject == :meeting
+          return Decidim::Meetings::Admin::QuestionnairePermissions.new(user, permission_action, context).permissions if subject == :questionnaire
+          return Decidim::Meetings::Admin::AgendaPermissions.new(user, permission_action, context).permissions if subject == :agenda
+
+          toggle_allow(poll.present? && meeting.present?) if subject == :poll && action == :update
 
           permission_action
         end
@@ -23,70 +23,9 @@ module Decidim
           @meeting ||= context.fetch(:meeting, nil)
         end
 
-        def agenda
-          @agenda ||= context.fetch(:agenda, nil)
-        end
-
         def poll
           @poll ||= context.fetch(:poll, nil)
         end
-
-        def registration_form
-          @registration_form ||= context.fetch(:questionnaire, nil)
-        end
-
-        def allowed_meeting_action?
-          return unless permission_action.subject == :meeting
-
-          return disallow! if meeting && !meeting.official?
-
-          case permission_action.action
-          when :close, :copy, :export_registrations, :update, :read_invites
-            toggle_allow(meeting.present?)
-          when :invite_attendee
-            toggle_allow(meeting.present? && meeting.registrations_enabled?)
-          when :create
-            allow!
-          end
-        end
-
-        def allowed_registration_form_action?
-          return unless permission_action.subject == :questionnaire
-
-          case permission_action.action
-          when :update
-            toggle_allow(registration_form.present?)
-          end
-        end
-
-        def allowed_agenda_action?
-          return unless permission_action.subject == :agenda
-
-          case permission_action.action
-          when :create
-            toggle_allow(meeting.present?)
-          when :update
-            toggle_allow(agenda.present? && meeting.present?)
-          end
-        end
-
-        def allowed_poll_action?
-          return unless permission_action.subject == :poll
-
-          case permission_action.action
-          when :update
-            toggle_allow(poll.present? && meeting.present?)
-          end
-        end
-
-        def allowed_export_answers?
-          return unless permission_action.subject == :questionnaire
-
-          case permission_action.action
-          when :export_answers
-            permission_action.allow!
-          end
-        end
       end
     end
   end

data/app/permissions/decidim/meetings/admin/questionnaire_permissions.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      class QuestionnairePermissions < Decidim::DefaultPermissions
+        def permissions
+          return permission_action unless user
+          return permission_action unless permission_action.scope == :admin
+          return permission_action unless subject == :questionnaire
+
+          case permission_action.action
+          when :update
+            toggle_allow(registration_form.present?)
+          when :export_responses
+            allow!
+          end
+
+          permission_action
+        end
+
+        private
+
+        def registration_form
+          @registration_form ||= context.fetch(:questionnaire, nil)
+        end
+      end
+    end
+  end
+end