tramway-event 1.12.3.9 → 1.12.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16cb62030954f34b751e718ea4c6d9e6f674a9a5f819f2f77c72352e23a5522
-  data.tar.gz: 3fce7c42f43263082bf4076dd5e0a4eaadbe252e1be83d481611e765b4276ab1
+  metadata.gz: 0c7a13d81c0f6f396312c7401c34089bf766812f530121a7bf525cd8aaa557bb
+  data.tar.gz: f82e08ce10379a04c28a3b80cdd26408c21f8314ba29a7dc69544e55001fde12
 SHA512:
-  metadata.gz: be1c3f5817c1920b5d455d0ba2d6b583d79fc0edd29d80d738c053df40cb474916f08a9075ab0d1ab11b1da5a8ef50c3103a8213eb6b6a20ecf0cf166c7b8849
-  data.tar.gz: 8954b357e87e8035a1b6722696529993b52531088a74a42f160d190b7db78f2b94b2a1df811d07192462f0b98e1119590b19f660da1d1851f023258cb7674fbd
+  metadata.gz: c9e2b4dd803318ab7db79ce025d62ed8066ab41726f5710dea281bd1fb9586536991efeb3b4ce95364766b57a37e7dfa5025afdfa4b24401cf10b041e6d21e11
+  data.tar.gz: 219d971dbe76967a917c36891b3be59bb05c3547598a0d62051f0fecd518b84862f37103d01dbee885cf955deecba2f9ea673b76f5009a207cd376b54b7e5694

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]
+      %i[participant_form_fields actions sections partakings]
     end
 
     def list_attributes
@@ -20,8 +20,10 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   delegate :title, to: :object
-  decorate_associations :participants, :sections, :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

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
@@ -8,6 +8,8 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   def check_dimensions
     if photo.present?
       errors.add :photo, :too_small_image if photo.width.present? && (photo.width < 1920 || photo.height < 1080)
+    else
+      errors.add :photo, :is_not_present
     end
   end
 
@@ -22,7 +24,9 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
 
   enumerize :reach, default: :open, in: %i[open closed]
 
-  scope :actual, -> { where('begin_date > ?', DateTime.now).where('begin_date < ?', DateTime.now + 11.days).order(begin_date: :asc) }
+  scope :actual, -> do
+    where('begin_date > ?', DateTime.now).or(where('begin_date < ? AND end_date > ?', DateTime.now, DateTime.now)).order(begin_date: :asc)
+  end
   scope :past, -> { where 'end_date < ?', DateTime.now }
   scope :open, -> { where reach: :open }
   scope :closed, -> { where reach: :closed }

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/app/views/tramway/event/participants/_form.html.haml

@@ -1,11 +1,12 @@
-.row.form
-  .col-lg-12
-    %h1.text-center
-      = t(".request_collecting_state.#{event.request_collecting_state}")
-    - if event.request_collecting_state == :are_being_right_now && event.participant_form_fields.any?
-      - class_name = 'tramway_event_participant'
-      = simple_form_for @participant_form, url: ::Tramway::Event::Engine.routes.url_helpers.participants_path, method: :post, html: { class: class_name, id: class_name } do |f|
-        = f.input :event_id, as: :hidden, input_html: { value: event.id, class: class_name, id: "#{class_name}_event_id", name: "#{class_name}[event_id]" }
-        - event.participant_form_fields.inputs_list.each do |field|
-          = render 'tramway/core/shared/input_extended', field: field, class_name: class_name, f: f, value: (params[:participant].present? ? params[:participant][field.title] : '')
-        = f.button :submit, t('.submit_form')
+- unless event.request_collecting_state == :not_initialized
+  .row.form
+    .col-lg-12
+      %h1.text-center
+        = t(".request_collecting_state.#{event.request_collecting_state}")
+      - if event.request_collecting_state == :are_being_right_now && event.participant_form_fields.any?
+        - class_name = 'tramway_event_participant'
+        = simple_form_for @participant_form, url: ::Tramway::Event::Engine.routes.url_helpers.participants_path, method: :post, html: { class: class_name, id: class_name } do |f|
+          = f.input :event_id, as: :hidden, input_html: { value: event.id, class: class_name, id: "#{class_name}_event_id", name: "#{class_name}[event_id]" }
+          - event.participant_form_fields.inputs_list.each do |field|
+            = render 'tramway/core/shared/input_extended', field: field, class_name: class_name, f: f, value: (params[:participant].present? ? params[:participant][field.title] : '')
+          = f.button :submit, t('.submit_form')

data/config/locales/models.yml

@@ -40,6 +40,7 @@ ru:
         short_description: Краткое описание
         actions: Действие
         reach: Доступность мероприятия
+        sections: События
       tramway/event/participant:
         name: Имя
         list_fields: Данные

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.3.9'
+    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.3.9
+  version: 1.12.6.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 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