decidim-conferences 0.15.2 → 0.16.0

data/db/migrate/20181023142325_add_conference_registration_types.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddConferenceRegistrationTypes < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_conferences_registration_types do |t|
+      t.references :decidim_conference, index: { name: "idx_registration_types_on_decidim_conference_id" }
+      t.jsonb :title, null: false
+      t.jsonb :description, null: false
+      t.decimal :price, null: false, default: 0, precision: 8, scale: 2
+      t.integer :weight, null: false, default: 0
+      t.datetime :published_at, index: true
+
+      t.timestamps
+    end
+
+    create_table :decidim_conferences_conference_meeting_registration_types do |t|
+      t.belongs_to :registration_type, null: false, index: { name: "index_meetings_on_decidim_registration_type_id" }
+      t.belongs_to :conference_meeting, null: false, index: { name: "index_registrations_on_decidim_conference_meeting_id" }
+    end
+  end
+end

data/db/migrate/20181030090202_add_reference_registration_type_to_conference_registration.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddReferenceRegistrationTypeToConferenceRegistration < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_conferences_conference_registrations, :decidim_conference_registration_type_id,
+               :integer, index: { name: "idx_conference_registration_to_registration_type_id" }
+    add_column :decidim_conferences_conference_registrations, :confirmed_at, :datetime, index: true
+  end
+end

data/db/migrate/20181030153614_add_registration_type_to_conference_invite.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddRegistrationTypeToConferenceInvite < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_conferences_conference_invites, :decidim_conference_registration_type_id,
+               :integer, index: { name: "idx_conference_invite_to_registration_type_id" }
+  end
+end

data/db/migrate/20181106092826_add_diploma_fields_to_conference.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class AddDiplomaFieldsToConference < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_conferences, :signature_name, :string
+    add_column :decidim_conferences, :signature, :string
+    add_column :decidim_conferences, :main_logo, :string
+    add_column :decidim_conferences, :sign_date, :date, index: true
+    add_column :decidim_conferences, :diploma_sent_at, :datetime, index: true
+  end
+end

data/db/migrate/20181123124424_make_price_optional_conference_registration_type.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class MakePriceOptionalConferenceRegistrationType < ActiveRecord::Migration[5.2]
+  def change
+    change_column_null(:decidim_conferences_registration_types, :price, true)
+  end
+end

data/lib/decidim/conferences/admin_engine.rb

@@ -14,18 +14,32 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
-        resources :conferences, param: :slug, except: :show do
+        resources :conferences, param: :slug, except: [:show, :destroy] do
           resource :publish, controller: "conference_publications", only: [:create, :destroy]
           resources :copies, controller: "conference_copies", only: [:new, :create]
           resources :speakers, controller: "conference_speakers"
           resources :partners, controller: "partners", except: [:show]
           resources :media_links, controller: "media_links"
+          resources :registration_types, controller: "registration_types" do
+            resource :publish, controller: "registration_type_publications", only: [:create, :destroy]
+            collection do
+              get :conference_meetings
+            end
+          end
           resources :conference_invites, only: [:index, :new, :create]
           resources :conference_registrations, only: :index do
+            member do
+              post :confirm
+            end
             collection do
               get :export
             end
           end
+          resource :diploma, only: [:edit, :update] do
+            member do
+              post :send, to: "diplomas#send_diplomas"
+            end
+          end
           resources :user_roles, controller: "conference_user_roles" do
             member do
               post :resend_invitation, to: "conference_user_roles#resend_invitation"
@@ -75,7 +89,7 @@ module Decidim
         Decidim.menu :admin_menu do |menu|
           menu.item I18n.t("menu.conferences", scope: "decidim.admin"),
                     decidim_admin_conferences.conferences_path,
-                    icon_name: "dial",
+                    icon_name: "microphone",
                     position: 3.5,
                     active: :inclusive,
                     if: allowed_to?(:enter, :space_area, space_name: :conferences)

data/lib/decidim/conferences/engine.rb

@@ -3,6 +3,7 @@
 require "rails"
 require "active_support/all"
 require "decidim/core"
+require "wicked_pdf"
 
 module Decidim
   module Conferences
@@ -22,13 +23,16 @@ module Decidim
         }, constraints: { conference_id: /[0-9]+/ }
 
         resources :conferences, only: [:index, :show], param: :slug, path: "conferences" do
+          get :user, to: "conferences#user_diploma"
           resources :conference_speakers, only: :index, path: "speakers"
           resources :conference_program, only: :show, path: "program"
           resource :conference_widget, only: :show, path: "embed"
-          resource :conference_registration, only: [:create, :destroy] do
-            collection do
-              get :create
-              get :decline_invitation
+          resources :registration_types, only: :index, path: "registration" do
+            resource :conference_registration, only: [:create, :destroy] do
+              collection do
+                get :create
+                get :decline_invitation
+              end
             end
           end
           resources :media, only: :index

data/lib/decidim/conferences/participatory_space.rb

@@ -169,6 +169,17 @@ Decidim.register_participatory_space(:conferences) do |participatory_space|
         )
       end
 
+      5.times do
+        Decidim::Conferences::RegistrationType.create!(
+          title: Decidim::Faker::Localized.sentence(2),
+          description: Decidim::Faker::Localized.sentence(5),
+          weight: Faker::Number.between(1, 10),
+          price: Faker::Number.between(1, 300),
+          published_at: 2.weeks.ago,
+          conference: conference
+        )
+      end
+
       Decidim.component_manifests.each do |manifest|
         manifest.seed!(conference.reload)
       end

data/lib/decidim/conferences/test/factories.rb

@@ -35,6 +35,13 @@ FactoryBot.define do
     trait :published do
       published_at { Time.current }
     end
+
+    trait :diploma do
+      main_logo { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
+      signature { Decidim::Dev.test_file("avatar.jpg", "image/jpeg") }
+      sign_date { 5.days.from_now }
+      signature_name { "Signature name" }
+    end
   end
 
   factory :conference_user_role, class: "Decidim::ConferenceUserRole" do
@@ -104,9 +111,37 @@ FactoryBot.define do
     end
   end
 
+  factory :registration_type, class: "Decidim::Conferences::RegistrationType" do
+    conference
+
+    title { generate_localized_title }
+    description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    published_at { Time.current }
+    price { Faker::Number.between(1, 300) }
+    weight { Faker::Number.between(1, 10) }
+
+    trait :unpublished do
+      published_at { nil }
+    end
+
+    trait :published do
+      published_at { Time.current }
+    end
+  end
+
   factory :conference_registration, class: "Decidim::Conferences::ConferenceRegistration" do
     conference
     user
+    registration_type
+    confirmed_at { Time.current }
+
+    trait :confirmed do
+      confirmed_at { Time.current }
+    end
+
+    trait :unconfirmed do
+      confirmed_at { nil }
+    end
   end
 
   factory :conference_invite, class: "Decidim::Conferences::ConferenceInvite" do
@@ -115,6 +150,7 @@ FactoryBot.define do
     sent_at { Time.current - 1.day }
     accepted_at { nil }
     rejected_at { nil }
+    registration_type
 
     trait :accepted do
       accepted_at { Time.current }

data/lib/decidim/conferences/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-conferences version.
   module Conferences
     def self.version
-      "0.15.2"
+      "0.16.0"
     end
   end
 end

metadata

@@ -1,71 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: decidim-conferences
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.a
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.a
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-meetings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.a
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.a
+        version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: wicked_pdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: wkhtmltopdf-binary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.a
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.a
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.a
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.a
+        version: 0.16.0
 description: Conferences component for decidim.
 email:
 - isaac.mg@coditramuntana.com
@@ -92,9 +120,6 @@ files:
 - app/cells/decidim/conferences/conference_speaker_cell.rb
 - app/cells/decidim/conferences/content_blocks/highlighted_conferences/show.erb
 - app/cells/decidim/conferences/content_blocks/highlighted_conferences_cell.rb
-- app/cells/decidim/conferences/join_conference_button/registration_confirm.erb
-- app/cells/decidim/conferences/join_conference_button/show.erb
-- app/cells/decidim/conferences/join_conference_button_cell.rb
 - app/cells/decidim/conferences/linked_participatory_spaces/show.erb
 - app/cells/decidim/conferences/linked_participatory_spaces_cell.rb
 - app/cells/decidim/conferences/media_link/show.erb
@@ -105,25 +130,37 @@ files:
 - app/cells/decidim/conferences/photo_cell.rb
 - app/cells/decidim/conferences/photos_list/show.erb
 - app/cells/decidim/conferences/photos_list_cell.rb
+- app/cells/decidim/conferences/registration_type/join_conference.erb
+- app/cells/decidim/conferences/registration_type/registration_confirm.erb
+- app/cells/decidim/conferences/registration_type/show.erb
+- app/cells/decidim/conferences/registration_type_cell.rb
+- app/commands/decidim/conferences/admin/confirm_conference_registration.rb
 - app/commands/decidim/conferences/admin/copy_conference.rb
 - app/commands/decidim/conferences/admin/create_conference.rb
 - app/commands/decidim/conferences/admin/create_conference_admin.rb
 - app/commands/decidim/conferences/admin/create_conference_speaker.rb
 - app/commands/decidim/conferences/admin/create_media_link.rb
 - app/commands/decidim/conferences/admin/create_partner.rb
+- app/commands/decidim/conferences/admin/create_registration_type.rb
 - app/commands/decidim/conferences/admin/destroy_conference_admin.rb
 - app/commands/decidim/conferences/admin/destroy_conference_speaker.rb
 - app/commands/decidim/conferences/admin/destroy_media_link.rb
 - app/commands/decidim/conferences/admin/destroy_partner.rb
+- app/commands/decidim/conferences/admin/destroy_registration_type.rb
 - app/commands/decidim/conferences/admin/export_conference_registrations.rb
 - app/commands/decidim/conferences/admin/invite_user_to_join_conference.rb
 - app/commands/decidim/conferences/admin/publish_conference.rb
+- app/commands/decidim/conferences/admin/publish_registration_type.rb
+- app/commands/decidim/conferences/admin/send_conference_diplomas.rb
 - app/commands/decidim/conferences/admin/unpublish_conference.rb
+- app/commands/decidim/conferences/admin/unpublish_registration_type.rb
 - app/commands/decidim/conferences/admin/update_conference.rb
 - app/commands/decidim/conferences/admin/update_conference_admin.rb
 - app/commands/decidim/conferences/admin/update_conference_speaker.rb
+- app/commands/decidim/conferences/admin/update_diploma.rb
 - app/commands/decidim/conferences/admin/update_media_link.rb
 - app/commands/decidim/conferences/admin/update_partner.rb
+- app/commands/decidim/conferences/admin/update_registration_type.rb
 - app/commands/decidim/conferences/decline_invitation.rb
 - app/commands/decidim/conferences/join_conference.rb
 - app/commands/decidim/conferences/leave_conference.rb
@@ -144,10 +181,13 @@ files:
 - app/controllers/decidim/conferences/admin/conference_speakers_controller.rb
 - app/controllers/decidim/conferences/admin/conference_user_roles_controller.rb
 - app/controllers/decidim/conferences/admin/conferences_controller.rb
+- app/controllers/decidim/conferences/admin/diplomas_controller.rb
 - app/controllers/decidim/conferences/admin/exports_controller.rb
 - app/controllers/decidim/conferences/admin/media_links_controller.rb
 - app/controllers/decidim/conferences/admin/moderations_controller.rb
 - app/controllers/decidim/conferences/admin/partners_controller.rb
+- app/controllers/decidim/conferences/admin/registration_type_publications_controller.rb
+- app/controllers/decidim/conferences/admin/registration_types_controller.rb
 - app/controllers/decidim/conferences/application_controller.rb
 - app/controllers/decidim/conferences/conference_program_controller.rb
 - app/controllers/decidim/conferences/conference_registrations_controller.rb
@@ -155,6 +195,8 @@ files:
 - app/controllers/decidim/conferences/conference_widgets_controller.rb
 - app/controllers/decidim/conferences/conferences_controller.rb
 - app/controllers/decidim/conferences/media_controller.rb
+- app/controllers/decidim/conferences/registration_types_controller.rb
+- app/events/decidim/conferences/conference_registration_notification_event.rb
 - app/events/decidim/conferences/conference_registrations_enabled_event.rb
 - app/events/decidim/conferences/conference_registrations_over_percentage_event.rb
 - app/events/decidim/conferences/upcoming_conference_event.rb
@@ -164,15 +206,20 @@ files:
 - app/forms/decidim/conferences/admin/conference_registration_invite_form.rb
 - app/forms/decidim/conferences/admin/conference_speaker_form.rb
 - app/forms/decidim/conferences/admin/conference_user_role_form.rb
+- app/forms/decidim/conferences/admin/diploma_form.rb
 - app/forms/decidim/conferences/admin/media_link_form.rb
 - app/forms/decidim/conferences/admin/partner_form.rb
+- app/forms/decidim/conferences/admin/registration_type_form.rb
 - app/helpers/decidim/conferences/admin/conference_speakers_helper.rb
 - app/helpers/decidim/conferences/admin/conferences_helper.rb
+- app/helpers/decidim/conferences/conference_helper.rb
 - app/helpers/decidim/conferences/conference_program_helper.rb
 - app/helpers/decidim/conferences/media_attachments_helper.rb
 - app/helpers/decidim/conferences/partners_helper.rb
+- app/jobs/decidim/conferences/admin/send_conference_diploma_job.rb
 - app/jobs/decidim/conferences/upcoming_conference_notification_job.rb
 - app/mailers/decidim/conferences/admin/invite_join_conference_mailer.rb
+- app/mailers/decidim/conferences/admin/send_conference_diploma_mailer.rb
 - app/mailers/decidim/conferences/conference_registration_mailer.rb
 - app/models/decidim/conference.rb
 - app/models/decidim/conference_meeting.rb
@@ -180,19 +227,23 @@ files:
 - app/models/decidim/conference_speaker_conference_meeting.rb
 - app/models/decidim/conference_user_role.rb
 - app/models/decidim/conferences/conference_invite.rb
+- app/models/decidim/conferences/conference_meeting_registration_type.rb
 - app/models/decidim/conferences/conference_registration.rb
 - app/models/decidim/conferences/media_link.rb
 - app/models/decidim/conferences/partner.rb
+- app/models/decidim/conferences/registration_type.rb
 - app/permissions/decidim/conferences/permissions.rb
 - app/presenters/decidim/admin/conference_speaker_presenter.rb
 - app/presenters/decidim/conference_meeting_presenter.rb
 - app/presenters/decidim/conference_speaker_presenter.rb
 - app/presenters/decidim/conferences/admin_log/conference_invite_presenter.rb
+- app/presenters/decidim/conferences/admin_log/conference_registration_presenter.rb
 - app/presenters/decidim/conferences/admin_log/conference_speaker_presenter.rb
 - app/presenters/decidim/conferences/admin_log/conferences_presenter.rb
 - app/presenters/decidim/conferences/admin_log/conferences_user_role_presenter.rb
 - app/presenters/decidim/conferences/admin_log/media_link_presenter.rb
 - app/presenters/decidim/conferences/admin_log/partner_presenter.rb
+- app/presenters/decidim/conferences/admin_log/registration_type_presenter.rb
 - app/presenters/decidim/conferences/admin_log/value_types/role_presenter.rb
 - app/presenters/decidim/conferences/conference_invite_presenter.rb
 - app/presenters/decidim/conferences/conference_stats_presenter.rb
@@ -213,6 +264,7 @@ files:
 - app/serializers/decidim/conferences/conference_registration_serializer.rb
 - app/serializers/decidim/conferences/data_portability_conference_invite_serializer.rb
 - app/serializers/decidim/conferences/data_portability_conference_registration_serializer.rb
+- app/uploaders/decidim/conferences/diploma_uploader.rb
 - app/uploaders/decidim/conferences/partner_logo_uploader.rb
 - app/views/decidim/conference_speakers/_conference_speaker.html.erb
 - app/views/decidim/conferences/_conference.html.erb
@@ -235,6 +287,8 @@ files:
 - app/views/decidim/conferences/admin/conferences/edit.html.erb
 - app/views/decidim/conferences/admin/conferences/index.html.erb
 - app/views/decidim/conferences/admin/conferences/new.html.erb
+- app/views/decidim/conferences/admin/diplomas/_form.html.erb
+- app/views/decidim/conferences/admin/diplomas/edit.html.erb
 - app/views/decidim/conferences/admin/invite_join_conference_mailer/invite.html.erb
 - app/views/decidim/conferences/admin/media_links/_form.html.erb
 - app/views/decidim/conferences/admin/media_links/edit.html.erb
@@ -244,13 +298,19 @@ files:
 - app/views/decidim/conferences/admin/partners/edit.html.erb
 - app/views/decidim/conferences/admin/partners/index.html.erb
 - app/views/decidim/conferences/admin/partners/new.html.erb
+- app/views/decidim/conferences/admin/registration_types/_form.html.erb
+- app/views/decidim/conferences/admin/registration_types/edit.html.erb
+- app/views/decidim/conferences/admin/registration_types/index.html.erb
+- app/views/decidim/conferences/admin/registration_types/new.html.erb
+- app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma.html.erb
+- app/views/decidim/conferences/admin/send_conference_diploma_mailer/diploma_user.html.erb
 - app/views/decidim/conferences/conference_program/_program_item.html.erb
 - app/views/decidim/conferences/conference_program/_program_meeting.html.erb
 - app/views/decidim/conferences/conference_program/show.html.erb
 - app/views/decidim/conferences/conference_registration_mailer/confirmation.html.erb
+- app/views/decidim/conferences/conference_registration_mailer/pending_validation.html.erb
 - app/views/decidim/conferences/conference_speakers/index.html.erb
 - app/views/decidim/conferences/conference_widgets/show.html.erb
-- app/views/decidim/conferences/conferences/_conferences_sidebar.html.erb
 - app/views/decidim/conferences/conferences/_partners.html.erb
 - app/views/decidim/conferences/conferences/_promoted_conference.html.erb
 - app/views/decidim/conferences/conferences/_statistics.html.erb
@@ -258,6 +318,8 @@ files:
 - app/views/decidim/conferences/conferences/show.html.erb
 - app/views/decidim/conferences/media/_attachments.html.erb
 - app/views/decidim/conferences/media/index.html.erb
+- app/views/decidim/conferences/registration_types/index.html.erb
+- app/views/decidim/conferences/shared/_conference_user_login.html.erb
 - app/views/devise/mailer/join_conference.html.erb
 - app/views/devise/mailer/join_conference.text.erb
 - app/views/layouts/decidim/_conference_hero.html.erb
@@ -265,6 +327,8 @@ files:
 - app/views/layouts/decidim/admin/conference.html.erb
 - app/views/layouts/decidim/admin/conferences.html.erb
 - app/views/layouts/decidim/conference.html.erb
+- app/views/layouts/decidim/diploma.html.erb
+- config/initializers/wicked_pdf.rb
 - config/locales/ca.yml
 - config/locales/de.yml
 - config/locales/en.yml
@@ -294,6 +358,11 @@ files:
 - db/migrate/20181004144411_add_conferences_partner.rb
 - db/migrate/20181010133930_add_relation_between_speaker_and_meeting.rb
 - db/migrate/20181015100301_add_conference_media_link.rb
+- db/migrate/20181023142325_add_conference_registration_types.rb
+- db/migrate/20181030090202_add_reference_registration_type_to_conference_registration.rb
+- db/migrate/20181030153614_add_registration_type_to_conference_invite.rb
+- db/migrate/20181106092826_add_diploma_fields_to_conference.rb
+- db/migrate/20181123124424_make_price_optional_conference_registration_type.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -326,7 +395,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim conferences module