tramway-event 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 640fb69ee78f8db21a877ab541641056dd50449aa1da402bf96f9ebb8bc65aab
-  data.tar.gz: 9eb469eaa6743015ed38e156c3722d1f234777d9ea572a0d577ba530b3e24254
+  metadata.gz: f9c12311266981956a6e8355441fb61879ba70c7b5e6774a4600a0eb75fdf211
+  data.tar.gz: 4558ad858d3a78536f7796c2589c3afce4caf114785229c8731492ed802e24f2
 SHA512:
-  metadata.gz: d630455419b567ba90f37be955dbd296f8f846da5896db29d53d13edc109e50b8d11b28cc383570889f739d45c7d44f7919a76688a95efa9dab672224f32a536
-  data.tar.gz: 036f4a1b7a22d7f86a538fc2ebca72a1841195cd98c546d3947ebbde30960f9ee5563f1488c48de8ec80818d2ba29c06ce178b9fe97d7a4dd9b503d29094774a
+  metadata.gz: 6b2dbb00d0d4d9e4e833beb07ec567dda071d4e8a56e7827a6b2aaed0af56fe7209213a78acd016879425c6feda122db83c2cb0b4a3ab03cbfa09db3df971881
+  data.tar.gz: 42531af6a0ccba9f079616b5d2d5117da0ed3beadc2c03ec4a465739be76e0343bbb4dde357ad52381ffe9a66e4a3c2f5eb9b38007cce6922a774aa64bc08692

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

@@ -7,7 +7,7 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
     @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 }
+    @events = ::Tramway::Event::Event.active.actual.map { |e| ::Tramway::Event::Events::Show::EventDecorator.decorate e }
     @people_as_features = @event.partakings.active.map { |p| ::Tramway::Event::PartakingFeatureDecorator.decorate p }
   end
 end

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

@@ -9,6 +9,7 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   enumerize :status, default: :common, in: [ :common, :main ]
 
   scope :main_event, -> { where(status: :main) }
+  scope :actual, -> { where 'end_date > ?', DateTime.now }
 
   def request_collecting_state
     return :not_initialized unless request_collecting_begin_date.present? || request_collecting_end_date.present?

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.8.4'
+    VERSION = '1.8.5'
   end
 end

metadata

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