tramway-event 1.12.3.6 → 1.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240a1d98655e2d71b4901ce6602c0d7215b4e477ad2ae2cc096e8285280e2955
-  data.tar.gz: 1e616d3af7bdd6fbae65e3e9e50b36d5a3c67f3f7663f7aca745cb6f6064104d
+  metadata.gz: a9da09b01fa80ca0e68c1eb99562fce606ad2a666651eda6928006a41035f67f
+  data.tar.gz: 7da3f0013121edc1958396e6d13dea1921e1af880c95655189cab8b80c8a3c6a
 SHA512:
-  metadata.gz: 3aa3bb0ca75a4c35ffc9cd9fe142ddab5a4e430af45b0d95596965b8413738781bccc01ae8761de02f560506fedf9fbc065a2429ae5a608106e3958de7b78102
-  data.tar.gz: 8ef4a9674d2cd67351a8968cfed70efb85a4f20a578c0ab0f2fd483e58e2d88a3c813d13f322c7a450eb077743a15a9e464f5ab8ffb837200687bc8a00bd6cda
+  metadata.gz: 71353d000dbbc4ebc2c5e15a955f001b6febaa974a0ad39a84acf4e9b763ae0b2cbfd721af778f733d7f693a532c8ed7f3dcaca50f8743526a5becc557ca47b0
+  data.tar.gz: 3fcc06181a67328fa4f997de517776603c043f24bcf2ff7d0fa81e831cd63debc45d14aa05d527f73293e31a3f7ba115a2c0403df46e2fc0c1a0566573899dd3

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]
     end
 
     def list_attributes
@@ -20,8 +20,9 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   delegate :title, to: :object
-  decorate_associations :participants, :sections, :partakings, :partnerships, :organizations
+  decorate_associations :participants, :partakings, :partnerships, :organizations
   decorate_association :participant_form_fields, as: :event
+  decorate_association :sections, as: :event
   decorate_association :actions, as: :event, state_machines: [:action_state]
 
   def background

data/app/helpers/tramway/event/application_helper.rb

@@ -8,6 +8,7 @@ module Tramway
       include ::FontAwesome5::Rails::IconHelper
       include ::Tramway::Collections::Helper
       include ::Tramway::Profiles::LinksHelper
+      include ::Tramway::Landing::ApplicationHelper
     end
   end
 end

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.6'
+    VERSION = '1.12.4'
   end
 end

metadata

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