decidim-meetings 0.5.1 → 0.6.0

data/db/migrate/20170810120836_add_registration_attributes_to_meetings.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddRegistrationAttributesToMeetings < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_meetings_meetings, :registrations_enabled, :boolean, null: false, default: false
+    add_column :decidim_meetings_meetings, :available_slots, :integer, null: false, default: 0
+    add_column :decidim_meetings_meetings, :registration_terms, :jsonb
+  end
+end

data/db/migrate/20170810131100_create_registrations.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateRegistrations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :decidim_meetings_registrations do |t|
+      t.references :decidim_user, null: false, index: true
+      t.references :decidim_meeting, null: false, index: true
+
+      t.timestamps
+    end
+
+    add_index :decidim_meetings_registrations, [:decidim_user_id, :decidim_meeting_id], unique: true, name: "decidim_meetings_registrations_user_meeting_unique"
+  end
+end

data/lib/decidim/meetings/admin_engine.rb

@@ -13,6 +13,11 @@ module Decidim
       routes do
         resources :meetings do
           resources :meeting_closes, only: [:edit, :update]
+          resource :registrations, only: [:edit, :update] do
+            collection do
+              get :export
+            end
+          end
           resources :attachments
         end
         root to: "meetings#index"
@@ -21,6 +26,10 @@ module Decidim
       def load_seed
         nil
       end
+
+      initializer "decidim_meetings.assets" do |app|
+        app.config.assets.precompile += %w(admin/decidim_meetings_manifest.js)
+      end
     end
   end
 end

data/lib/decidim/meetings/engine.rb

@@ -3,6 +3,7 @@
 require "searchlight"
 require "kaminari"
 require "jquery-tmpl-rails"
+require "icalendar"
 
 module Decidim
   module Meetings
@@ -14,10 +15,17 @@ module Decidim
 
       routes do
         resources :meetings, only: [:index, :show] do
+          resource :registration, only: [:create, :destroy]
           resource :meeting_widget, only: :show, path: "embed"
         end
         root to: "meetings#index"
       end
+
+      initializer "decidim_meetings.inject_abilities_to_user" do |_app|
+        Decidim.configure do |config|
+          config.abilities += ["Decidim::Meetings::Abilities::CurrentUserAbility"]
+        end
+      end
     end
   end
 end

data/lib/decidim/meetings/feature.rb

@@ -23,27 +23,31 @@ Decidim.register_feature(:meetings) do |feature|
     meetings.count
   end
 
+  feature.actions = %w(join)
+
   feature.settings(:global) do |settings|
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :comments_enabled, type: :boolean, default: true
   end
 
   feature.settings(:step) do |settings|
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :comments_blocked, type: :boolean, default: false
   end
 
-  feature.seeds do |process|
+  feature.seeds do |participatory_space|
     feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(process.organization.available_locales, :meetings).i18n_name,
+      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name,
       published_at: Time.current,
       manifest_name: :meetings,
-      participatory_process: process
+      participatory_space: participatory_space
     )
 
-    if process.scope
-      scopes = process.scope.descendants
-      global = process.scope
+    if participatory_space.scope
+      scopes = participatory_space.scope.descendants
+      global = participatory_space.scope
     else
-      scopes = process.organization.scopes
+      scopes = participatory_space.organization.scopes
       global = nil
     end
 
@@ -51,7 +55,7 @@ Decidim.register_feature(:meetings) do |feature|
       meeting = Decidim::Meetings::Meeting.create!(
         feature: feature,
         scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
-        category: process.categories.sample,
+        category: participatory_space.categories.sample,
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
@@ -62,8 +66,34 @@ Decidim.register_feature(:meetings) do |feature|
         end_time: 3.weeks.from_now + 4.hours,
         address: "#{Faker::Address.street_address} #{Faker::Address.zip} #{Faker::Address.city}",
         latitude: Faker::Address.latitude,
-        longitude: Faker::Address.longitude
+        longitude: Faker::Address.longitude,
+        registrations_enabled: [true, false].sample,
+        available_slots: (10..50).step(10).to_a.sample,
+        registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end
       )
+
+      10.times do |n|
+        email = "meeting-registered-user-#{meeting.id}-#{n}@example.org"
+        name = "#{Faker::Name.name} #{meeting.id} #{n}"
+        user = Decidim::User.find_or_initialize_by(email: email)
+
+        user.update!(
+          password: "password1234",
+          password_confirmation: "password1234",
+          name: name,
+          organization: feature.organization,
+          tos_agreement: "1",
+          confirmed_at: Time.current
+        )
+
+        Decidim::Meetings::Registration.create!(
+          meeting: meeting,
+          user: user
+        )
+      end
+
       Decidim::Attachment.create!(
         title: Decidim::Faker::Localized.sentence(2),
         description: Decidim::Faker::Localized.sentence(5),

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

@@ -20,5 +20,16 @@ FactoryGirl.define do
       attending_organizations { Array.new(3) { Faker::GameOfThrones.house }.join(", ") }
       closed_at { Time.current }
     end
+
+    trait :with_registrations_enabled do
+      registrations_enabled { true }
+      available_slots { 10 }
+      registration_terms { Decidim::Faker::Localized.sentence(3) }
+    end
+  end
+
+  factory :registration, class: Decidim::Meetings::Registration do
+    meeting
+    user
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rectify
   requirement: !ruby/object:Gem::Requirement
@@ -110,62 +110,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: icalendar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: decidim-participatory_processes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: decidim-results
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 description: A meetings component for decidim's participatory processes.
 email:
 - josepjaume@gmail.com
@@ -177,25 +205,43 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
+- app/assets/config/admin/decidim_meetings_manifest.js
 - app/assets/images/decidim/meetings/icon.svg
+- app/assets/javascripts/decidim/meetings/admin/registrations_form.js.es6
 - app/commands/decidim/meetings/admin/close_meeting.rb
 - app/commands/decidim/meetings/admin/create_meeting.rb
 - app/commands/decidim/meetings/admin/update_meeting.rb
+- app/commands/decidim/meetings/admin/update_registrations.rb
+- app/commands/decidim/meetings/join_meeting.rb
+- app/commands/decidim/meetings/leave_meeting.rb
 - app/controllers/decidim/meetings/admin/application_controller.rb
 - app/controllers/decidim/meetings/admin/attachments_controller.rb
 - app/controllers/decidim/meetings/admin/meeting_closes_controller.rb
 - app/controllers/decidim/meetings/admin/meetings_controller.rb
+- app/controllers/decidim/meetings/admin/registrations_controller.rb
 - app/controllers/decidim/meetings/application_controller.rb
 - app/controllers/decidim/meetings/meeting_widgets_controller.rb
 - app/controllers/decidim/meetings/meetings_controller.rb
+- app/controllers/decidim/meetings/registrations_controller.rb
+- app/events/decidim/meetings/close_meeting_event.rb
+- app/events/decidim/meetings/meeting_registrations_enabled_event.rb
+- app/events/decidim/meetings/meeting_registrations_over_percentage_event.rb
+- app/events/decidim/meetings/upcoming_meeting_event.rb
+- app/events/decidim/meetings/update_meeting_event.rb
 - app/forms/decidim/meetings/admin/close_meeting_form.rb
 - app/forms/decidim/meetings/admin/meeting_form.rb
+- app/forms/decidim/meetings/admin/meeting_registrations_form.rb
 - app/helpers/decidim/meetings/admin/application_helper.rb
 - app/helpers/decidim/meetings/application_helper.rb
 - app/helpers/decidim/meetings/map_helper.rb
 - app/helpers/decidim/meetings/meetings_helper.rb
+- app/jobs/decidim/meetings/upcoming_meeting_notification_job.rb
+- app/mailers/decidim/meetings/registration_mailer.rb
+- app/models/decidim/meetings/abilities/current_user_ability.rb
 - app/models/decidim/meetings/application_record.rb
 - app/models/decidim/meetings/meeting.rb
+- app/models/decidim/meetings/registration.rb
+- app/serializers/decidim/meetings/registration_serializer.rb
 - app/services/decidim/meetings/meeting_search.rb
 - app/views/decidim/meetings/admin/meeting_closes/_form.html.erb
 - app/views/decidim/meetings/admin/meeting_closes/edit.html.erb
@@ -203,16 +249,19 @@ files:
 - app/views/decidim/meetings/admin/meetings/edit.html.erb
 - app/views/decidim/meetings/admin/meetings/index.html.erb
 - app/views/decidim/meetings/admin/meetings/new.html.erb
+- app/views/decidim/meetings/admin/registrations/_form.html.erb
+- app/views/decidim/meetings/admin/registrations/edit.html.erb
 - app/views/decidim/meetings/meeting_widgets/show.html.erb
 - app/views/decidim/meetings/meetings/_datetime.html.erb
 - app/views/decidim/meetings/meetings/_filters.html.erb
 - app/views/decidim/meetings/meetings/_filters_small_view.html.erb
 - app/views/decidim/meetings/meetings/_linked_meetings.html.erb
 - app/views/decidim/meetings/meetings/_meetings.html.erb
+- app/views/decidim/meetings/meetings/_registration_confirm.html.erb
 - app/views/decidim/meetings/meetings/index.html.erb
 - app/views/decidim/meetings/meetings/index.js.erb
 - app/views/decidim/meetings/meetings/show.html.erb
-- config/i18n-tasks.yml
+- app/views/decidim/meetings/registration_mailer/confirmation.html.erb
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -222,6 +271,7 @@ files:
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
+- config/locales/uk.yml
 - db/migrate/20161130121354_create_meetings.rb
 - db/migrate/20170110142105_close_a_meeting.rb
 - db/migrate/20170123151650_add_latitude_and_longitude_to_meetings.rb
@@ -229,6 +279,8 @@ files:
 - db/migrate/20170215132546_add_reference_to_meetings.rb
 - db/migrate/20170410074252_remove_not_null_reference_meetings.rb
 - db/migrate/20170612101925_migrate_meetings_category.rb
+- db/migrate/20170810120836_add_registration_attributes_to_meetings.rb
+- db/migrate/20170810131100_create_registrations.rb
 - lib/decidim/meetings.rb
 - lib/decidim/meetings/admin.rb
 - lib/decidim/meetings/admin_engine.rb

data/config/i18n-tasks.yml

@@ -1,10 +0,0 @@
-base_locale: en
-ignore_unused:
-- "decidim.features.meetings.name"
-- "decidim.features.meetings.settings.*"
-- "activemodel.attributes.*"
-- "decidim.resource_links.*"
-ignore_missing:
-  - decidim.scopes.global
-search:
-  strict: false