decidim-meetings 0.19.0 → 0.22.0

data/config/locales/sl.yml

@@ -0,0 +1,10 @@
+sl:
+  activemodel:
+    attributes:
+      agenda:
+        description: Opis
+  decidim:
+    meetings:
+      meetings:
+        filters:
+          category_prompt: Izberi kategorijo

data/config/locales/sr-CS.yml

@@ -0,0 +1,13 @@
+sr:
+  decidim:
+    meetings:
+      admin:
+        registrations:
+          form:
+            recommendation_message: Zbog vaše privatnosti preporučujemo da obrišete ovaj prijavni formular kada vam više ne treba, obično 3 meseca nakon što se sastanak završio.
+      meetings:
+        show:
+          back: Nazad na listu
+      registrations:
+        create:
+          success: Uspešno ste se pridružili sastanku. Zbog toga što ste se registrovali za ovaj sastanak, bićete obavešteni ako bude nekih promena u vezi sa njim.

data/config/locales/sv.yml

@@ -102,7 +102,7 @@ sv:
             notification_title: Mötet <a href="%{resource_path}">%{resource_title}</a> stängdes.
         meeting_created:
           email_intro: Mötet "%{resource_title}" har lagts till i "%{participatory_space_title}" som du följer.
-          email_outro: Du har fått den här meddelandet eftersom du följer "%{participatory_space_title}". Du kan avfölja det vid föregående länk.
+          email_outro: Du har fått det här meddelandet eftersom du följer "%{participatory_space_title}". Du kan avfölja det vid föregående länk.
           email_subject: Nytt möte har lagts till i %{participatory_space_title}
           notification_title: Mötet <a href="%{resource_path}">%{resource_title}</a> har lagts till i %{participatory_space_title}
         meeting_registration_confirmed:
@@ -119,17 +119,17 @@ sv:
           notification_title: Mötet <a href="%{resource_path}">%{resource_title}</a> uppdaterades.
         registration_code_validated:
           email_intro: Din anmälningskod "%{registration_code}" till mötet "%{resource_title}" har validerats.
-          email_outro: Du har fått den här meddelandet eftersom din registreringskod för mötet "%{resource_title}" har validerats.
+          email_outro: Du har fått det här meddelandet eftersom din registreringskod för mötet "%{resource_title}" har validerats.
           email_subject: Din anmälningskod "%{registration_code}" till mötet "%{resource_title}" har validerats
           notification_title: Din registreringskod "%{registration_code}" för mötet <a href="%{resource_path}">%{resource_title}</a> har validerats.
         registrations_enabled:
           email_intro: 'Mötet "%{resource_title}" har aktiverat registreringar. Du kan registrera dig själv på dess sida:'
-          email_outro: Du har fått den här meddelandet eftersom du följer mötet "%{resource_title}". Du kan sluta följa det på föregående länk.
+          email_outro: Du har fått det här meddelandet eftersom du följer mötet "%{resource_title}". Du kan sluta följa det på föregående länk.
           email_subject: Mötet "%{resource_title}" har aktiverat registreringar.
           notification_title: Mötet <a href="%{resource_path}">%{resource_title}</a> har aktiverat registreringar.
         upcoming_meeting:
           email_intro: Mötet "%{resource_title}" börjar om mindre än 48 timmar.
-          email_outro: Du har fått den här meddelandet eftersom du följer mötet "%{resource_title}". Du kan sluta följa det på föregående länk.
+          email_outro: Du har fått det här meddelandet eftersom du följer mötet "%{resource_title}". Du kan sluta följa det på föregående länk.
           email_subject: Mötet "%{resource_title}" börjar om färre än 48 timmar.
           notification_title: Mötet <a href="%{resource_path}">%{resource_title}</a> startar inom mindre än 48 timmar.
     gamification:
@@ -238,6 +238,9 @@ sv:
           edit:
             update: Uppdatera
           form:
+            address_help: 'Adress: anger en plats för Geocoder'
+            location_help: 'Plats: meddelande till användarna som anger mötesplats'
+            location_hints_help: 'Detaljer om platsen: ytterligare information, som våning i byggnaden'
             select_organizer: Välj arrangören
           index:
             title: Möten
@@ -280,6 +283,7 @@ sv:
           form:
             available_slots_help: Lämna det till 0 om du har obegränsade platser.
             invites: Inbjudningar
+            recommendation_message: Av sekretessskäl rekommenderar vi att du tar bort detta inskriptionsformulär när du inte längre behöver det. Som standard är detta 3 månader efter att mötet avslutats.
             registration_form: Anmälningsformulär
             registrations_count:
               one: Det har gjorts %{count} anmälan.
@@ -365,7 +369,9 @@ sv:
           confirm: Bekräfta
         show:
           attendees: Antal deltagare
+          back: Tillbaka till listan
           contributions: Antal bidrag
+          date: Datum
           going: Jag kommer
           join: Gå med i mötet
           meeting_report: Mötesrapport
@@ -408,7 +414,7 @@ sv:
       registrations:
         create:
           invalid: Det gick inte att ansluta till mötet.
-          success: Du har gått med på mötet.
+          success: Du har gått med i mötet. Eftersom du har registrerat dig kommer du att få aviseringar om uppdateringar av mötet.
         decline_invitation:
           invalid: Det gick inte att avböja inbjudan.
           success: Du har avböjt inbjudan.

data/config/locales/uk.yml

@@ -303,9 +303,7 @@ uk:
           category: Категорія
           category_prompt: Оберіть категорію
           date: Дата
-          past: Минулі
           search: Шукати
-          upcoming: Прийдешні
         filters_small_view:
           close_modal: Закрити віконце
           filter: Відібрати

data/db/migrate/20200320105922_index_foreign_keys_in_decidim_meetings_registrations.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimMeetingsRegistrations < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_meetings_registrations, :decidim_user_group_id
+  end
+end

data/lib/decidim/api/linked_resources_interface.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This interface represents all linked resources available in the module meetings
+    LinkedResourcesInterface = GraphQL::InterfaceType.define do
+      name "MeetinsLinkedResourcewInterface"
+      description "An interface that can be used with Resourceable models."
+
+      field :proposalsFromMeeting, !types[Decidim::Proposals::ProposalType], "Proposals created in this meeting" do
+        resolve ->(meeting, _args, _ctx) {
+          meeting.linked_resources(:proposals, :proposals_from_meeting)
+        }
+      end
+    end
+  end
+end

data/lib/decidim/api/services_interface.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    # This interface represents a categorizable object.
+    ServicesInterface = GraphQL::InterfaceType.define do
+      name "ServicesInterface"
+      description "An interface that can be used with services."
+
+      field :services, !types[ServiceType], "The object's services" do
+        resolve ->(meeting, _args, _ctx) {
+          return [] unless meeting.services.respond_to? :map
+
+          meeting.services.map { |service| OpenStruct.new(service) }
+        }
+      end
+    end
+  end
+end

data/lib/decidim/meetings.rb

@@ -6,6 +6,7 @@ require "decidim/meetings/admin_engine"
 require "decidim/meetings/directory"
 require "decidim/meetings/directory_engine"
 require "decidim/meetings/component"
+require "decidim/meetings/api"
 
 module Decidim
   # Base module for this engine.

data/lib/decidim/meetings/admin_engine.rb

@@ -13,7 +13,9 @@ module Decidim
 
       routes do
         resources :meetings do
-          resources :meeting_closes, only: [:edit, :update]
+          resources :meeting_closes, only: [:edit, :update] do
+            get :proposals_picker, on: :collection
+          end
           resource :registrations, only: [:edit, :update] do
             resources :invites, only: [:index, :create]
             resource :form, only: [:edit, :update], controller: "registration_form"

data/lib/decidim/meetings/api.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    autoload :LinkedResourcesInterface, "decidim/api/linked_resources_interface"
+    autoload :ServicesInterface, "decidim/api/services_interface"
+  end
+end

data/lib/decidim/meetings/component.rb

@@ -24,12 +24,15 @@ Decidim.register_component(:meetings) do |component|
   end
 
   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 = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at)
     meetings.count
   end
 
+  component.register_stat :followers_count, tag: :followers, priority: Decidim::StatsRegistry::LOW_PRIORITY do |components, start_at, end_at|
+    meetings_ids = Decidim::Meetings::FilteredMeetings.for(components, start_at, end_at).pluck(:id)
+    Decidim::Follow.where(decidim_followable_type: "Decidim::Meetings::Meeting", decidim_followable_id: meetings_ids).count
+  end
+
   component.exports :meetings do |exports|
     exports.collection do |component_instance|
       Decidim::Meetings::Meeting

data/lib/decidim/meetings/engine.rb

@@ -54,10 +54,6 @@ module Decidim
           end
         end
 
-        Decidim.view_hooks.register(:current_participatory_space_meetings, priority: Decidim::ViewHooks::HIGH_PRIORITY) do |view_context|
-          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
         # 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/version.rb

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

data/lib/tasks/decidim_meetings.rake

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+namespace :decidim_meetings do
+  # For privacy reasons we recommend that you delete this registration form when you no longer need it.
+  # By default this is 3 months after the meeting has passed
+  desc "Remove registration forms belonging to meetings that have ended more than X months ago"
+  task :clean_registration_forms, [:months] => :environment do |_t, args|
+    args.with_defaults(months: 3)
+
+    query = Decidim::Meetings::Meeting.arel_table[:end_time].lteq(Time.current - args[:months].months)
+    old_meeting_ids = Decidim::Meetings::Meeting.where(query).pluck(:id)
+    old_questionnaires = Decidim::Forms::Questionnaire.where(questionnaire_for_type: "Decidim::Meetings::Meeting", questionnaire_for_id: old_meeting_ids)
+
+    old_questionnaires.destroy_all
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-meetings
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cells-erb
@@ -46,28 +46,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -116,14 +116,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: searchlight
   requirement: !ruby/object:Gem::Requirement
@@ -144,56 +150,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 description: A meetings component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -209,6 +215,7 @@ files:
 - app/assets/images/decidim/gamification/badges/attended_meetings.svg
 - app/assets/images/decidim/meetings/icon.svg
 - app/assets/javascripts/decidim/meetings/admin/agendas.js.es6
+- app/assets/javascripts/decidim/meetings/admin/destroy_meeting_alert.js.es6
 - app/assets/javascripts/decidim/meetings/admin/meetings_form.js.es6
 - app/assets/javascripts/decidim/meetings/admin/registrations_form.js.es6
 - app/assets/javascripts/decidim/meetings/admin/registrations_invite_form.es6
@@ -315,6 +322,7 @@ 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/filtered_meetings.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
@@ -326,8 +334,12 @@ files:
 - 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/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
@@ -342,6 +354,7 @@ files:
 - app/views/decidim/meetings/admin/invites/index.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_closes/proposals_picker.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
@@ -358,7 +371,6 @@ 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_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
@@ -378,30 +390,48 @@ files:
 - app/views/devise/mailer/join_meeting.text.erb
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
 - config/locales/de.yml
+- config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
+- config/locales/is-IS.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/lt-LT.yml
+- config/locales/lv-LV.yml
+- config/locales/mt-MT.yml
 - config/locales/nl.yml
 - config/locales/no.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -429,9 +459,13 @@ files:
 - db/migrate/20180809134748_add_upcoming_events_as_content_block.rb
 - db/migrate/20181107175558_add_questionnaire_to_existing_meetings.rb
 - db/migrate/20190404132923_add_user_group_to_meetings_registrations.rb
+- db/migrate/20200320105922_index_foreign_keys_in_decidim_meetings_registrations.rb
+- lib/decidim/api/linked_resources_interface.rb
+- lib/decidim/api/services_interface.rb
 - lib/decidim/meetings.rb
 - lib/decidim/meetings/admin.rb
 - lib/decidim/meetings/admin_engine.rb
+- lib/decidim/meetings/api.rb
 - lib/decidim/meetings/component.rb
 - lib/decidim/meetings/directory.rb
 - lib/decidim/meetings/directory_engine.rb
@@ -443,6 +477,7 @@ files:
 - lib/decidim/meetings/seeds/city.jpeg
 - lib/decidim/meetings/test/factories.rb
 - lib/decidim/meetings/version.rb
+- lib/tasks/decidim_meetings.rake
 homepage: https://github.com/decidim/decidim
 licenses:
 - AGPL-3.0
@@ -462,7 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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