tramway-event 1.5.4 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbbf020b8af7efc95ed0aebdfbe86f54fff5b1aad197108c54596d5c6cd2f228
-  data.tar.gz: d29fbe7b9988e5a334e891191270af11f374cd69e19cfd5fa865915d5ba41c13
+  metadata.gz: 356196b9484317b81ca8f71c892e190739f6090c286615bf8307abec599e78a3
+  data.tar.gz: 2db8e0ac6a5c1245d2e741cfef9ed402b4564c5766fb48cac6d3ac663010110d
 SHA512:
-  metadata.gz: a166f5d00f37a207aedcb23f0e95850506e387444de51f9e77393a2818e6d3b1794684d6740050e0162b7f9c4eefd481a189a570acb68dac89b61157476737a3
-  data.tar.gz: 6b0d6a26c58d785eec4dc40715d0a8bb9f38443ad1e56608b2bf5ff4aab33bf30a493000a84cd22ed1bb5e903362ac71384f07df0a8ead6698034da28e072a8f
+  metadata.gz: c86f930b2320a99ed8b71e4d83e0cfcd0845541147821156106d0e94178c361312e748cdc92ad2fc1c27e8007ba3af9bfffdc906d5e034f5e58ff9b6d4666dd2
+  data.tar.gz: 600f8c199396e7d7edbfafe059283db44483da6f5b5bdb939c31b29515178db4ed92d0ff413ca52d9bf5b6be22baf08e152eb8dae79115608286e688f97cf4f3

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

@@ -1,7 +1,11 @@
 class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorator
   class << self
     def collections
-      [ :all ]
+      [ :requested, :waiting, :prev_approved, :without_answer, :approved, :rejected, :all ]
+    end
+
+    def list_attributes
+      [:list_fields]
     end
   end
 
@@ -16,6 +20,23 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
     end
   end
 
+  def list_fields
+    content_tag :table, class: :table do
+      object.event.participant_form_fields.map do |field|
+        if field.options['list_field'] == 'true'
+          concat(content_tag(:tr) do
+            concat(content_tag(:td) do
+              field.title
+            end)
+            concat(content_tag(:td) do
+              object.values[field.title]
+            end)
+          end)
+        end
+      end.compact
+    end
+  end
+
   def values
     content_tag :table, class: :table do
       object.values&.each do |key, value|
@@ -30,4 +51,15 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
       end
     end
   end
+
+  def participation_state_button_color(event)
+    case event
+    when :previous_approve, :approve
+      :success
+    when :wait_for_decision, :not_got_answer
+      :warning
+    when :reject
+      :danger
+    end
+  end
 end

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

@@ -3,5 +3,13 @@ class Tramway::Event::ParticipantFormFieldDecorator < ::Tramway::Core::Applicati
     def collections
       [ :all ]
     end
+
+    def list_attributes
+      [:event_title]
+    end
+  end
+
+  def event_title
+    object.event.title
   end
 end

data/app/forms/tramway/event/participant_extended_form_creator.rb

@@ -1,9 +1,13 @@
 class Tramway::Event::ParticipantExtendedFormCreator < Tramway::Core::FormCreator
-  def self.create_form_class(uuid, event)
+  def self.create_form_class(uuid, event, **simple_properties)
     class_name = "ParticipantExtendedForm#{uuid.gsub('-', '')}"
     properties = event.participant_form_fields.inputs_list.reduce({}) do |hash, field|
       hash.merge! field.title.to_sym => field
     end
-    ::Tramway::Core::ExtendableForm.new(class_name, **properties)
+    if simple_properties.keys.any?
+      ::Tramway::Core::ExtendableForm.new(class_name, simple_properties: simple_properties, **properties)
+    else
+      ::Tramway::Core::ExtendableForm.new(class_name, **properties)
+    end
   end
 end

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

@@ -1,11 +1,17 @@
 require 'securerandom'
 
 class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
+  properties :participation_state, :comment
   association :event
 
   def self.new(object)
     if object.event_id.present?
-      ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(SecureRandom.hex, object.event).new object
+      ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(
+        SecureRandom.hex,
+        object.event,
+        comment: :string,
+        participation_state: :string
+      ).new object
     else
       super(object).tap do |obj|
         obj.form_properties event: :association

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

@@ -1,3 +1,39 @@
 class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
   belongs_to :event, class_name: 'Tramway::Event::Event'
+  
+  state_machine :participation_state, initial: :requested do
+    state :requested
+    state :prev_approved
+    state :waiting
+    state :rejected
+    state :approved
+    state :without_answer
+
+    event :previous_approve do
+      transition [ :requested, :without_answer, :waiting ] => :prev_approved
+    end
+
+    event :wait_for_decision do
+      transition [ :requested, :without_answer ] => :waiting
+    end
+
+    event :reject do
+      transition [ :requested, :without_answer, :waiting ] => :rejected
+    end
+
+    event :approve do
+      transition prev_approved: :approved
+    end
+
+    event :not_got_answer do
+      transition requested: :without_answer
+    end
+  end
+
+  scope :requested, -> { where participation_state: :requested }
+  scope :waiting, -> { where participation_state: :waiting }
+  scope :prev_approved, -> { where participation_state: :prev_approved }
+  scope :rejected, -> { where participation_state: :rejected }
+  scope :approved, -> { where participation_state: :approved }
+  scope :without_answer, -> { where participation_state: :without_answer }
 end

data/config/locales/models.yml

@@ -13,6 +13,8 @@ ru:
         description: Описание
         begin_date: Дата начала
         end_date: Дата конца
+      tramway/event/participant:
+        comment: Примечание
   cases:
     tramway/event/event:
       plural: мероприятия
@@ -32,3 +34,12 @@ ru:
     tramway/event/partaking:
       genitive: должность
       plural: должности
+  collections:
+    tramway/event/participant:
+      requested: Необработанные
+      prev_approved: Предварительно подтверждены
+      waiting: Ожидаем ответа
+      rejected: Отклонены
+      approved: Окончательно подтверждены
+      without_answer: Не ответили
+

data/config/locales/state_machines.yml

@@ -0,0 +1,22 @@
+ru:
+  collections:
+    tramway/event/participant:
+      published: Опубликованные
+      hidden: Скрытые
+  activerecord:
+    state_machines:
+      tramway/event/participant:
+        participation_state:
+          states:
+            requested: Заявка отправлена
+            prev_approved: Получено предварительное подтверждение
+            waiting: Ожидание решения
+            rejected: Заявка отклонена
+            approved: Окончательное подтверждение
+            without_answer: Без ответа
+          events:
+            previous_approve: Предварительно подтвердить
+            wait_for_decision: Ожидать ответа
+            reject: Отклонить
+            approve: Окончательно подтвердить
+            not_got_answer: Связаться не удалось

data/lib/tramway/event/generators/install_generator.rb

@@ -33,7 +33,8 @@ module Tramway::Event::Generators
         :rename_tramway_event_people_sections_to_tramway_event_partakings,
 
         :add_position_to_tramway_event_partakings,
-        :add_state_to_tramway_event_partakings
+        :add_state_to_tramway_event_partakings,
+        :add_more_fields_to_tramway_event_participants
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

data/lib/tramway/event/generators/templates/add_more_fields_to_tramway_event_participants.rb

@@ -0,0 +1,6 @@
+class AddMoreFieldsToTramwayEventParticipants < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_event_participants, :participation_state, :text, default: :requested
+    add_column :tramway_event_participants, :comment, :text
+  end
+end

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.5.4'
+    VERSION = '1.6'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: '1.6'
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -61,12 +61,14 @@ files:
 - config/initializers/tramway.rb
 - config/locales/models.yml
 - config/locales/ru.yml
+- config/locales/state_machines.yml
 - config/routes.rb
 - lib/tasks/tramway/event_tasks.rake
 - lib/tramway/event.rb
 - lib/tramway/event/engine.rb
 - lib/tramway/event/generators/install_generator.rb
 - lib/tramway/event/generators/templates/add_icon_to_tramway_event_sections.rb
+- lib/tramway/event/generators/templates/add_more_fields_to_tramway_event_participants.rb
 - lib/tramway/event/generators/templates/add_options_to_tramway_event_participant_form_fields.rb
 - lib/tramway/event/generators/templates/add_photo_to_tramway_event_events.rb
 - lib/tramway/event/generators/templates/add_position_to_tramway_event_partakings.rb