tramway-event 1.12.0.1 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9f5ee0282d80240ee84fc78f7d3562dd96e5092638db8035fe02274215739a
-  data.tar.gz: 6f9c93594ce896586adfceb26e3c46c77a0162667261ebadeca122f2e0da409f
+  metadata.gz: 544f404ca677177924dc37dbd8663450edf84809af2a9ff829506b59aa0b9c83
+  data.tar.gz: ec912ab9c38d1148f7714505effe8e89db678257e7fbb48c72f21e9235f362ec
 SHA512:
-  metadata.gz: 01e5265ac663a60bed6a886109c04093acab7763c12f82777f6797c65d032506a7779f38162278514ecca9cebe52128c81f35704f58bcf9555b8cbffa9b0883d
-  data.tar.gz: 2e92bca01081dd30f1bb25f9ddd1d132140818bfdcb2d3a0111881bdced91ece6d6ed2d5713da54e6734fd7e6885a207d7ce5ba69425a4736c124fd2bca2e38d
+  metadata.gz: d74327ad1079f66b9a8909610992efa1107006943839385c625545beb88d51dfff37160089832080f60f11d254341b2173afd163d597b86ba342707befefb78b
+  data.tar.gz: c3f7915b8c11b268201bab669c3442ac753c7abd5d6c2b49b7f41955e5bceb9ca34ad42089fc339809ac8c118e09af26fb0b0c14b3e06ec9139e0864d0310e60

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

@@ -7,17 +7,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
     end
 
     def show_attributes
-      %i[
-        title
-        duration
-        events_link
-        state
-        created_at
-        photo
-        request_collecting_duration
-        description
-        participants_list
-      ]
+      %i[ title duration events_link state created_at photo request_collecting_duration description participants_list ]
     end
 
     def show_associations
@@ -103,6 +93,5 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   def state
     state_machine_view object, :state
   end
-
   alias tagline duration
 end

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

@@ -50,4 +50,16 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
       social_networks: (object.creator.social_networks.active if object.creator.respond_to?(:social_networks))
     }
   end
+
+  def is_past?
+    object.end_date < DateTime.now
+  end
+
+  def is_future?
+    object.begin_date > DateTime.now
+  end
+
+  def is_during?
+    object.begin_date < DateTime.now && object.end_date > DateTime.now
+  end
 end

data/app/views/tramway/event/events/_show_page.html.haml

@@ -12,7 +12,7 @@
     или пишите на email
     = mail_to @event.responsible_person[:email] || @application.email
 
-= render 'tramway/landing/blocks/templates/full_page', block: event, buttons: [OpenStruct.new(title: t('.registration'), anchor: '#registration')]
+= render 'tramway/landing/templates/full_page', block: event, buttons: [(OpenStruct.new(title: t('.registration'), anchor: '#registration') if @event.request_collecting_state == :are_being_right_now)]
 - content_for :main_image do
   = request.protocol + request.host_with_port + event.background.url
 %main.event.show
@@ -20,19 +20,20 @@
     - if @event.responsible_person[:social_networks]&.any? || @event.responsible_person[:phone].present? || @event.responsible_person[:email].present?
       = render 'tramway/landing/blocks/block_types/contacts', block: OpenStruct.new(title: 'Контакты'), social_networks: @event.responsible_person[:social_networks], email: @event.responsible_person[:email], phone: @event.responsible_person[:phone]
     - if defined? sections_as_features
-      = render 'tramway/landing/blocks/templates/features_list', collection: sections_as_features
+      = render 'tramway/landing/templates/features_list', collection: sections_as_features
     .row.description
       .col
         != event.description
-    #registration
-      = render 'tramway/event/participants/form', event: event
+    - unless @event.is_past?
+      #registration
+        = render 'tramway/event/participants/form', event: event
     - if defined? sections
       - sections.each_with_index do |section, index|
         = render 'tramway/event/sections/show_page', section: section
         - if index < sections.count - 1
           %br
     - if defined? people_as_features
-      = render 'tramway/landing/blocks/templates/features_list', block: OpenStruct.new(title: "Оргкомитет", description: "", anchor: :organizers), collection: people_as_features, options: { image: { css: { class_name: 'circle' } } }
+      = render 'tramway/landing/templates/features_list', block: OpenStruct.new(title: "Оргкомитет", description: "", anchor: :organizers), collection: people_as_features, options: { image: { css: { class_name: 'circle' } } }
     - if defined? ::Tramway::Partner
       - ::Tramway::Partner::Partnership.partnership_type.values.each do |partnership_type|
-        = render 'tramway/landing/blocks/templates/features_list', block: OpenStruct.new(title: t("enumerize.tramway/partner/partnership.partnership_type.#{partnership_type}")), collection: partners[partnership_type]
+        = render 'tramway/landing/templates/features_list', block: OpenStruct.new(title: t("enumerize.tramway/partner/partnership.partnership_type.#{partnership_type}")), collection: partners[partnership_type]

data/app/views/tramway/event/sections/_show_page.html.haml

@@ -1,2 +1,2 @@
-= render 'tramway/landing/blocks/templates/section_with_image_and_text', block: section
-= render 'tramway/landing/blocks/templates/features_list', collection: section.partakings, options: { image: { css: { class_name: 'circle' } } }
+= render 'tramway/landing/templates/section_with_image_and_text', block: section
+= render 'tramway/landing/templates/features_list', collection: section.partakings, options: { image: { css: { class_name: 'circle' } } }

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.12.0.1'
+    VERSION = '1.12.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.12.0.1
+  version: 1.12.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-24 00:00:00.000000000 Z
+date: 2020-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus