decidim-meetings 0.10.1 → 0.11.0.pre1

data/config/locales/uk.yml

@@ -26,9 +26,6 @@ uk:
         meeting_closed:
           email_intro: 'Зустріч "%{resource_title}" було завершено. Ви можете ознайомитися з підсумками на сторінці зустрічі:'
           email_outro: Ви отримали це сповіщення, оскільки ви стежите за зустріччю "%{resource_title}". Ви можете припинити стежити за нею, перейшовши за наведеним вище посиланням.
-    features:
-      meetings:
-        name: Зустрічі
     meetings:
       actions:
         attachment_collections: Збірки

data/db/migrate/20180305133634_rename_features_to_components_at_meetings.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class RenameFeaturesToComponentsAtMeetings < ActiveRecord::Migration[5.1]
+  def change
+    rename_column :decidim_meetings_meetings, :decidim_feature_id, :decidim_component_id
+
+    if index_name_exists?(:decidim_meetings_meetings, "index_decidim_meetings_meetings_on_decidim_feature_id")
+      rename_index :decidim_meetings_meetings, "index_decidim_meetings_meetings_on_decidim_feature_id", "index_decidim_meetings_meetings_on_decidim_component_id"
+    end
+  end
+end

data/db/migrate/20180326082611_add_fields_for_registrations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddFieldsForRegistrations < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_meetings_meetings, :reserved_slots, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20180407110934_add_services_to_meetings.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddServicesToMeetings < ActiveRecord::Migration[5.1]
+  def change
+    add_column :decidim_meetings_meetings, :services, :jsonb, default: []
+  end
+end

data/lib/decidim/meetings.rb

@@ -3,10 +3,11 @@
 require "decidim/meetings/admin"
 require "decidim/meetings/engine"
 require "decidim/meetings/admin_engine"
-require "decidim/meetings/feature"
+require "decidim/meetings/component"
 
 module Decidim
   # Base module for this engine.
   module Meetings
+    autoload :ViewModel, "decidim/meetings/view_model"
   end
 end

data/lib/decidim/meetings/admin_engine.rb

@@ -21,6 +21,7 @@ module Decidim
           end
           resources :attachment_collections
           resources :attachments
+          resources :copies, controller: "meeting_copies", only: [:new, :create]
         end
         root to: "meetings#index"
       end

data/lib/decidim/meetings/{feature.rb → component.rb}

@@ -1,43 +1,47 @@
 # frozen_string_literal: true
 
-require "decidim/features/namer"
+require "decidim/components/namer"
 
-Decidim.register_feature(:meetings) do |feature|
-  feature.engine = Decidim::Meetings::Engine
-  feature.admin_engine = Decidim::Meetings::AdminEngine
-  feature.icon = "decidim/meetings/icon.svg"
+Decidim.register_component(:meetings) do |component|
+  component.engine = Decidim::Meetings::Engine
+  component.admin_engine = Decidim::Meetings::AdminEngine
+  component.icon = "decidim/meetings/icon.svg"
+  component.card = "decidim/meetings/meeting"
 
-  feature.on(:before_destroy) do |instance|
-    raise StandardError, "Can't remove this feature" if Decidim::Meetings::Meeting.where(feature: instance).any?
+  component.query_type = "Decidim::Meetings::MeetingsType"
+
+  component.on(:before_destroy) do |instance|
+    raise StandardError, "Can't remove this component" if Decidim::Meetings::Meeting.where(component: instance).any?
   end
 
-  feature.register_resource do |resource|
+  component.register_resource do |resource|
     resource.model_class_name = "Decidim::Meetings::Meeting"
     resource.template = "decidim/meetings/meetings/linked_meetings"
   end
 
-  feature.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |features, start_at, end_at|
-    meetings = Decidim::Meetings::Meeting.where(feature: features)
+  component.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
+    meetings = Decidim::Meetings::Meeting.where(component: components)
     meetings = meetings.where("created_at >= ?", start_at) if start_at.present?
     meetings = meetings.where("created_at <= ?", end_at) if end_at.present?
     meetings.count
   end
 
-  feature.actions = %w(join)
+  component.actions = %w(join)
 
-  feature.settings(:global) do |settings|
+  component.settings(:global) do |settings|
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :default_registration_terms, type: :text, translated: true, editor: true
     settings.attribute :comments_enabled, type: :boolean, default: true
   end
 
-  feature.settings(:step) do |settings|
+  component.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 |participatory_space|
-    feature = Decidim::Feature.create!(
-      name: Decidim::Features::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name,
+  component.seeds do |participatory_space|
+    component = Decidim::Component.create!(
+      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name,
       published_at: Time.current,
       manifest_name: :meetings,
       participatory_space: participatory_space
@@ -53,7 +57,7 @@ Decidim.register_feature(:meetings) do |feature|
 
     2.times do
       meeting = Decidim::Meetings::Meeting.create!(
-        feature: feature,
+        component: component,
         scope: Faker::Boolean.boolean(0.5) ? global : scopes.sample,
         category: participatory_space.categories.sample,
         title: Decidim::Faker::Localized.sentence(2),
@@ -71,7 +75,11 @@ Decidim.register_feature(:meetings) do |feature|
         available_slots: (10..50).step(10).to_a.sample,
         registration_terms: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
           Decidim::Faker::Localized.paragraph(3)
-        end
+        end,
+        services: [
+          { title: Decidim::Faker::Localized.sentence(2), description: Decidim::Faker::Localized.sentence(5) },
+          { title: Decidim::Faker::Localized.sentence(2), description: Decidim::Faker::Localized.sentence(5) }
+        ]
       )
 
       2.times do |n|
@@ -84,7 +92,7 @@ Decidim.register_feature(:meetings) do |feature|
           password_confirmation: "password1234",
           name: name,
           nickname: Faker::Twitter.unique.screen_name,
-          organization: feature.organization,
+          organization: component.organization,
           tos_agreement: "1",
           confirmed_at: Time.current,
           personal_url: Faker::Internet.url,

data/lib/decidim/meetings/engine.rb

@@ -4,6 +4,9 @@ require "searchlight"
 require "kaminari"
 require "jquery-tmpl-rails"
 require "icalendar"
+require "cells/rails"
+require "cells-erb"
+require "cell/partial"
 
 module Decidim
   module Meetings
@@ -33,8 +36,8 @@ module Decidim
 
       initializer "decidim_meetings.view_hooks" do
         Decidim.view_hooks.register(:participatory_space_highlighted_elements, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
-          published_features = Decidim::Feature.where(participatory_space: view_context.current_participatory_space).published
-          meetings = Decidim::Meetings::Meeting.where(feature: published_features)
+          published_components = Decidim::Component.where(participatory_space: view_context.current_participatory_space).published
+          meetings = Decidim::Meetings::Meeting.where(component: published_components)
 
           next unless meetings.any?
 
@@ -49,8 +52,8 @@ module Decidim
 
         if defined? Decidim::ParticipatoryProcesses
           Decidim::ParticipatoryProcesses.view_hooks.register(:process_group_highlighted_elements, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
-            published_features = Decidim::Feature.where(participatory_space: view_context.participatory_processes).published
-            meetings = Decidim::Meetings::Meeting.where(feature: published_features)
+            published_components = Decidim::Component.where(participatory_space: view_context.participatory_processes).published
+            meetings = Decidim::Meetings::Meeting.where(component: published_components)
 
             next unless meetings.any?
 
@@ -63,6 +66,26 @@ module Decidim
             )
           end
         end
+
+        Decidim.view_hooks.register(:assembly_meetings, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
+          published_components = Decidim::Component.where(participatory_space: view_context.current_participatory_space).published
+          meetings = Decidim::Meetings::Meeting.where(component: published_components)
+
+          next unless meetings.any?
+
+          view_context.render(
+            partial: "decidim/participatory_spaces/highlighted_meetings",
+            locals: {
+              past_meetings: meetings.past.order(end_time: :desc, start_time: :desc).limit(3),
+              upcoming_meetings: meetings.upcoming.order(:start_time, :end_time).limit(3)
+            }
+          )
+        end
+      end
+
+      initializer "decidim_meetings.add_cells_view_paths" do
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Meetings::Engine.root}/app/cells")
+        Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Meetings::Engine.root}/app/views") # for partials
       end
     end
   end

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

@@ -4,8 +4,8 @@ require "decidim/core/test/factories"
 require "decidim/participatory_processes/test/factories"
 
 FactoryBot.define do
-  factory :meeting_feature, parent: :feature do
-    name { Decidim::Features::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name }
+  factory :meeting_component, parent: :component do
+    name { Decidim::Components::Namer.new(participatory_space.organization.available_locales, :meetings).i18n_name }
     manifest_name :meetings
     participatory_space { create(:participatory_process, :with_steps, organization: organization) }
   end
@@ -20,7 +20,13 @@ FactoryBot.define do
     longitude { Faker::Address.longitude }
     start_time { 1.day.from_now }
     end_time { start_time.advance(hours: 2) }
-    feature { build(:feature, manifest_name: "meetings") }
+    services do
+      [
+        { title: Decidim::Faker::Localized.sentence(2), description: Decidim::Faker::Localized.sentence(5) },
+        { title: Decidim::Faker::Localized.sentence(2), description: Decidim::Faker::Localized.sentence(5) }
+      ]
+    end
+    component { build(:component, manifest_name: "meetings") }
 
     trait :closed do
       closing_report { Decidim::Faker::Localized.sentence(3) }
@@ -33,6 +39,7 @@ FactoryBot.define do
     trait :with_registrations_enabled do
       registrations_enabled { true }
       available_slots { 10 }
+      reserved_slots { 4 }
       registration_terms { Decidim::Faker::Localized.sentence(3) }
     end
 

data/lib/decidim/meetings/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-meetings version.
   module Meetings
     def self.version
-      "0.10.1"
+      "0.11.0.pre1"
     end
   end
 end

data/lib/decidim/meetings/view_model.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class ViewModel < Decidim::ViewModel
+      include TranslatableAttributes
+      include LayoutHelper
+      include Decidim::Meetings::MeetingsHelper
+      include Decidim::SanitizeHelper
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0.pre1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,22 +10,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cells-erb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: cells-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -102,56 +130,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.1
+        version: 0.11.0.pre1
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -165,10 +193,19 @@ files:
 - Rakefile
 - app/assets/config/admin/decidim_meetings_manifest.js
 - app/assets/images/decidim/meetings/icon.svg
+- app/assets/javascripts/decidim/meetings/admin/meetings_form.js.es6
 - app/assets/javascripts/decidim/meetings/admin/registrations_form.js.es6
+- app/cells/decidim/meetings/meeting_cell.rb
+- app/cells/decidim/meetings/meeting_list_item/show.erb
+- app/cells/decidim/meetings/meeting_list_item_cell.rb
+- app/cells/decidim/meetings/meeting_m/header.erb
+- app/cells/decidim/meetings/meeting_m/show.erb
+- app/cells/decidim/meetings/meeting_m_cell.rb
 - app/commands/decidim/meetings/admin/close_meeting.rb
+- app/commands/decidim/meetings/admin/copy_meeting.rb
 - app/commands/decidim/meetings/admin/create_meeting.rb
 - app/commands/decidim/meetings/admin/destroy_meeting.rb
+- app/commands/decidim/meetings/admin/export_meeting_registrations.rb
 - app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb
 - app/commands/decidim/meetings/admin/update_meeting.rb
 - app/commands/decidim/meetings/admin/update_registrations.rb
@@ -179,6 +216,7 @@ files:
 - app/controllers/decidim/meetings/admin/attachments_controller.rb
 - app/controllers/decidim/meetings/admin/invites_controller.rb
 - app/controllers/decidim/meetings/admin/meeting_closes_controller.rb
+- app/controllers/decidim/meetings/admin/meeting_copies_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
@@ -192,9 +230,11 @@ files:
 - 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_copy_form.rb
 - app/forms/decidim/meetings/admin/meeting_form.rb
 - app/forms/decidim/meetings/admin/meeting_registration_invite_form.rb
 - app/forms/decidim/meetings/admin/meeting_registrations_form.rb
+- app/forms/decidim/meetings/admin/meeting_service_form.rb
 - app/helpers/decidim/meetings/admin/application_helper.rb
 - app/helpers/decidim/meetings/application_helper.rb
 - app/helpers/decidim/meetings/map_helper.rb
@@ -209,12 +249,18 @@ files:
 - app/presenters/decidim/meetings/admin_log/meeting_presenter.rb
 - app/serializers/decidim/meetings/registration_serializer.rb
 - app/services/decidim/meetings/meeting_search.rb
+- app/types/decidim/meetings/meeting_type.rb
+- app/types/decidim/meetings/meetings_type.rb
 - app/views/decidim/meetings/admin/invite_join_meeting_mailer/invite.html.erb
 - app/views/decidim/meetings/admin/invites/_form.html.erb
 - app/views/decidim/meetings/admin/invites/new.html.erb
 - app/views/decidim/meetings/admin/meeting_closes/_form.html.erb
 - app/views/decidim/meetings/admin/meeting_closes/edit.html.erb
+- app/views/decidim/meetings/admin/meeting_copies/_form.html.erb
+- app/views/decidim/meetings/admin/meeting_copies/new.html.erb
 - app/views/decidim/meetings/admin/meetings/_form.html.erb
+- app/views/decidim/meetings/admin/meetings/_service.html.erb
+- app/views/decidim/meetings/admin/meetings/_services.html.erb
 - 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
@@ -261,15 +307,19 @@ files:
 - db/migrate/20170612101925_migrate_meetings_category.rb
 - db/migrate/20170810120836_add_registration_attributes_to_meetings.rb
 - db/migrate/20170810131100_create_registrations.rb
+- db/migrate/20180305133634_rename_features_to_components_at_meetings.rb
+- db/migrate/20180326082611_add_fields_for_registrations.rb
+- db/migrate/20180407110934_add_services_to_meetings.rb
 - lib/decidim/meetings.rb
 - lib/decidim/meetings/admin.rb
 - lib/decidim/meetings/admin_engine.rb
+- lib/decidim/meetings/component.rb
 - lib/decidim/meetings/engine.rb
-- lib/decidim/meetings/feature.rb
 - lib/decidim/meetings/seeds/Exampledocument.pdf
 - lib/decidim/meetings/seeds/city.jpeg
 - lib/decidim/meetings/test/factories.rb
 - lib/decidim/meetings/version.rb
+- lib/decidim/meetings/view_model.rb
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
@@ -285,9 +335,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.3