decidim-meetings 0.23.3 → 0.24.1

data/lib/decidim/meetings/engine.rb

@@ -18,6 +18,9 @@ module Decidim
 
       routes do
         resources :meetings, only: [:index, :show, :new, :create, :edit, :update] do
+          resources :meeting_closes, only: [:edit, :update] do
+            get :proposals_picker, on: :collection
+          end
           resource :registration, only: [:create, :destroy] do
             collection do
               get :create
@@ -38,23 +41,6 @@ module Decidim
           view_context.cell("decidim/meetings/highlighted_meetings", view_context.current_participatory_space)
         end
 
-        if defined? Decidim::ParticipatoryProcesses
-          Decidim::ParticipatoryProcesses.view_hooks.register(:process_group_highlighted_elements, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
-            published_components = Decidim::Component.where(participatory_space: view_context.participatory_processes).published
-            meetings = Decidim::Meetings::Meeting.where(component: published_components)
-
-            next unless meetings.any?
-
-            view_context.render(
-              partial: "decidim/participatory_processes/participatory_process_groups/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
-
         # This view hook is used in card cells. It renders the next upcoming
         # meeting for the given participatory space.
         Decidim.view_hooks.register(:upcoming_meeting_for_card, priority: Decidim::ViewHooks::LOW_PRIORITY) do |view_context|

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

@@ -25,7 +25,7 @@ FactoryBot.define do
     description { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     location { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
     location_hints { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
-    address { Faker::Lorem.sentence(3) }
+    address { Faker::Lorem.sentence(word_count: 3) }
     latitude { Faker::Address.latitude }
     longitude { Faker::Address.longitude }
     start_time { 1.day.from_now }
@@ -34,12 +34,25 @@ FactoryBot.define do
     transparent { true }
     questionnaire { build(:questionnaire) }
     registration_form_enabled { true }
+    registration_terms { Decidim::Faker::Localized.wrapped("<p>", "</p>") { generate_localized_title } }
+    registration_type { :on_this_platform }
+    type_of_meeting { :in_person }
     component { build(:component, manifest_name: "meetings") }
 
     author do
       component.try(:organization)
     end
 
+    trait :online do
+      type_of_meeting { :online }
+      online_meeting_url { "https://decidim.org" }
+    end
+
+    trait :hybrid do
+      type_of_meeting { :hybrid }
+      online_meeting_url { "https://decidim.org" }
+    end
+
     trait :official do
       author { component.organization if component }
     end
@@ -86,11 +99,11 @@ FactoryBot.define do
 
     trait :past do
       start_time { end_time.ago(2.hours) }
-      end_time { Faker::Time.between(10.days.ago, 1.day.ago) }
+      end_time { Faker::Time.between(from: 10.days.ago, to: 1.day.ago) }
     end
 
     trait :upcoming do
-      start_time { Faker::Time.between(1.day.from_now, 10.days.from_now) }
+      start_time { Faker::Time.between(from: 1.day.from_now, to: 10.days.from_now) }
     end
   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.23.3"
+      "0.24.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.23.3
+  version: 0.24.1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells-erb
@@ -46,42 +46,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
-- !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: icalendar
   requirement: !ruby/object:Gem::Requirement
@@ -150,56 +136,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.3
+        version: 0.24.1
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -220,6 +206,9 @@ files:
 - app/assets/javascripts/decidim/meetings/admin/registrations_form.js.es6
 - app/assets/javascripts/decidim/meetings/admin/registrations_invite_form.es6
 - app/assets/javascripts/decidim/meetings/meetings_form.js.es6
+- app/cells/decidim/meetings/content_blocks/highlighted_meetings/elements.erb
+- app/cells/decidim/meetings/content_blocks/highlighted_meetings/heading.erb
+- app/cells/decidim/meetings/content_blocks/highlighted_meetings_cell.rb
 - 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
@@ -231,6 +220,8 @@ files:
 - app/cells/decidim/meetings/join_meeting_button_cell.rb
 - app/cells/decidim/meetings/meeting_activity_cell.rb
 - app/cells/decidim/meetings/meeting_cell.rb
+- app/cells/decidim/meetings/meeting_highlighted_list_item/show.erb
+- app/cells/decidim/meetings/meeting_highlighted_list_item_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/address.erb
@@ -243,8 +234,12 @@ files:
 - app/cells/decidim/meetings/meeting_m_cell.rb
 - app/cells/decidim/meetings/meeting_s/show.erb
 - app/cells/decidim/meetings/meeting_s_cell.rb
+- app/cells/decidim/meetings/meeting_url/show.erb
+- app/cells/decidim/meetings/meeting_url_cell.rb
 - app/cells/decidim/meetings/meetings_map/show.erb
 - app/cells/decidim/meetings/meetings_map_cell.rb
+- app/cells/decidim/meetings/reported_content/show.erb
+- app/cells/decidim/meetings/reported_content_cell.rb
 - app/commands/decidim/meetings/admin/close_meeting.rb
 - app/commands/decidim/meetings/admin/copy_meeting.rb
 - app/commands/decidim/meetings/admin/create_agenda.rb
@@ -258,6 +253,7 @@ files:
 - app/commands/decidim/meetings/admin/update_minutes.rb
 - app/commands/decidim/meetings/admin/update_registrations.rb
 - app/commands/decidim/meetings/admin/validate_registration_code.rb
+- app/commands/decidim/meetings/close_meeting.rb
 - app/commands/decidim/meetings/create_meeting.rb
 - app/commands/decidim/meetings/decline_invitation.rb
 - app/commands/decidim/meetings/join_meeting.rb
@@ -277,6 +273,7 @@ files:
 - 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_closes_controller.rb
 - app/controllers/decidim/meetings/meetings_controller.rb
 - app/controllers/decidim/meetings/registrations_controller.rb
 - app/controllers/decidim/meetings/versions_controller.rb
@@ -299,6 +296,7 @@ files:
 - app/forms/decidim/meetings/admin/meeting_service_form.rb
 - app/forms/decidim/meetings/admin/minutes_form.rb
 - app/forms/decidim/meetings/admin/validate_registration_code_form.rb
+- app/forms/decidim/meetings/close_meeting_form.rb
 - app/forms/decidim/meetings/join_meeting_form.rb
 - app/forms/decidim/meetings/meeting_form.rb
 - app/helpers/decidim/meetings/admin/application_helper.rb
@@ -341,12 +339,6 @@ files:
 - app/services/decidim/meetings/calendar_renderer.rb
 - app/services/decidim/meetings/diff_renderer.rb
 - app/services/decidim/meetings/meeting_search.rb
-- app/types/decidim/meetings/agenda_item_type.rb
-- app/types/decidim/meetings/agenda_type.rb
-- app/types/decidim/meetings/meeting_type.rb
-- app/types/decidim/meetings/meetings_type.rb
-- app/types/decidim/meetings/minutes_type.rb
-- app/types/decidim/meetings/service_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
@@ -378,6 +370,9 @@ files:
 - app/views/decidim/meetings/directory/meetings/_meetings.html.erb
 - app/views/decidim/meetings/directory/meetings/index.html.erb
 - app/views/decidim/meetings/directory/meetings/index.js.erb
+- app/views/decidim/meetings/meeting_closes/_form.html.erb
+- app/views/decidim/meetings/meeting_closes/edit.html.erb
+- app/views/decidim/meetings/meeting_closes/proposals_picker.html.erb
 - app/views/decidim/meetings/meetings/_count.html.erb
 - app/views/decidim/meetings/meetings/_datetime.html.erb
 - app/views/decidim/meetings/meetings/_filters.html.erb
@@ -387,6 +382,7 @@ files:
 - app/views/decidim/meetings/meetings/_meeting_agenda.html.erb
 - app/views/decidim/meetings/meetings/_meeting_minutes.html.erb
 - app/views/decidim/meetings/meetings/_meetings.html.erb
+- app/views/decidim/meetings/meetings/_online_meeting_link.html.erb
 - app/views/decidim/meetings/meetings/edit.html.erb
 - app/views/decidim/meetings/meetings/index.html.erb
 - app/views/decidim/meetings/meetings/index.js.erb
@@ -395,8 +391,6 @@ files:
 - app/views/decidim/meetings/registration_mailer/confirmation.html.erb
 - app/views/decidim/meetings/versions/index.html.erb
 - app/views/decidim/meetings/versions/show.html.erb
-- 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/_upcoming_meeting_for_card.html.erb
 - app/views/devise/mailer/join_meeting.html.erb
@@ -498,9 +492,19 @@ files:
 - db/migrate/20200702123209_create_meeting_services_table.rb
 - db/migrate/20200702123210_move_meeting_services_to_own_model.rb
 - db/migrate/20200827153856_add_commentable_counter_cache_to_meetings.rb
+- db/migrate/20201006140511_add_online_meeting_url.rb
+- db/migrate/20201009124057_add_type_of_meeting.rb
 - db/migrate/20201016065302_fix_meetings_registration_terms.rb
+- db/migrate/20201016112641_add_registration_type_and_url_to_meetings.rb
 - db/migrate/20201111133246_add_salt_to_decidim_meetings.rb
+- db/migrate/20210310120731_add_followable_counter_cache_to_meetings.rb
+- lib/decidim/api/agenda_item_type.rb
+- lib/decidim/api/agenda_type.rb
 - lib/decidim/api/linked_resources_interface.rb
+- lib/decidim/api/meeting_type.rb
+- lib/decidim/api/meetings_type.rb
+- lib/decidim/api/minutes_type.rb
+- lib/decidim/api/service_type.rb
 - lib/decidim/api/services_interface.rb
 - lib/decidim/meetings.rb
 - lib/decidim/meetings/admin.rb
@@ -530,14 +534,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim meetings module

data/app/types/decidim/meetings/agenda_item_type.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Meetings
-    AgendaItemType = GraphQL::ObjectType.define do
-      name "MeetingAgendaItem"
-      description "A meeting agenda item"
-
-      field :id, !types.ID, "The ID for this agenda item"
-      field :title, Decidim::Core::TranslatedFieldType, "The title for this agenda item"
-      field :description, Decidim::Core::TranslatedFieldType, "The description for this agenda item"
-      field :items, !types[AgendaItemType], "Sub-items (children) of this agenda item", property: :agenda_item_children
-      field :parent, AgendaItemType, "Parent agenda item, if available"
-      field :agenda, AgendaType, "Belonging agenda"
-      field :duration, !types.Int, "Duration in number of minutes for this item in this agenda"
-      field :position, !types.Int, "Order position for this agenda item"
-
-      field :createdAt, Decidim::Core::DateTimeType do
-        description "The date and time this agenda item was created"
-        property :created_at
-      end
-      field :updatedAt, Decidim::Core::DateTimeType do
-        description "The date and time this agenda item was updated"
-        property :updated_at
-      end
-    end
-  end
-end

data/app/types/decidim/meetings/agenda_type.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Meetings
-    AgendaType = GraphQL::ObjectType.define do
-      name "MeetingAgenda"
-      description "A meeting agenda"
-
-      field :id, !types.ID, "The ID for the agenda"
-      field :title, Decidim::Core::TranslatedFieldType, "The title for the agenda"
-      field :items, !types[AgendaItemType], "Items and sub-items of the agenda", property: :agenda_items
-      # probably useful in the future, when handling user permissions
-      # field :visible, !types.Boolean, "Whether this minutes is public or not", property: :visible
-
-      field :createdAt, Decidim::Core::DateTimeType do
-        description "The date and time this agenda was created"
-        property :created_at
-      end
-      field :updatedAt, Decidim::Core::DateTimeType do
-        description "The date and time this agenda was updated"
-        property :updated_at
-      end
-    end
-  end
-end

data/app/types/decidim/meetings/meeting_type.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Meetings
-    MeetingType = GraphQL::ObjectType.define do
-      name "Meeting"
-      description "A meeting"
-
-      interfaces [
-        -> { Decidim::Comments::CommentableInterface },
-        -> { Decidim::Core::CategorizableInterface },
-        -> { Decidim::Core::ScopableInterface },
-        -> { Decidim::Core::AttachableInterface },
-        -> { Decidim::Core::TimestampsInterface },
-        -> { Decidim::Meetings::ServicesInterface },
-        -> { Decidim::Meetings::LinkedResourcesInterface },
-        -> { Decidim::Forms::QuestionnaireEntityInterface }
-      ]
-
-      field :id, !types.ID, "ID of this meeting"
-      field :reference, !types.String, "Reference for this meeting"
-      field :title, !Decidim::Core::TranslatedFieldType, "The title of this meeting."
-      field :description, Decidim::Core::TranslatedFieldType, "The description of this meeting."
-      field :startTime, !Decidim::Core::DateTimeType, "The time this meeting starts", property: :start_time
-      field :endTime, !Decidim::Core::DateTimeType, "The time this meeting ends", property: :end_time
-      field :author, Decidim::Core::AuthorInterface, "If specified, the author of this meeting"
-      field :agenda, AgendaType, "Agenda for this meeting, if available" do
-        resolve ->(meeting, _args, _ctx) {
-          meeting.agenda if meeting.agenda&.visible?
-        }
-      end
-
-      field :closed, !types.Boolean, "Whether this meeting is closed or not.", property: :closed?
-      field :closingReport, Decidim::Core::TranslatedFieldType, "The closing report of this meeting.", property: :closing_report
-      field :attendingOrganizations, types.String, "list of attending organizations", property: :attending_organizations
-      field :attendeeCount, types.Int, "Amount of attendees to this meeting", property: :attendees_count
-      field :contributionCount, types.Int, "Amount of contributions to this meeting", property: :contributions_count
-      field :minutes, MinutesType, "Minutes for this meeting, if available" do
-        resolve ->(meeting, _args, _ctx) {
-          meeting.minutes if meeting.minutes&.visible?
-        }
-      end
-      field :privateMeeting, !types.Boolean, "Whether the meeting is private or not (it can only be true if transparent)", property: :private_meeting
-      field :transparent, !types.Boolean, "For private meetings, information is public if transparent", property: :transparent
-      field :registrationsEnabled, !types.Boolean, "Whether the registrations are enabled or not", property: :registrations_enabled
-      field :registrationTerms, Decidim::Core::TranslatedFieldType, "The registration terms", property: :registration_terms
-      field :remainingSlots, types.Int, "Amount of slots available for this meeting", property: :remaining_slots
-      field :registrationFormEnabled, !types.Boolean, "Whether the registrations have a form or not", property: :registration_form_enabled
-      field :registrationForm, Decidim::Forms::QuestionnaireType do
-        description "If registration requires to fill a form, this is the questionnaire"
-        resolve ->(meeting, _args, _ctx) {
-          meeting.questionnaire if meeting.registration_form_enabled?
-        }
-      end
-      field :location, Decidim::Core::TranslatedFieldType, "The location of this meeting (free format)"
-      field :locationHints, Decidim::Core::TranslatedFieldType, "The location of this meeting (free format)", property: :location_hints
-      field :address, types.String, "The physical address of this meeting (used for geolocation)"
-      field :coordinates, Decidim::Core::CoordinatesType, "Physical coordinates for this meeting" do
-        resolve ->(meeting, _args, _ctx) {
-          [meeting.latitude, meeting.longitude]
-        }
-      end
-    end
-  end
-end