tramway-event 1.12.3.5 → 1.12.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '072972cdb9e96ea40f272e8cdba1f0fcd8c90f74b8a2c6322c7013454c7abaf8'
-  data.tar.gz: eed9b89ebaf9a79a937159830d9000fedfaa527ffd59746c65ac5ab3046939d5
+  metadata.gz: dd47553c4b2de03f9bcb119c33f4ff67f5acdfd066b1b37149544da08c34d4c7
+  data.tar.gz: 546acb6986c03adf7c3ece913f2c85608c67b87d06626af355cf5358cff8d50c
 SHA512:
-  metadata.gz: f6f6094ee1da88a967d89904a2c7aa8b5d20cdff337dbe01d1ee86ecfd8db54d091c85f467bc778610e94a287f29e64b0866187689378a0d068836a7aa23c7e0
-  data.tar.gz: 6992e10900c76bbc6ae5dddbace85232ffeac7684c76dac9762f85d2d1f3c03266c5d7a4233db8eb3f80141b13222d4bd65cc7773838801f7254577b00b531d7
+  metadata.gz: 852ce423513c15988c7147f0ec3bf7434ca04df514c9b7415f960eda1b8ffd683f83777ea172e7e2357baf580c6e02f840f2ec76d414630df8246c6f17dee4c4
+  data.tar.gz: 83ff03e655e5631f05490a29a9bd84689cde5dc98b3f816bffb9a1301bc84809cceb87d234e8273ad0eb30c581c4a325791428b1a698f0505fe0fda6ed798067

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

@@ -7,12 +7,14 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
 
   def check_dimensions
     if photo.present?
-      errors.add :photo, :too_small_image if photo.width < 1920 || photo.height < 1080
+      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/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.12.3.5'
+    VERSION = '1.12.3.10'
   end
 end

metadata

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