tramway-event 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d91a1dc4a7e517bffc4a29b0a7785406e853a253e7994b9f84b3612aaf174184
-  data.tar.gz: ac9725effcbcce5644cf1dbb19835052071345d9a23a069f64da3f49b8ee3e39
+  metadata.gz: 3a58d92f7c0ad7e517b69e5a87634ad7b7fa81ccec8209672e317775d4dbba48
+  data.tar.gz: a49ae5fc1af05fbc725ee1ec929a71694242f14de160a8ca5f66bc2a7aebf623
 SHA512:
-  metadata.gz: 73cb708fad65283d4add750f5876492b09bb6dba4244a64ba322ef8dbfcbf77ca82315a3d419bbece16fa4eb5f34188e0c184a7ad712c0b49420573b5fc434b1
-  data.tar.gz: 3ded032babbcd3f735c6b021436911c5bfdd70545fc58baa81b993a1003d2ca9659b0e1e3a33b66eda0f412416c4da695817253571f954f88f507ada51c6c6db
+  metadata.gz: bf0ec8f8f74aa036fcc61859b9d57b08852b45498eb0234520ba87d37eef7904464cd6777309bf5cb329ab02025aa03e1e9ea0e7dd7d2d14890496e54add5dae
+  data.tar.gz: 448e3f6a9bf3a43797353748675c5f9b06dd0b73a41106a6125939d0b7694e7a8d60a1d52296a80d6554ebf6ef2c5b5788cc5d3f31cd1cb862ca658582af1a32

data/app/controllers/tramway/event/events_controller.rb

@@ -4,8 +4,8 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
   def show
     @event = ::Tramway::Event::Events::Show::EventDecorator.decorate ::Tramway::Event::Event.find params[:id]
     @participant_form = ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(request.uuid, @event).new ::Tramway::Event::Participant.new
-    @sections_as_features = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }
-    @sections = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionDecorator.decorate s }
+    @sections_as_features = @event.sections.active.order(position: :asc).map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }
+    @sections = @event.sections.active.order(position: :asc).map { |s| ::Tramway::Event::SectionDecorator.decorate s }
     @footer = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.footer
     @events = ::Tramway::Event::Event.active.map { |e| ::Tramway::Event::Events::Show::EventDecorator.decorate e }
     @people_as_features = @event.partakings.active.map { |p| ::Tramway::Event::PartakingFeatureDecorator.decorate p }

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

@@ -14,6 +14,6 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
     return :not_initialized unless request_collecting_begin_date.present? || request_collecting_end_date.present?
     return :will_begin_soon if request_collecting_begin_date > DateTime.now
     return :is_over if request_collecting_end_date < DateTime.now
-    return :are_being_right_now if request_collecting_begin_date&.<(DateTime.now) && request_collecting_end_date&.>(DateTime.now)
+    return :are_being_right_now if begin_date&.past? && end_date&.future?
   end
 end

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.8.2'
+    VERSION = '1.8.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2018-10-20 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email: