tramway-event 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2baba3b2752236d1721a925ac29886c65291b12736737997fb41748fe608f132
-  data.tar.gz: 56339371cae2af091881ef8056775166e1dae674c7fb424fbf04aa626f45bf9f
+  metadata.gz: 7ad317f2b35cfd286c0e43bc653a6ed6e4f07140c39d8871eba4ab1662c4447c
+  data.tar.gz: 37afa824797847b110538d8b12c80750387dc1b5231592bc9d493229463ea6f0
 SHA512:
-  metadata.gz: 84c472ec3441630feb76731fe181ff7b9691e40dfdb8fc400e4eba56e870334cf62ea10184797cd689c180d77e548b8a684f8ca9b17937ede93b8d97bdc0d4cb
-  data.tar.gz: 1229f7a2f8de08bf85c51e7aed3b0cc30305ef1ae8bebd04251c765f3de84a7cce6c79dabe4b60127d770eca648ebf78d4a2143251c1782788d2fcac9922beeb
+  metadata.gz: bcd4d79d9b157d8652b8d812ead6d83c183fc50fcdf5b8b8983b7cd1e93312ae7d16129e8d3b50e532af6433b5257aca2cef28d4c0ccd66f74c636ccbbfdaed4
+  data.tar.gz: 38e30922400fab75fe018ce7335505fbcb7c7c9055d46496acec6c13342d7afc585c93d018f166620abbf9fd5f509f47e3e9bc69b1d855dd629a24761086e726

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

@@ -2,12 +2,12 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
   layout 'tramway/landing/application'
 
   def show
-    @event = ::Tramway::Event::EventDecorator.decorate ::Tramway::Event::Event.find params[:id]
+    @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 }
     @footer = ::Tramway::Landing::BlockDecorator.decorate ::Tramway::Landing::Block.footer
-    @events = ::Tramway::Event::Event.active.map { |e| ::Tramway::Event::EventDecorator.decorate e }
+    @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 }
   end
 end

data/app/decorators/tramway/event/event_decorator.rb

@@ -7,10 +7,10 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
 
   delegate :title, to: :object
   delegate :description, to: :object
-  delegate :participant_form_fields, to: :object
-  delegate :sections, to: :object
-  delegate :partakings, to: :object
   decorate_association :participants
+  decorate_association :participant_form_fields
+  decorate_association :sections
+  decorate_association :partakings
 
   def background
     object.photo

data/app/decorators/tramway/event/events/show/event_decorator.rb

@@ -0,0 +1,29 @@
+class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::ApplicationDecorator
+  class << self
+    def collections
+      [ :all ]
+    end
+  end
+
+  delegate :title, to: :object
+  delegate :description, to: :object
+  delegate :participant_form_fields, to: :object
+  delegate :sections, to: :object
+  delegate :partakings, to: :object
+
+  def background
+    object.photo
+  end
+
+  def duration
+    if object.begin_date.to_date == object.end_date.to_date
+      "#{I18n.l(object.begin_date, format: '%d %B %Y')}"
+    elsif object.begin_date.month == object.end_date.month
+      "#{I18n.t('date.from')} #{I18n.l(object.begin_date, format: '%d')} #{I18n.t('date.to')} #{I18n.l(object.end_date, format: '%d %B %Y')}"
+    else
+      "#{I18n.t('date.from')} #{I18n.l(object.begin_date, format: '%d %B %Y')} #{I18n.t('date.to')} #{I18n.l(object.end_date, format: '%d %B %Y')}"
+    end
+  end
+
+  alias tagline duration
+end

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.7.1'
+    VERSION = '1.7.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -29,6 +29,7 @@ files:
 - app/controllers/tramway/event/participants_controller.rb
 - app/decorators/tramway/event/event_decorator.rb
 - app/decorators/tramway/event/event_link_decorator.rb
+- app/decorators/tramway/event/events/show/event_decorator.rb
 - app/decorators/tramway/event/partaking_decorator.rb
 - app/decorators/tramway/event/partaking_feature_decorator.rb
 - app/decorators/tramway/event/participant_decorator.rb