decidim-conferences 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8f52656762799f280f5633d15f97f5d935ca561b41f193ae3e8bcc57ef91893
-  data.tar.gz: 59339e8b80cb88eeb452ca62954c31b6d4b75cb0d45d6f701c76060a7a7a67e3
+  metadata.gz: ddc7fa34e2b4e2c992da97804172fe9475eacda9bcbe53177305aa3a704f942c
+  data.tar.gz: ce3e59d39e71aef52043e06029ebaf2c647ee9884efae26bc2a74d0dbfea125f
 SHA512:
-  metadata.gz: 719f9fd8e71ddd1fc4ee4bc4f2184de406173e6ae36486518d36c28d833850341d631369156c681562cbd2648dd5bb509f2f0b5b590531592216795faed9dc1a
-  data.tar.gz: 1ada3d691a34243e1736ddc0d0ff9f6d0b8b133bf40e6fd4610a4d8b5811fcc67d91e9d34729a2eb552d1043afc98db0076a2ea37a59a6781751e1595a4d3ad7
+  metadata.gz: e8468192f591655efbbad30949b26d4f470f25b67687fc9de707eba4f53153a3d4ea5fd85b33cb0695cf439d0a3ae80209c83e895c9c3f1a9e81c7068e669706
+  data.tar.gz: e0fa55a79b3043b793c5184dd7dca4425626effd210f076f8056595eb1b33f4dd9c95be2ae19a44cf1d9c23de03d7bdfccc0588b6c37b2bc11f8e9a83baa9e11

data/app/assets/config/admin/decidim_conferences_manifest.js

@@ -1,2 +1,3 @@
 //= link decidim/conferences/admin/conferences.js
 //= link decidim/conferences/admin/conference_speakers.js
+//= link decidim/conferences/admin/conference_invite_form.js

data/app/assets/images/decidim/conferences/conference.svg

@@ -1,6 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02">
-  <path d="M883.8,543.84a18,18,0,1,1,18-18A18,18,0,0,1,883.8,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,883.8,509.83Z" transform="translate(-865.8 -507.83)" />
-  <ellipse ry="5.504777" rx="5.5598245" cy="17.971844" cx="18" />
-  <path d="M883.8,543.84a18,18,0,1,1,18-18A18,18,0,0,1,883.8,543.84Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,883.8,509.83Z" transform="translate(-865.8 -507.83)" />
-  <path d="m 6.3078227,-25.154474 a 9.3338938,9.0435648 0 0 1 -8.7369752,9.025052 9.3338938,9.0435648 0 0 1 -9.8544645,-7.870717 9.3338938,9.0435648 0 0 1 7.4765554,-10.031744" transform="matrix(-0.78352169,0.62136443,-0.62136443,-0.78352169,0,0)" class="stroked-shape" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8">
+  <path d="M2.91-.03a1 1 0 0 0-.13.03 1 1 0 0 0-.78 1v2a1 1 0 1 0 2 0v-2a1 1 0 0 0-1.09-1.03zm-2.56 2.03a.5.5 0 0 0-.34.5v.5c0 1.48 1.09 2.69 2.5 2.94v1.06h-.5c-.55 0-1 .45-1 1h4.01c0-.55-.45-1-1-1h-.5v-1.06c1.41-.24 2.5-1.46 2.5-2.94v-.5a.5.5 0 1 0-1 0v.5c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2v-.5a.5.5 0 0 0-.59-.5.5.5 0 0 0-.06 0z" transform="translate(1)"/>
 </svg>

data/app/cells/decidim/conferences/linked_participatory_spaces_cell.rb

@@ -19,18 +19,21 @@ module Decidim
       end
 
       def conference_participatory_processes
+        return unless Decidim.participatory_space_manifests.map(&:name).include?(:participatory_processes)
         processes = model.linked_participatory_space_resources(:participatory_processes, "included_participatory_processes")
         return unless processes.any?
         processes
       end
 
       def conference_assemblies
+        return unless Decidim.participatory_space_manifests.map(&:name).include?(:assemblies)
         assemblies = model.linked_participatory_space_resources(:assemblies, "included_assemblies")
         return unless assemblies.any?
         assemblies
       end
 
       def conference_consultations
+        return unless Decidim.participatory_space_manifests.map(&:name).include?(:consultations)
         consultations = model.linked_participatory_space_resources(:consultations, "included_consultations")
         return unless consultations.any?
         consultations

data/app/cells/decidim/conferences/{join_conference_button/show.erb → registration_type/join_conference.erb}

@@ -1,9 +1,10 @@
-<% if model.registrations_enabled? %>
-  <% if model.has_registration_for? current_user %>
+<% if conference.registrations_enabled? %>
+  <% if conference.has_registration_for_user_and_registration_type?(current_user, model) %>
     <% if allowed? %>
-      <%= button_to conference_conference_registration_path(model),
+      <%= button_to conference_registration_type_conference_registration_path(conference, model),
           method: :delete,
           class: "#{button_classes} secondary light",
+          style: "margin-bottom: 0;",
           data: { disable: true } do %>
         <%= icon("check", class: "icon--small") %>
         <%= t("going", scope: "decidim.conferences.conference.show") %>
@@ -14,12 +15,10 @@
     <% if allowed? %>
       <%= button_to i18n_join_text, "",
           class: button_classes,
-          disabled: !model.has_available_slots?,
+          disabled: !conference.has_available_slots? || conference.has_registration_for?(current_user),
+          style: "margin-bottom: 0;",
           onclick: "event.preventDefault()",
           data: { open: current_user.present? ? "conference-registration-confirm-#{model.id}" : "loginModal" } %>
     <% end %>
   <% end %>
-  <% if shows_remaining_slots? %>
-    <span><%= t("remaining_slots", scope: "decidim.conferences.conference.show", count: model.remaining_slots) %></span>
-  <% end %>
 <% end %>

data/app/cells/decidim/conferences/{join_conference_button → registration_type}/registration_confirm.erb

@@ -1,12 +1,12 @@
 <div class="reveal" data-reveal id="conference-registration-confirm-<%= model.id %>">
   <div class="row">
     <div class="columns medium-10 medium-offset-1 help-text">
-      <%= decidim_sanitize translated_attribute(model.registration_terms) %>
+      <%= decidim_sanitize translated_attribute(conference.registration_terms) %>
     </div>
   </div>
   <div class="row">
     <div class="columns medium-8 medium-offset-2">
-      <%= button_to t("confirm", scope: "decidim.conferences.conference.registration_confirm"), conference_conference_registration_path(model), class: "button expanded", data: { disable: true } %>
+      <%= button_to t("confirm", scope: "decidim.conferences.conference.registration_confirm"), conference_registration_type_conference_registration_path(conference, model), class: "button expanded", data: { disable: true } %>
     </div>
   </div>
   <div class="text-center">

data/app/cells/decidim/conferences/registration_type/show.erb

@@ -0,0 +1,16 @@
+<div class="conference-registration card__block" id="registration-type-<%= model.id %>">
+  <div class="row flex--cc">
+    <div class="columns medium-8">
+      <div class="registration__text">
+        <strong><%= title %></strong>
+        <span> <%= description %></span>
+      </div>
+    </div>
+    <div class="columns medium-4">
+      <div class="registration__buttons">
+        <button type="button" class="small-5 small"><strong><%= price %></strong></button>
+        <%= render :join_conference %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/cells/decidim/conferences/registration_type_cell.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This cell renders the media link card for an instance of a RegistrationType
+    class RegistrationTypeCell < Decidim::ViewModel
+      include ActionView::Helpers::NumberHelper
+      include Decidim::SanitizeHelper
+      include Decidim::Conferences::Engine.routes.url_helpers
+      include Decidim::LayoutHelper
+
+      def show
+        render
+      end
+
+      private
+
+      delegate :current_user, to: :controller, prefix: false
+
+      def title
+        translated_attribute model.title
+      end
+
+      def description
+        translated_attribute model.description
+      end
+
+      def price
+        return I18n.t("free", scope: "decidim.conferences.conference.show") if model.price.blank?
+        number_to_currency(model.price, locale: I18n.locale, unit: Decidim.currency_unit)
+      end
+
+      def allowed?
+        options[:allowed]
+      end
+
+      def button_classes
+        "button button--sc small"
+      end
+
+      def conference
+        model.conference
+      end
+
+      def i18n_join_text
+        return I18n.t("registration", scope: "decidim.conferences.conference.show") if conference.has_available_slots?
+        I18n.t("no_slots_available", scope: "decidim.conferences.conference.show")
+      end
+    end
+  end
+end

data/app/commands/decidim/conferences/admin/confirm_conference_registration.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # This command is executed when the user joins a conference.
+      class ConfirmConferenceRegistration < Rectify::Command
+        # Initializes a JoinConference Command.
+        #
+        # conference_registration - The registration to be confirmed
+        def initialize(conference_registration, current_user)
+          @conference_registration = conference_registration
+          @current_user = current_user
+        end
+
+        # Creates a conference registration if the conference has registrations enabled
+        # and there are available slots.
+        #
+        # Broadcasts :ok if successful, :invalid otherwise.
+        def call
+          @conference_registration.with_lock do
+            return broadcast(:invalid) unless can_join_conference?
+            confirm_registration
+            send_email_confirmation
+            send_notification_confirmation
+          end
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :conference, :user
+
+        def confirm_registration
+          extra_info = {
+            resource: {
+              title: @conference_registration.conference.title
+            }
+          }
+
+          Decidim.traceability.perform_action!(
+            "confirm",
+            @conference_registration,
+            @current_user,
+            extra_info
+          ) do
+            @conference_registration.update!(confirmed_at: Time.current)
+            @conference_registration
+          end
+        end
+
+        def can_join_conference?
+          @conference_registration.conference.registrations_enabled? && @conference_registration.conference.has_available_slots?
+        end
+
+        def send_email_confirmation
+          Decidim::Conferences::ConferenceRegistrationMailer.confirmation(
+            @conference_registration.user,
+            @conference_registration.conference,
+            @conference_registration.registration_type
+          ).deliver_later
+        end
+
+        def send_notification_confirmation
+          Decidim::EventsManager.publish(
+            event: "decidim.events.conferences.conference_registration_confirmed",
+            event_class: Decidim::Conferences::ConferenceRegistrationNotificationEvent,
+            resource: @conference_registration.conference,
+            affected_users: [@conference_registration.user]
+          )
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/conferences/admin/create_conference.rb

@@ -86,7 +86,7 @@ module Decidim
             event: "decidim.events.conferences.registrations_enabled",
             event_class: Decidim::Conferences::ConferenceRegistrationsEnabledEvent,
             resource: conference,
-            recipient_ids: conference.followers.pluck(:id)
+            followers: conference.followers
           )
         end
 

data/app/commands/decidim/conferences/admin/create_registration_type.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # A command with all the business logic when creating a new registration type
+      # in the system.
+      class CreateRegistrationType < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # form - A form object with the params.
+        # current_user - The current user hwo do the action of create
+        # conference - The Conference that will hold the speaker
+        def initialize(form, current_user, conference)
+          @form = form
+          @current_user = current_user
+          @conference = conference
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          return broadcast(:invalid) if form.invalid?
+
+          transaction do
+            create_registration_type!
+            link_meetings(@registration_type)
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :form, :conference, :current_user
+
+        def create_registration_type!
+          log_info = {
+            resource: {
+              title: form.title
+            },
+            participatory_space: {
+              title: conference.title
+            }
+          }
+
+          @registration_type = Decidim.traceability.create!(
+            Decidim::Conferences::RegistrationType,
+            form.current_user,
+            form.attributes.slice(
+              :title,
+              :description,
+              :price,
+              :weight
+            ).merge(
+              conference: conference
+            ),
+            log_info
+          )
+        end
+
+        def conference_meetings(registration_type)
+          meeting_components = registration_type.conference.components.where(manifest_name: "meetings")
+          Decidim::ConferenceMeeting.where(component: meeting_components).where(id: @form.attributes[:conference_meeting_ids])
+        end
+
+        def link_meetings(registration_type)
+          registration_type.conference_meetings = conference_meetings(registration_type)
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/conferences/admin/destroy_registration_type.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # A command with all the business logic when destroying a conference
+      # registration type in the system.
+      class DestroyRegistrationType < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # registration_type - the Partner to destroy
+        # current_user - the user performing this action
+        def initialize(registration_type, current_user)
+          @registration_type = registration_type
+          @current_user = current_user
+        end
+
+        # Executes the command. Broadcasts these events:
+        #
+        # - :ok when everything is valid.
+        # - :invalid if the form wasn't valid and we couldn't proceed.
+        #
+        # Returns nothing.
+        def call
+          destroy_registration_type!
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :registration_type, :current_user
+
+        def destroy_registration_type!
+          log_info = {
+            resource: {
+              title: registration_type.title
+            },
+            participatory_space: {
+              title: registration_type.conference.title
+            }
+          }
+
+          Decidim.traceability.perform_action!(
+            "delete",
+            registration_type,
+            current_user,
+            log_info
+          ) do
+            registration_type.destroy!
+            registration_type
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb

@@ -59,6 +59,7 @@ module Decidim
             {
               user: user,
               conference: conference,
+              registration_type: form.registration_type,
               sent_at: Time.current
             },
             log_info
@@ -74,11 +75,11 @@ module Decidim
             if user.invited_to_sign_up?
               invite_user_to_sign_up
             else
-              InviteJoinConferenceMailer.invite(user, conference, invited_by).deliver_later
+              InviteJoinConferenceMailer.invite(user, conference, form.registration_type, invited_by).deliver_later
             end
           else
             user.name = form.name
-            user.nickname = User.nicknamize(user.name, organization: user.organization)
+            user.nickname = UserBaseEntity.nicknamize(user.name, organization: user.organization)
             invite_user_to_sign_up
             create_invitation!
           end

data/app/commands/decidim/conferences/admin/publish_registration_type.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module Admin
+      # This command gets called when a registration_type is published from the admin panel.
+      class PublishRegistrationType < Rectify::Command
+        # Public: Initializes the command.
+        #
+        # registration_type - The registration_type to publish.
+        # current_user - the user performing the action
+        def initialize(registration_type, current_user)
+          @registration_type = registration_type
+          @current_user = current_user
+        end
+
+        # Public: Publishes the Component.
+        #
+        # Broadcasts :ok if published, :invalid otherwise.
+        def call
+          return broadcast(:invalid) if registration_type.nil? || registration_type.published?
+
+          Decidim.traceability.perform_action!(:publish, registration_type, current_user) do
+            registration_type.publish!
+          end
+
+          broadcast(:ok)
+        end
+
+        private
+
+        attr_reader :registration_type, :current_user
+      end
+    end
+  end
+end