tramway-event 1.12.3.8 → 1.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c19a417bee52053352aba5e12c1b4e7021111e3be20ec3fccab8b3587ea476e
-  data.tar.gz: ef7320eed1ed631cfc09491b165059c6d0b60731342735186ada038d29ad8f31
+  metadata.gz: 0c5cea79e8830c3db57b2657e8df6e27d0c09f6136fc96336760c2b84f05d225
+  data.tar.gz: 807718fa455cc0f29643e23a532b0bddec678cb2decdcd123e30ac6ffa7165f5
 SHA512:
-  metadata.gz: dbfc98616a01483ecdf222ccb20b9d6d36262e9920e21c2ddc5fdc1a80951c229864ec2640248644d96971f8c6b822f9ddf613bd5c7f514742e8c9ca4997a4b9
-  data.tar.gz: c7d0d7b0e767576552dd437f5319f8eea93def57b4b74e6576ab6cbf66cb1fb82accd764da8bcea2bd7743a4201cd6e1c082e3f9322b254f7f2a6ed8510708a5
+  metadata.gz: 3ef4fb14eef67149617974d2c2da311be4bb6de80944be5b92d6ee95745b3a6aa0b8e4d8c573fd77152d911f6b73c800409f39eafb42f75abf5a7bcb9311db44
+  data.tar.gz: 59660760d05f0667a9e759dad0ec9b9ea44f7e40d75477312eb466138244fce01ff292d6a0cca984d330269aff990b21ddf0c4ddf7d9fe6a9c6a25ca52cdc061

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/models/tramway/event/event.rb

@@ -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 + 2.days) }
+  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.8'
+    VERSION = '1.12.6'
   end
 end

metadata

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