tramway-event 1.12.4 → 1.12.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9da09b01fa80ca0e68c1eb99562fce606ad2a666651eda6928006a41035f67f
-  data.tar.gz: 7da3f0013121edc1958396e6d13dea1921e1af880c95655189cab8b80c8a3c6a
+  metadata.gz: ed98922babffdc1a3de30a4ba9fdaa0a7ee7d27a8ca99e6410f6a78efa69acac
+  data.tar.gz: 9e4a42ece100b7438e90e91a4f0173d111ca04acbe269206432bc2402d6d90ae
 SHA512:
-  metadata.gz: 71353d000dbbc4ebc2c5e15a955f001b6febaa974a0ad39a84acf4e9b763ae0b2cbfd721af778f733d7f693a532c8ed7f3dcaca50f8743526a5becc557ca47b0
-  data.tar.gz: 3fcc06181a67328fa4f997de517776603c043f24bcf2ff7d0fa81e831cd63debc45d14aa05d527f73293e31a3f7ba115a2c0403df46e2fc0c1a0566573899dd3
+  metadata.gz: adeb3d5a0efceb9e0d6d3c764cd1445c266aa7049337bd872886c2e07f215eb4a3eb406ee139c091ead1406d42062c7e50662162aa9ee9e7fb04d7ce1b94436e
+  data.tar.gz: 320a9180d27c0c5b874ac69a4dc0a8f28aca96d66d6d9715535af4669253b638284e7bc2aad53326dde91a89d90e946fcbc0e808eeb973d36e32b10a0f856ca4

data/app/controllers/tramway/event/events_controller.rb

@@ -7,14 +7,14 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
     event = ::Tramway::Event::Event.find params[:id]
     @event = ::Tramway::Event::Events::Show::EventDecorator.decorate event
     @participant_form = ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(request.uuid, @event).new ::Tramway::Event::Participant.new
-    @sections_as_features = @event.sections.active.order(position: :asc).map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }
-    @sections = @event.sections.active.order(position: :asc).map { |s| ::Tramway::Event::SectionDecorator.decorate s }
+    @sections_as_features = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }
+    @sections = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionDecorator.decorate s }
     @footer = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.footer
-    @events = ::Tramway::Event::Event.active.actual.map { |e| ::Tramway::Event::Events::Show::EventDecorator.decorate e }
-    @people_as_features = @event.partakings.active.map { |p| ::Tramway::Event::PartakingFeatureDecorator.decorate p }
+    @events = ::Tramway::Event::Event.actual.map { |e| ::Tramway::Event::Events::Show::EventDecorator.decorate e }
+    @people_as_features = @event.partakings.map { |p| ::Tramway::Event::PartakingFeatureDecorator.decorate p }
     if defined?(::Tramway::Partner)
       @partners = ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
-        hash.merge! partnership_type => (event.send(partnership_type.to_s.pluralize).active.map do |partner|
+        hash.merge! partnership_type => (event.send(partnership_type.to_s.pluralize).map do |partner|
           Tramway::Partner::OrganizationFeatureDecorator.decorate partner
         end)
       end

data/app/decorators/tramway/event/event_decorator.rb

@@ -11,7 +11,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
     end
 
     def show_associations
-      %i[participant_form_fields actions sections]
+      %i[participant_form_fields actions sections partakings]
     end
 
     def list_attributes
@@ -20,9 +20,10 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   delegate :title, to: :object
-  decorate_associations :participants, :partakings, :partnerships, :organizations
+  decorate_associations :participants, :partnerships, :organizations
   decorate_association :participant_form_fields, as: :event
   decorate_association :sections, as: :event
+  decorate_association :partakings, as: :part
   decorate_association :actions, as: :event, state_machines: [:action_state]
 
   def background
@@ -76,7 +77,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def requested_participants
-    object.participants.active.count
+    object.participants.count
   end
 
   def approved_participants

data/app/decorators/tramway/event/events/show/event_decorator.rb

@@ -34,7 +34,7 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   def partners
     if defined?(::Tramway::Partner)
       @partners ||= ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
-        hash.merge! partnership_type => (object.send(partnership_type.to_s.pluralize).active.map do |partner|
+        hash.merge! partnership_type => (object.send(partnership_type.to_s.pluralize).map do |partner|
           Tramway::Partner::OrganizationFeatureDecorator.decorate partner
         end)
       end

data/app/decorators/tramway/event/participant_decorator.rb

@@ -44,7 +44,7 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
           object.event.title
         end)
       end)
-      object.event.participant_form_fields.active.map do |field|
+      object.event.participant_form_fields.map do |field|
         hash = if field.options.is_a?(Hash)
                  field.options
                else

data/app/decorators/tramway/event/participant_xls_decorator.rb

@@ -20,7 +20,7 @@ class Tramway::Event::ParticipantXlsDecorator < Tramway::Export::Xls::Applicatio
   end
 
   def flexible_columns
-    object.event.participant_form_fields.active.order(position: :asc).map(&:title).map do |key|
+    object.event.participant_form_fields.order(position: :asc).map(&:title).map do |key|
       { Tramway::Event::Participant.human_attribute_name(key).to_sym => -> { values&.dig(key) } }
     end
   end

data/app/decorators/tramway/event/section_decorator.rb

@@ -5,11 +5,15 @@ class Tramway::Event::SectionDecorator < ::Tramway::Landing::BlockTypes::Feature
     def collections
       [:all]
     end
+
+    def show_associations
+      [ :partakings ]
+    end
   end
 
   delegate :description, to: :object
   decorate_association :event
-  decorate_association :partakings, decorator: Tramway::Event::PartakingFeatureDecorator
+  decorate_association :partakings, as: :part, decorator: Tramway::Event::PartakingFeatureDecorator
 
   def name
     "#{object.title} | #{object.event.title}"

data/app/forms/admin/tramway/event/participant_form.rb

@@ -3,7 +3,7 @@
 require 'securerandom'
 
 class Admin::Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
-  properties :participation_state_event, :comment
+  properties :comment
   association :event
 
   def self.new(object)
@@ -11,7 +11,6 @@ class Admin::Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
       ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(
         SecureRandom.hex,
         object.event,
-        participation_state_event: :default,
         comment: :string
       ).new object
     else

data/app/models/tramway/event/action.rb

@@ -3,21 +3,21 @@
 class Tramway::Event::Action < Tramway::Core::ApplicationRecord
   belongs_to :event, class_name: 'Tramway::Event::Event'
 
-  state_machine :action_state, initial: :must_be_done do
-    state :must_be_done
+  aasm :action_state, column: :action_state do
+    state :must_be_done, initial: true
     state :done
     state :declined
 
     event :do do
-      transition must_be_done: :done
+      transitions from: :must_be_done, to: :done
     end
 
     event :decline do
-      transition must_be_done: :declined
+      transitions from: :must_be_done, to: :declined
     end
 
     event :return do
-      transition %i[declined done] => :must_be_done
+      transitions from: %i[declined done], to: :must_be_done
     end
   end
 end

data/app/models/tramway/event/event.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
+class Tramway::Event::Event < ::Tramway::Core::ApplicationRecord
   mount_uploader :photo, PhotoUploader
 
   validate :check_dimensions

data/app/models/tramway/event/participant.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
+class Tramway::Event::Participant < ::Tramway::Core::ApplicationRecord
   belongs_to :event, class_name: 'Tramway::Event::Event'
 
-  state_machine :participation_state, initial: :requested do
-    state :requested
+  aasm :participation_state, column: :participation_state do
+    state :requested, initial: true
     state :prev_approved
     state :waiting
     state :rejected
@@ -13,31 +13,31 @@ class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
     state :reserved
 
     event :previous_approve do
-      transition %i[requested without_answer waiting] => :prev_approved
+      transitions from: %i[requested without_answer waiting], to: :prev_approved
     end
 
     event :wait_for_decision do
-      transition %i[requested without_answer] => :waiting
+      transitions from: %i[requested without_answer], to: :waiting
     end
 
     event :reserve do
-      transition %i[requested without_answer waiting] => :reserved
+      transitions from: %i[requested without_answer waiting], to: :reserved
     end
 
     event :reject do
-      transition %i[requested without_answer waiting prev_approved reserved] => :rejected
+      transitions from: %i[requested without_answer waiting prev_approved reserved], to: :rejected
     end
 
     event :approve do
-      transition %i[prev_approved reserved requested] => :approved
+      transitions from: %i[prev_approved reserved requested], to: :approved
     end
 
     event :not_got_answer do
-      transition requested: :without_answer
+      transitions from: :requested, to: :without_answer
     end
 
     event :return_to_requested do
-      transition %i[prev_approved rejected] => :requested
+      transitions from: %i[prev_approved rejected], to: :requested
     end
   end
 

data/app/models/tramway/event/participant_form_field.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::ParticipantFormField < ::Tramway::Event::ApplicationRecord
+class Tramway::Event::ParticipantFormField < ::Tramway::Core::ApplicationRecord
   belongs_to :event, class_name: 'Tramway::Event::Event'
 
   enumerize :field_type, in: %i[text string numeric date_picker select checkbox], default: :text

data/app/models/tramway/event/person.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
-class Tramway::Event::Person < ::Tramway::Event::ApplicationRecord
+class Tramway::Event::Person < ::Tramway::Core::ApplicationRecord
   mount_uploader :photo, PhotoUploader
 end

data/app/models/tramway/event/section.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::Section < ::Tramway::Event::ApplicationRecord
+class Tramway::Event::Section < ::Tramway::Core::ApplicationRecord
   mount_uploader :photo, PhotoUploader
 
   belongs_to :event, class_name: 'Tramway::Event::Event'

data/config/initializers/tramway.rb

@@ -10,7 +10,7 @@
   ::Tramway::Event::Action,
   project: :event)
 ::Tramway::Admin.set_notificable_queries new_participants: lambda { |current_user|
-  ::Tramway::Event::Participant.active.where(participation_state: :requested).send "#{current_user.role}_scope", current_user.id
+  ::Tramway::Event::Participant.where(participation_state: :requested).send "#{current_user.role}_scope", current_user.id
 }
 
 ::Tramway::Landing.head_content = lambda do

data/config/locales/state_machines.yml

@@ -3,33 +3,32 @@ ru:
     tramway/event/participant:
       published: Опубликованные
       hidden: Скрытые
-  activerecord:
-    state_machines:
-      tramway/event/participant:
-        participation_state:
-          states:
-            requested: Заявка отправлена
-            prev_approved: Получено предварительное подтверждение
-            waiting: Ожидание решения
-            rejected: Заявка отклонена
-            approved: Прибывшие
-            without_answer: Без ответа
-            reserved: В резерве
-          events:
-            previous_approve: Предварительно подтвердить
-            wait_for_decision: Ожидать ответа
-            reject: Отклонить
-            approve: Прибыл(а)
-            not_got_answer: Связаться не удалось
-            reserve: Отправить в резерв
-            return_to_requested: Вернуть в необработанные
-      tramway/event/action:
-        action_state:
-          states:
-            done: Сделано
-            must_be_done: Запланировано
-            declined: Отклонено
-          events:
-            do: Выполнено
-            decline: Отклонить
-            return: Вернуть статус
+  state_machines:
+    tramway/event/participant:
+      participation_state:
+        states:
+          requested: Заявка отправлена
+          prev_approved: Получено предварительное подтверждение
+          waiting: Ожидание решения
+          rejected: Заявка отклонена
+          approved: Прибывшие
+          without_answer: Без ответа
+          reserved: В резерве
+        events:
+          previous_approve: Предварительно подтвердить
+          wait_for_decision: Ожидать ответа
+          reject: Отклонить
+          approve: Прибыл(а)
+          not_got_answer: Связаться не удалось
+          reserve: Отправить в резерв
+          return_to_requested: Вернуть в необработанные
+    tramway/event/action:
+      action_state:
+        states:
+          done: Сделано
+          must_be_done: Запланировано
+          declined: Отклонено
+        events:
+          do: Выполнено
+          decline: Отклонить
+          return: Вернуть статус

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.12.4'
+    VERSION = '1.12.6.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.12.4
+  version: 1.12.6.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2021-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus
@@ -68,7 +68,6 @@ files:
 - app/jobs/tramway/event/application_job.rb
 - app/mailers/tramway/event/application_mailer.rb
 - app/models/tramway/event/action.rb
-- app/models/tramway/event/application_record.rb
 - app/models/tramway/event/event.rb
 - app/models/tramway/event/partaking.rb
 - app/models/tramway/event/participant.rb
@@ -136,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Rails engine for events

data/app/models/tramway/event/application_record.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Tramway
-  module Event
-    class ApplicationRecord < ::Tramway::Core::ApplicationRecord
-      self.abstract_class = true
-    end
-  end
-end