decidim-conferences 0.15.1 → 0.16.0

data/app/mailers/decidim/conferences/conference_registration_mailer.rb

@@ -10,13 +10,28 @@ module Decidim
 
       helper Decidim::ResourceHelper
       helper Decidim::TranslationsHelper
+      helper Decidim::ApplicationHelper
 
-      def confirmation(user, conference)
+      def pending_validation(user, conference, registration_type)
         with_user(user) do
           @user = user
           @conference = conference
           @organization = @conference.organization
           @locator = Decidim::ResourceLocatorPresenter.new(@conference)
+          @registration_type = registration_type
+
+          subject = I18n.t("pending_validation.subject", scope: "decidim.conferences.mailer.conference_registration_mailer")
+          mail(to: user.email, subject: subject)
+        end
+      end
+
+      def confirmation(user, conference, registration_type)
+        with_user(user) do
+          @user = user
+          @conference = conference
+          @organization = @conference.organization
+          @locator = Decidim::ResourceLocatorPresenter.new(@conference)
+          @registration_type = registration_type
 
           add_calendar_attachment
 

data/app/models/decidim/conference.rb

@@ -48,12 +48,15 @@ module Decidim
     has_many :components, as: :participatory_space, dependent: :destroy
 
     has_many :media_links, class_name: "Decidim::Conferences::MediaLink", foreign_key: "decidim_conference_id", dependent: :destroy
+    has_many :registration_types, class_name: "Decidim::Conferences::RegistrationType", foreign_key: "decidim_conference_id", dependent: :destroy
 
     validates :slug, uniqueness: { scope: :organization }
     validates :slug, presence: true, format: { with: Decidim::Conference.slug_format }
 
     mount_uploader :hero_image, Decidim::HeroImageUploader
     mount_uploader :banner_image, Decidim::HomepageImageUploader
+    mount_uploader :main_logo, Decidim::Conferences::DiplomaUploader
+    mount_uploader :signature, Decidim::Conferences::DiplomaUploader
 
     # Scope to return only the promoted conferences.
     #
@@ -78,6 +81,10 @@ module Decidim
       conference_registrations.where(user: user).any?
     end
 
+    def has_registration_for_user_and_registration_type?(user, registration_type)
+      conference_registrations.where(user: user, registration_type: registration_type).any?
+    end
+
     def has_available_slots?
       return true if available_slots.zero?
       available_slots > conference_registrations.count
@@ -86,5 +93,10 @@ module Decidim
     def remaining_slots
       available_slots - conference_registrations.count
     end
+
+    def diploma_sent?
+      return false if diploma_sent_at.nil?
+      true
+    end
   end
 end

data/app/models/decidim/conference_meeting.rb

@@ -5,5 +5,7 @@ module Decidim
   class ConferenceMeeting < Decidim::Meetings::Meeting
     has_many :conference_speaker_conference_meetings, dependent: :destroy
     has_many :conference_speakers, through: :conference_speaker_conference_meetings, foreign_key: "conference_meeting_id", class_name: "Decidim::ConferenceSpeaker"
+    has_many :conference_meeting_registration_types, dependent: :destroy
+    has_many :registration_types, through: :conference_meeting_registration_types, foreign_key: "registration_type_id", class_name: "Decidim::Conferences::RegistrationType"
   end
 end

data/app/models/decidim/conferences/conference_invite.rb

@@ -10,6 +10,7 @@ module Decidim
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
+      belongs_to :registration_type, foreign_key: "decidim_conference_registration_type_id", class_name: "Decidim::Conferences::RegistrationType"
 
       validates :user, uniqueness: { scope: :conference }
 

data/app/models/decidim/conferences/conference_meeting_registration_type.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    class ConferenceMeetingRegistrationType < ApplicationRecord
+      belongs_to :conference_meeting, foreign_key: "conference_meeting_id", class_name: "Decidim::ConferenceMeeting"
+      belongs_to :registration_type, foreign_key: "registration_type_id", class_name: "Decidim::Conferences::RegistrationType"
+    end
+  end
+end

data/app/models/decidim/conferences/conference_registration.rb

@@ -8,9 +8,12 @@ module Decidim
 
       belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
       belongs_to :user, foreign_key: "decidim_user_id", class_name: "Decidim::User"
+      belongs_to :registration_type, foreign_key: "decidim_conference_registration_type_id", class_name: "Decidim::Conferences::RegistrationType"
 
       validates :user, uniqueness: { scope: :conference }
 
+      scope :confirmed, -> { where.not(confirmed_at: nil) }
+
       def self.user_collection(user)
         where(decidim_user_id: user.id)
       end
@@ -18,6 +21,14 @@ module Decidim
       def self.export_serializer
         Decidim::Conferences::DataPortabilityConferenceRegistrationSerializer
       end
+
+      def confirmed?
+        confirmed_at.present?
+      end
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Conferences::AdminLog::ConferenceRegistrationPresenter
+      end
     end
   end
 end

data/app/models/decidim/conferences/registration_type.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # It represents a registration type of the conference
+    class RegistrationType < ApplicationRecord
+      include Decidim::Publicable
+      include Decidim::Traceable
+      include Decidim::Loggable
+
+      belongs_to :conference, foreign_key: "decidim_conference_id", class_name: "Decidim::Conference"
+      has_many :conference_meeting_registration_types, dependent: :destroy
+      has_many :conference_meetings, through: :conference_meeting_registration_types, foreign_key: "registration_type_id", class_name: "Decidim::ConferenceMeeting"
+      has_many :conference_registrations, foreign_key: "decidim_conference_registration_type_id", class_name: "Decidim::Conferences::ConferenceRegistration", dependent: :destroy
+
+      default_scope { order(weight: :asc) }
+
+      alias participatory_space conference
+
+      def self.log_presenter_class_for(_log)
+        Decidim::Conferences::AdminLog::RegistrationTypePresenter
+      end
+    end
+  end
+end

data/app/permissions/decidim/conferences/permissions.rb

@@ -19,6 +19,7 @@ module Decidim
           public_list_speakers_action?
           public_list_program_action?
           public_list_media_links_action?
+          public_list_registration_types_action?
           public_report_content_action?
 
           can_join_conference?
@@ -39,8 +40,8 @@ module Decidim
         user_can_read_current_conference?
         user_can_read_conference_registrations?
         user_can_export_conference_registrations?
+        user_can_confirm_conference_registration?
         user_can_create_conference?
-        user_can_destroy_conference?
 
         # org admins and space admins can do everything in the admin section
         org_admin_action?
@@ -146,6 +147,13 @@ module Decidim
         allow!
       end
 
+      def public_list_registration_types_action?
+        return unless permission_action.action == :list &&
+                      permission_action.subject == :registration_types
+
+        allow!
+      end
+
       def public_report_content_action?
         return unless permission_action.action == :create &&
                       permission_action.subject == :moderation
@@ -188,14 +196,6 @@ module Decidim
         toggle_allow(user.admin?)
       end
 
-      # Only organization admins can destroy a conference
-      def user_can_destroy_conference?
-        return unless permission_action.action == :destroy &&
-                      permission_action.subject == :conference
-
-        toggle_allow(user.admin?)
-      end
-
       # Only organization admins can read a conference registrations
       def user_can_read_conference_registrations?
         return unless permission_action.action == :read_conference_registrations &&
@@ -212,6 +212,13 @@ module Decidim
         toggle_allow(user.admin?)
       end
 
+      def user_can_confirm_conference_registration?
+        return unless permission_action.action == :confirm &&
+                      permission_action.subject == :conference_registration
+
+        toggle_allow(user.admin?)
+      end
+
       # Everyone can read the conference list
       def user_can_read_conference_list?
         return unless read_conference_list_permission_action?
@@ -241,14 +248,12 @@ module Decidim
 
       # Process admins can eprform everything *inside* that conference. They cannot
       # create a conference or perform actions on conference groups or other
-      # conferences. They cannot destroy their conference either.
+      # conferences.
       def conference_admin_action?
         return unless can_manage_conference?(role: :admin)
         return if user.admin?
         return disallow! if permission_action.action == :create &&
                             permission_action.subject == :conference
-        return disallow! if permission_action.action == :destroy &&
-                            permission_action.subject == :conference
 
         is_allowed = [
           :attachment,
@@ -262,6 +267,7 @@ module Decidim
           :conference_speaker,
           :partner,
           :media_link,
+          :registration_type,
           :conference_invite
         ].include?(permission_action.subject)
         allow! if is_allowed
@@ -283,6 +289,7 @@ module Decidim
           :media_link,
           :conference_invite,
           :partner,
+          :registration_type,
           :read_conference_registrations,
           :export_conference_registrations
         ].include?(permission_action.subject)

data/app/presenters/decidim/conference_speaker_presenter.rb

@@ -29,6 +29,10 @@ module Decidim
       user ? true : false
     end
 
+    def has_tooltip?
+      false
+    end
+
     private
 
     def user

data/app/presenters/decidim/conferences/admin_log/conference_registration_presenter.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Conferences::ConferenceRegistration`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    ConferenceRegistrationPresenter.new(action_log, view_helpers).present
+      class ConferenceRegistrationPresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            confirmed_at: :date
+          }
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.conferences.conference_registration"
+        end
+
+        def action_string
+          case action
+          when "confirm"
+            "decidim.admin_log.conferences.conference_registration.#{action}"
+          else
+            super
+          end
+        end
+
+        def has_diff?
+          action == "delete" || super
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/conferences/admin_log/conferences_presenter.rb

@@ -29,7 +29,9 @@ module Decidim
             subtitle: :i18n,
             title: :i18n,
             start_date: :date,
-            end_date: :date
+            end_date: :date,
+            sign_date: :date,
+            signature_name: :string
           }
         end
 
@@ -39,7 +41,7 @@ module Decidim
 
         def action_string
           case action
-          when "create", "publish", "unpublish", "update"
+          when "create", "publish", "unpublish", "update", "update_diploma"
             "decidim.admin_log.conference.#{action}"
           else
             super

data/app/presenters/decidim/conferences/admin_log/partner_presenter.rb

@@ -21,7 +21,7 @@ module Decidim
             partner_type: :string,
             link: :string,
             weight: :integer,
-            log: :string
+            logo: :string
           }
         end
 

data/app/presenters/decidim/conferences/admin_log/registration_type_presenter.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    module AdminLog
+      # This class holds the logic to present a `Decidim::Conferences::RegistrationType`
+      # for the `AdminLog` log.
+      #
+      # Usage should be automatic and you shouldn't need to call this class
+      # directly, but here's an example:
+      #
+      #    action_log = Decidim::ActionLog.last
+      #    view_helpers # => this comes from the views
+      #    RegistrationTypePresenter.new(action_log, view_helpers).present
+      class RegistrationTypePresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            title: :i18n,
+            description: :i18n,
+            price: :integer
+          }
+        end
+
+        def i18n_labels_scope
+          "activemodel.attributes.conferences.registration_type"
+        end
+
+        def action_string
+          case action
+          when "create", "delete", "update"
+            "decidim.admin_log.conferences.registration_type.#{action}"
+          else
+            super
+          end
+        end
+
+        def has_diff?
+          action == "delete" || super
+        end
+      end
+    end
+  end
+end

data/app/serializers/decidim/conferences/conference_registration_serializer.rb

@@ -10,6 +10,10 @@ module Decidim
           user: {
             name: resource.user.name,
             email: resource.user.email
+          },
+          registration_type: {
+            title: resource.registration_type.title,
+            price: resource.registration_type.price
           }
         }
       end

data/app/serializers/decidim/conferences/data_portability_conference_invite_serializer.rb

@@ -14,6 +14,10 @@ module Decidim
             name: resource.user.name,
             email: resource.user.email
           },
+          registration_type: {
+            title: resource.registration_type.title,
+            price: resource.registration_type.price
+          },
           conference: {
             title: resource.conference.title,
             reference: resource.conference.reference,

data/app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb

@@ -11,6 +11,10 @@ module Decidim
             name: resource.user.name,
             email: resource.user.email
           },
+          registration_type: {
+            title: resource.registration_type.title,
+            price: resource.registration_type.price
+          },
           conference: {
             title: resource.conference.title,
             reference: resource.conference.reference,

data/app/uploaders/decidim/conferences/diploma_uploader.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Conferences
+    # This class deals with uploading the conference partner logo.
+    class DiplomaUploader < ImageUploader
+      version :thumb do
+        process resize_to_fit: [275, 90]
+      end
+    end
+  end
+end

data/app/views/decidim/conferences/admin/conference_invites/_form.html.erb

@@ -25,6 +25,14 @@
         end %>
     </div>
   </div>
+  <div class="grid-x grid-margin-x">
+    <div class="auto cell">
+      <%= form.select :registration_type_id,
+                      options_for_select(@form.registration_types_for_select),
+                      { include_blank: false },
+                      { multiple: false, class: "chosen-select" } %>
+    </div>
+  </div>
 </div>
 
 <%= javascript_include_tag "decidim/conferences/admin/conference_invite_form" %>

data/app/views/decidim/conferences/admin/conference_invites/index.html.erb

@@ -53,6 +53,7 @@
             <th><%= t("models.conference_invite.fields.email", scope: "decidim.conferences") %></th>
             <th><%= t("models.conference_invite.fields.sent_at", scope: "decidim.conferences") %></th>
             <th><%= t("models.conference_invite.fields.status", scope: "decidim.conferences") %></th>
+            <th><%= t("models.conference_invite.fields.registration_type", scope: "decidim.conferences") %></th>
           </tr>
         </thead>
         <tbody>
@@ -73,6 +74,9 @@
               <td class="<%= presenter.status_html_class %>">
                 <%= presenter.status %>
               </td>
+              <td>
+                <%= translated_attribute(invite.registration_type.title) %>
+              </td>
             </tr>
           <% end %>
         </tbody>