tramway-event 1.12.3.7 → 1.12.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750aa0c60f787cbaa08e0de2b8918aeef960fd5e3dc76639d3d4bbd7a8e94d4f
-  data.tar.gz: d31fea495ff54e472f60507e98b2c48b01d3ca9452fec86daab6f6cb0d16250f
+  metadata.gz: 9c19a417bee52053352aba5e12c1b4e7021111e3be20ec3fccab8b3587ea476e
+  data.tar.gz: ef7320eed1ed631cfc09491b165059c6d0b60731342735186ada038d29ad8f31
 SHA512:
-  metadata.gz: 2253d1a8d00c90676403737a2dd48643a1974aab4b97123d65ca2cb93f2018bb8c70d892a5d2b67f12f99e3bd2fb0d393d734942dfedb435782ce8400b2fb0cc
-  data.tar.gz: ea1972a689ccacce9bc68753cc1a60d8b5ca37c654774f3d63dbd4b0f180654452333a1a9566119629bc23601e4c348f609511b18f969ca62b2ff20b2de2774f
+  metadata.gz: dbfc98616a01483ecdf222ccb20b9d6d36262e9920e21c2ddc5fdc1a80951c229864ec2640248644d96971f8c6b822f9ddf613bd5c7f514742e8c9ca4997a4b9
+  data.tar.gz: c7d0d7b0e767576552dd437f5319f8eea93def57b4b74e6576ab6cbf66cb1fb82accd764da8bcea2bd7743a4201cd6e1c082e3f9322b254f7f2a6ed8510708a5

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

@@ -12,7 +12,7 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   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 +22,7 @@ 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, -> { where('begin_date > ?', DateTime.now).where('begin_date < ?', DateTime.now + 2.days) }
   scope :past, -> { where 'end_date < ?', DateTime.now }
   scope :open, -> { where reach: :open }
   scope :closed, -> { where reach: :closed }

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.12.3.7'
+    VERSION = '1.12.3.8'
   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.3.8
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus