tramway-event 1.12.3.7 → 1.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750aa0c60f787cbaa08e0de2b8918aeef960fd5e3dc76639d3d4bbd7a8e94d4f
-  data.tar.gz: d31fea495ff54e472f60507e98b2c48b01d3ca9452fec86daab6f6cb0d16250f
+  metadata.gz: d121186f0802faa7e890e235cd07afc828636b586bf671053c3b4a83bf9fda09
+  data.tar.gz: 81be3b2a3f82064665b338c99e35efcbe464fb19fc1127963c122f733e3ce573
 SHA512:
-  metadata.gz: 2253d1a8d00c90676403737a2dd48643a1974aab4b97123d65ca2cb93f2018bb8c70d892a5d2b67f12f99e3bd2fb0d393d734942dfedb435782ce8400b2fb0cc
-  data.tar.gz: ea1972a689ccacce9bc68753cc1a60d8b5ca37c654774f3d63dbd4b0f180654452333a1a9566119629bc23601e4c348f609511b18f969ca62b2ff20b2de2774f
+  metadata.gz: 6068964cbc7cf4a881b66b0ade16906cd3bc9ecb83e51cfe1e003a12965086e11070cec129f9e73ee9d74b90cf28241f6f6cc26ba1adcfbd248dc79166ea0857
+  data.tar.gz: b1bf89d6baa2848dbfd91f25bbe62e487a6985eede76579e241254d186d5760668bdbfc199666466f8ac0ae7b83162fadece825e33b7e4565fdecc43edf627ce

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: :event
   decorate_association :actions, as: :event, state_machines: [:action_state]
 
   def background

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

@@ -8,11 +8,13 @@ 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
 
   has_many :participants, class_name: 'Tramway::Event::Participant'
-  has_many :participant_form_fields, class_name: 'Tramway::Event::ParticipantFormField'
+  has_many :participant_form_fields, -> { order(position: :asc) }, class_name: 'Tramway::Event::ParticipantFormField'
   has_many :sections, class_name: 'Tramway::Event::Section'
   has_many :partakings, as: :part, class_name: 'Tramway::Event::Partaking'
   has_many :partnerships, class_name: 'Tramway::Partner::Partnership', as: :partner
@@ -22,7 +24,9 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
 
   enumerize :reach, default: :open, in: %i[open closed]
 
-  scope :actual, -> { order(:begin_date).where('end_date > ?', DateTime.now) }
+  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/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/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.12.3.7'
+    VERSION = '1.12.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.12.3.7
+  version: 1.12.5
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus