decidim-meetings 0.15.2 → 0.16.0

data/config/locales/uk.yml

@@ -94,10 +94,13 @@ uk:
     events:
       meetings:
         meeting_closed:
-          email_intro: 'Зустріч "%{resource_title}" було завершено. Ви можете ознайомитися з підсумками на сторінці зустрічі:'
-          email_outro: Ви отримали це сповіщення, оскільки ви стежите за зустріччю "%{resource_title}". Ви можете припинити стежити за нею, перейшовши за наведеним вище посиланням.
-          email_subject: Зустріч "%{resource_title}" було завершено
-          notification_title: Зустріч <a href="%{resource_path}">%{resource_title}</a> було завершено.
+          affected_user:
+            email_subject: Зустріч "%{resource_title}" було завершено
+            notification_title: Зустріч <a href="%{resource_path}">%{resource_title}</a> було завершено.
+          follower:
+            email_intro: 'Зустріч "%{resource_title}" було завершено. Ви можете ознайомитися з підсумками на сторінці зустрічі:'
+            email_subject: Зустріч "%{resource_title}" було завершено
+            notification_title: Зустріч <a href="%{resource_path}">%{resource_title}</a> було завершено.
         meeting_created:
           email_intro: До "%{participatory_space_title}", за яким ви стежите, була додана зустріч "%{resource_title}".
           email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{participatory_space_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
@@ -114,9 +117,7 @@ uk:
           email_subject: Зустріч "%{resource_title}" було оновлено
           notification_title: Зустріч <a href="%{resource_path}">%{resource_title}</a> було оновлено.
         registration_code_validated:
-          email_intro: Ваш реєстраційний код "%{registration_code}" підтверджено.
           email_outro: Ви отримали це повідомлення, оскільки ваш реєстраційний код для зустрічі "%{resource_title}" підтверджено.
-          email_subject: Ваш реєстраційний код "%{registration_code}" підтверджено
           notification_title: Ваш реєстраційний код "%{registration_code}" для зустрічі <a href="%{resource_path}">%{resource_title}</a> підтверджено.
         registrations_enabled:
           email_intro: 'Розпочалася реєстрація на зустріч "%{resource_title}". Ви можете зареєструватися на сторінці:'
@@ -263,11 +264,6 @@ uk:
           form:
             available_slots_help: Залиште це число нульовим, якщо у вас не обмежена кількість місць.
             invites: Запрошення
-            registrations_count:
-              one: Зареєструвалась 1 людина.
-              few: Зареєструвалось %{count} людей.
-              many: Зареєструвалось %{count} людей.
-              other: Зареєструвалось %{count} людей.
             reserved_slots_help: Залиште його 0, якщо у вас немає заброньованих місць
             reserved_slots_less_than: Має бути меншим або рівним %{count}
           update:
@@ -378,7 +374,6 @@ uk:
     participatory_spaces:
       highlighted_meetings:
         past_meetings: Минулі зустрічі
-        see_all_meetings: Переглянути всі зустрічі
         upcoming_meetings: Прийдешні зустрічі
       upcoming_meeting_for_card:
         upcoming_meeting: Прийдешня зустріч

data/db/migrate/20180801150031_add_registration_form_enabled_to_decidim_meetings.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddRegistrationFormEnabledToDecidimMeetings < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_meetings_meetings, :registration_form_enabled, :boolean, default: false
+  end
+end

data/db/migrate/20181107175558_add_questionnaire_to_existing_meetings.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddQuestionnaireToExistingMeetings < ActiveRecord::Migration[5.2]
+  def change
+    Decidim::Meetings::Meeting.transaction do
+      Decidim::Meetings::Meeting.find_each do |meeting|
+        if meeting.questionnaire.blank?
+          meeting.update!(
+            questionnaire: Decidim::Forms::Questionnaire.new
+          )
+        end
+      end
+    end
+  end
+end

data/lib/decidim/meetings.rb

@@ -11,5 +11,6 @@ module Decidim
   # Base module for this engine.
   module Meetings
     autoload :Registrations, "decidim/meetings/registrations"
+    autoload :MeetingSerializer, "decidim/meetings/meeting_serializer"
   end
 end

data/lib/decidim/meetings/admin_engine.rb

@@ -16,6 +16,7 @@ module Decidim
           resources :meeting_closes, only: [:edit, :update]
           resource :registrations, only: [:edit, :update] do
             resources :invites, only: [:index, :create]
+            resource :form, only: [:edit, :update], controller: "registration_form"
             collection do
               get :export
               post :validate_registration_code

data/lib/decidim/meetings/component.rb

@@ -20,6 +20,7 @@ Decidim.register_component(:meetings) do |component|
     resource.template = "decidim/meetings/meetings/linked_meetings"
     resource.card = "decidim/meetings/meeting"
     resource.actions = %w(join)
+    resource.searchable = true
   end
 
   component.register_stat :meetings_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
@@ -29,6 +30,19 @@ Decidim.register_component(:meetings) do |component|
     meetings.count
   end
 
+  component.exports :meetings do |exports|
+    exports.collection do |component_instance|
+      Decidim::Meetings::Meeting
+        .visible
+        .where(component: component_instance)
+        .includes(component: { participatory_space: :organization })
+    end
+
+    exports.include_in_open_data = true
+
+    exports.serializer Decidim::Meetings::MeetingSerializer
+  end
+
   component.actions = %w(join)
 
   component.settings(:global) do |settings|
@@ -36,6 +50,7 @@ Decidim.register_component(:meetings) do |component|
     settings.attribute :default_registration_terms, type: :text, translated: true, editor: true
     settings.attribute :comments_enabled, type: :boolean, default: true
     settings.attribute :resources_permissions_enabled, type: :boolean, default: true
+    settings.attribute :enable_pads_creation, type: :boolean, default: false
   end
 
   component.settings(:step) do |settings|
@@ -107,6 +122,17 @@ Decidim.register_component(:meetings) do |component|
         visibility: "all"
       )
 
+      Decidim::Forms::Questionnaire.create!(
+        title: Decidim::Faker::Localized.paragraph,
+        description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(3)
+        end,
+        tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+          Decidim::Faker::Localized.paragraph(2)
+        end,
+        questionnaire_for: meeting
+      )
+
       2.times do |n|
         email = "meeting-registered-user-#{meeting.id}-#{n}@example.org"
         name = "#{Faker::Name.name} #{meeting.id} #{n}"

data/lib/decidim/meetings/directory_engine.rb

@@ -13,6 +13,7 @@ module Decidim
 
       routes do
         resources :meetings, only: [:index], format: :html
+        get "/calendar", to: "meetings#calendar"
         root to: "meetings#index", format: :html
       end
 

data/lib/decidim/meetings/engine.rb

@@ -22,27 +22,19 @@ module Decidim
             collection do
               get :create
               get :decline_invitation
+              get :join, action: :show
+              post :answer
             end
           end
           resource :meeting_widget, only: :show, path: "embed"
         end
         root to: "meetings#index"
+        resource :calendar, only: [:show], format: :text
       end
 
       initializer "decidim_meetings.view_hooks" do
         Decidim.view_hooks.register(:participatory_space_highlighted_elements, 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)
-            }
-          )
+          view_context.cell("decidim/meetings/highlighted_meetings", view_context.current_participatory_space)
         end
 
         if defined? Decidim::ParticipatoryProcesses
@@ -63,18 +55,7 @@ module Decidim
         end
 
         Decidim.view_hooks.register(:current_participatory_space_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)
-            }
-          )
+          view_context.cell("decidim/meetings/highlighted_meetings", view_context.current_participatory_space)
         end
 
         # This view hook is used in card cells. It renders the next upcoming
@@ -124,12 +105,20 @@ module Decidim
       end
 
       initializer "decidim_meetings.register_metrics" do
-        Decidim.metrics_registry.register(
-          :meetings,
-          "Decidim::Meetings::Metrics::MeetingsMetricManage",
-          Decidim::MetricRegistry::NOT_HIGHLIGHTED,
-          5
-        )
+        Decidim.metrics_registry.register(:meetings) do |metric_registry|
+          metric_registry.manager_class = "Decidim::Meetings::Metrics::MeetingsMetricManage"
+
+          metric_registry.settings do |settings|
+            settings.attribute :highlighted, type: :boolean, default: false
+            settings.attribute :scopes, type: :array, default: %w(home participatory_process)
+            settings.attribute :weight, type: :integer, default: 5
+            settings.attribute :stat_block, type: :string, default: "small"
+          end
+        end
+
+        Decidim.metrics_operation.register(:followers, :meetings) do |metric_operation|
+          metric_operation.manager_class = "Decidim::Meetings::Metrics::MeetingFollowersMetricMeasure"
+        end
       end
 
       initializer "decidim_meetings.assets" do |app|

data/lib/decidim/meetings/meeting_serializer.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This class serializes a Meeting so can be exported to CSV, JSON or other
+    # formats.
+    class MeetingSerializer < Decidim::Exporters::Serializer
+      include Decidim::ApplicationHelper
+      include Decidim::ResourceHelper
+
+      # Public: Initializes the serializer with a meeting.
+      def initialize(meeting)
+        @meeting = meeting
+      end
+
+      # Public: Exports a hash with the serialized data for this meeting.
+      def serialize
+        {
+          id: meeting.id,
+          category: {
+            id: meeting.category.try(:id),
+            name: meeting.category.try(:name)
+          },
+          scope: {
+            id: meeting.scope.try(:id),
+            name: meeting.scope.try(:name)
+          },
+          participatory_space: {
+            id: meeting.participatory_space.id,
+            url: Decidim::ResourceLocatorPresenter.new(meeting.participatory_space).url
+          },
+          component: { id: component.id },
+          title: meeting.title,
+          description: meeting.description,
+          start_time: meeting.start_time.to_s(:db),
+          end_time: meeting.end_time.to_s(:db),
+          attendees: meeting.attendees_count.to_i,
+          contributions: meeting.contributions_count.to_i,
+          organizations: meeting.attending_organizations,
+          address: meeting.address,
+          location: meeting.location,
+          reference: meeting.reference,
+          comments: meeting.comments.count,
+          attachments: meeting.attachments.count,
+          followers: meeting.followers.count,
+          url: url,
+          related_proposals: related_proposals,
+          related_results: related_results
+        }
+      end
+
+      private
+
+      attr_reader :meeting
+
+      def component
+        meeting.component
+      end
+
+      def related_proposals
+        meeting.linked_resources(:proposals, "proposals_from_meeting").map do |proposal|
+          Decidim::ResourceLocatorPresenter.new(proposal).url
+        end
+      end
+
+      def related_results
+        meeting.linked_resources(:results, "meetings_through_proposals").map do |result|
+          Decidim::ResourceLocatorPresenter.new(result).url
+        end
+      end
+
+      def url
+        Decidim::ResourceLocatorPresenter.new(meeting).url
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/factories"
+require "decidim/forms/test/factories"
 require "decidim/participatory_processes/test/factories"
 require "decidim/assemblies/test/factories"
 
@@ -29,6 +30,8 @@ FactoryBot.define do
         { title: generate_localized_title, description: generate_localized_title }
       ]
     end
+    questionnaire { build(:questionnaire) }
+    registration_form_enabled { true }
     component { build(:component, manifest_name: "meetings") }
 
     organizer do

data/lib/decidim/meetings/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 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: cells-erb
@@ -46,14 +46,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: decidim-forms
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -130,56 +144,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.0
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -200,6 +214,10 @@ files:
 - app/assets/javascripts/decidim/meetings/admin/registrations_invite_form.es6
 - app/cells/decidim/meetings/content_blocks/upcoming_events/show.erb
 - app/cells/decidim/meetings/content_blocks/upcoming_events_cell.rb
+- app/cells/decidim/meetings/highlighted_meetings/show.erb
+- app/cells/decidim/meetings/highlighted_meetings_cell.rb
+- app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb
+- app/cells/decidim/meetings/highlighted_meetings_for_component_cell.rb
 - app/cells/decidim/meetings/join_meeting_button/registration_confirm.erb
 - app/cells/decidim/meetings/join_meeting_button/show.erb
 - app/cells/decidim/meetings/join_meeting_button_cell.rb
@@ -244,14 +262,17 @@ files:
 - app/controllers/decidim/meetings/admin/meeting_copies_controller.rb
 - app/controllers/decidim/meetings/admin/meetings_controller.rb
 - app/controllers/decidim/meetings/admin/minutes_controller.rb
+- app/controllers/decidim/meetings/admin/registration_form_controller.rb
 - app/controllers/decidim/meetings/admin/registrations_controller.rb
 - app/controllers/decidim/meetings/application_controller.rb
+- app/controllers/decidim/meetings/calendars_controller.rb
 - app/controllers/decidim/meetings/directory/meetings_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/create_meeting_event.rb
+- app/events/decidim/meetings/meeting_registration_notification_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/registration_code_validated_event.rb
@@ -293,13 +314,20 @@ files:
 - app/presenters/decidim/meetings/log/resource_presenter.rb
 - app/presenters/decidim/meetings/meeting_presenter.rb
 - app/queries/decidim/meetings/admin/invites.rb
+- app/queries/decidim/meetings/metrics/meeting_followers_metric_measure.rb
 - app/queries/decidim/meetings/metrics/meetings_metric_manage.rb
 - app/serializers/decidim/meetings/data_portability_invite_serializer.rb
 - app/serializers/decidim/meetings/data_portability_registration_serializer.rb
 - app/serializers/decidim/meetings/registration_serializer.rb
+- app/services/decidim/meetings/calendar/base_calendar.rb
+- app/services/decidim/meetings/calendar/component_calendar.rb
+- app/services/decidim/meetings/calendar/meeting_to_event.rb
+- app/services/decidim/meetings/calendar/organization_calendar.rb
+- app/services/decidim/meetings/calendar_renderer.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/_calendar_modal.html.erb
 - app/views/decidim/meetings/admin/agenda/_agenda_item.html.erb
 - app/views/decidim/meetings/admin/agenda/_agenda_item_child.html.erb
 - app/views/decidim/meetings/admin/agenda/_agenda_item_fields.html.erb
@@ -343,8 +371,6 @@ files:
 - app/views/decidim/participatory_processes/participatory_process_groups/_highlighted_meetings.html.erb
 - app/views/decidim/participatory_processes/participatory_process_groups/_meeting.html.erb
 - app/views/decidim/participatory_spaces/_conference_venues.html.erb
-- app/views/decidim/participatory_spaces/_highlighted_meetings.html.erb
-- app/views/decidim/participatory_spaces/_meeting.html.erb
 - app/views/decidim/participatory_spaces/_upcoming_meeting_for_card.html.erb
 - app/views/devise/mailer/join_meeting.html.erb
 - app/views/devise/mailer/join_meeting.text.erb
@@ -389,7 +415,9 @@ files:
 - db/migrate/20180607142020_create_decidim_meetings_invites.rb
 - db/migrate/20180615160839_add_code_to_decidim_meetings_registrations.rb
 - db/migrate/20180711111023_add_validated_at_to_decidim_meetings_registrations.rb
+- db/migrate/20180801150031_add_registration_form_enabled_to_decidim_meetings.rb
 - db/migrate/20180809134748_add_upcoming_events_as_content_block.rb
+- db/migrate/20181107175558_add_questionnaire_to_existing_meetings.rb
 - lib/decidim/meetings.rb
 - lib/decidim/meetings/admin.rb
 - lib/decidim/meetings/admin_engine.rb
@@ -397,6 +425,7 @@ files:
 - lib/decidim/meetings/directory.rb
 - lib/decidim/meetings/directory_engine.rb
 - lib/decidim/meetings/engine.rb
+- lib/decidim/meetings/meeting_serializer.rb
 - lib/decidim/meetings/registrations.rb
 - lib/decidim/meetings/registrations/code_generator.rb
 - lib/decidim/meetings/seeds/Exampledocument.pdf
@@ -423,7 +452,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 meetings module