tramway-event 1.12.6 → 1.12.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c5cea79e8830c3db57b2657e8df6e27d0c09f6136fc96336760c2b84f05d225
-  data.tar.gz: 807718fa455cc0f29643e23a532b0bddec678cb2decdcd123e30ac6ffa7165f5
+  metadata.gz: 0c7a13d81c0f6f396312c7401c34089bf766812f530121a7bf525cd8aaa557bb
+  data.tar.gz: f82e08ce10379a04c28a3b80cdd26408c21f8314ba29a7dc69544e55001fde12
 SHA512:
-  metadata.gz: 3ef4fb14eef67149617974d2c2da311be4bb6de80944be5b92d6ee95745b3a6aa0b8e4d8c573fd77152d911f6b73c800409f39eafb42f75abf5a7bcb9311db44
-  data.tar.gz: 59660760d05f0667a9e759dad0ec9b9ea44f7e40d75477312eb466138244fce01ff292d6a0cca984d330269aff990b21ddf0c4ddf7d9fe6a9c6a25ca52cdc061
+  metadata.gz: c9e2b4dd803318ab7db79ce025d62ed8066ab41726f5710dea281bd1fb9586536991efeb3b4ce95364766b57a37e7dfa5025afdfa4b24401cf10b041e6d21e11
+  data.tar.gz: 219d971dbe76967a917c36891b3be59bb05c3547598a0d62051f0fecd518b84862f37103d01dbee885cf955deecba2f9ea673b76f5009a207cd376b54b7e5694

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/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.6'
+    VERSION = '1.12.6.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.12.6
+  version: 1.12.6.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2021-02-04 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

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