tramway-event 1.8.1.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5574ae2ac3d78c3ff39aa5c25dae378d511a219e6b568ed69cd8a02fc50913be
-  data.tar.gz: 2d0fcd012e31b8a0968df194d630908ab97f529c6a5adaa5259323fdad59f8cd
+  metadata.gz: d91a1dc4a7e517bffc4a29b0a7785406e853a253e7994b9f84b3612aaf174184
+  data.tar.gz: ac9725effcbcce5644cf1dbb19835052071345d9a23a069f64da3f49b8ee3e39
 SHA512:
-  metadata.gz: d19722a1145d77d7c98ad8c0b6b19dfbf9a65973ba6ecf4a7ea2f96e2086ea5cefa8eb6f54927290a4b0886071bcdb75b4ca5faecc606b3a49a0b2cb70882e69
-  data.tar.gz: 74cbd149d2151dff70f7b9221db9d4b9697165e639821841ed9c8b2ac2b716acf9470ca194d9189eefcf6d6512c68e7f7607c8b23bf4911068fd3aa87664a7eb
+  metadata.gz: 73cb708fad65283d4add750f5876492b09bb6dba4244a64ba322ef8dbfcbf77ca82315a3d419bbece16fa4eb5f34188e0c184a7ad712c0b49420573b5fc434b1
+  data.tar.gz: 3ded032babbcd3f735c6b021436911c5bfdd70545fc58baa81b993a1003d2ca9659b0e1e3a33b66eda0f412416c4da695817253571f954f88f507ada51c6c6db

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

@@ -1,7 +1,7 @@
 class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorator
   class << self
     def collections
-      [ :requested, :waiting, :prev_approved, :without_answer, :approved, :rejected, :all ]
+      [ :requested, :waiting, :prev_approved, :without_answer, :approved, :rejected, :reserved, :all ]
     end
 
     def list_attributes
@@ -69,6 +69,8 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
       :warning
     when :reject
       :danger
+    when :reserve
+      :warning
     end
   end
 end

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

@@ -8,6 +8,7 @@ class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
     state :rejected
     state :approved
     state :without_answer
+    state :reserved
 
     event :previous_approve do
       transition [ :requested, :without_answer, :waiting ] => :prev_approved
@@ -22,12 +23,16 @@ class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
     end
 
     event :approve do
-      transition prev_approved: :approved
+      transition [ :prev_approved, :reserved ] => :approved
     end
 
     event :not_got_answer do
       transition requested: :without_answer
     end
+
+    event :reserve do
+      transition [ :requested, :without_answer, :waiting ] => :reserved
+    end
   end
 
   scope :requested, -> { where participation_state: :requested }
@@ -36,4 +41,5 @@ class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
   scope :rejected, -> { where participation_state: :rejected }
   scope :approved, -> { where participation_state: :approved }
   scope :without_answer, -> { where participation_state: :without_answer }
+  scope :reserved, -> { where participation_state: :reserved }
 end

data/config/locales/models.yml

@@ -54,4 +54,5 @@ ru:
       rejected: Отклонены
       approved: Окончательно подтверждены
       without_answer: Не ответили
+      reserved: В резерве
 

data/config/locales/state_machines.yml

@@ -14,9 +14,11 @@ ru:
             rejected: Заявка отклонена
             approved: Окончательное подтверждение
             without_answer: Без ответа
+            reserved: В резерве
           events:
             previous_approve: Предварительно подтвердить
             wait_for_decision: Ожидать ответа
             reject: Отклонить
             approve: Окончательно подтвердить
             not_got_answer: Связаться не удалось
+            reserve: Отправить в резерв

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.8.1.1'
+    VERSION = '1.8.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.8.1.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Pavel Kalashnikov