tramway-event 1.8.10 → 1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d0adbec3f4557fb5425681c1cffb056109f570b52fe509cb00ac34e145609c6
-  data.tar.gz: 39496020cc747f886ad3523622a5c2b88cd6b2e389c973663b5ff072b2e15ec4
+  metadata.gz: 33005b2651369b99ef16b07e17d5d997b0e171c6bd0011a81bde611039ec478c
+  data.tar.gz: 0144eafb3f6265b0d536c6080f05e338423c0958b66ceaa5db04aea643ac8d40
 SHA512:
-  metadata.gz: b8d22de331a0e8d4675b6cd5c067cef25c9c0aba6dd167f7d9b58e68b5ff6922402b18bd111e3f3f6ed796fceb95c86582b6a6106cb8e19306b3d6229a81f3e2
-  data.tar.gz: 77034da5f129f7e0f4cb86d4db9a674d74b76a17c68346683f6d276d918ed90ce5c60e7537e4a221e560faa0e836c11fe6c82815d6cb7992fd78da737f952dc2
+  metadata.gz: 0fb2bf375991bc12b8dcf08c3bd44142d6f0e52a923e591376ce6ae16cdbd3657baeb837b69b04b61036c96499431704c5a147c26a71dc353196fa1a001b57c6
+  data.tar.gz: 440445b2629e5127a44731c60980c0eb1094480b59995d7b178073efe7b206a5d3cfe1bdc6132e27812ae182afc53ff9cbdc649b23e4b6e8ac2e46544a5e13d0

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

@@ -2,12 +2,18 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
   layout 'tramway/landing/application'
 
   def show
-    @event = ::Tramway::Event::Events::Show::EventDecorator.decorate ::Tramway::Event::Event.find params[:id]
+    event = ::Tramway::Event::Event.find params[:id]
+    @event = ::Tramway::Event::Events::Show::EventDecorator.decorate event
     @participant_form = ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(request.uuid, @event).new ::Tramway::Event::Participant.new
     @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.actual.map { |e| ::Tramway::Event::Events::Show::EventDecorator.decorate e }
     @people_as_features = @event.partakings.active.map { |p| ::Tramway::Event::PartakingFeatureDecorator.decorate p }
+    @partners = ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
+      hash.merge! partnership_type => (event.send(partnership_type.to_s.pluralize).map do |partner|
+        Tramway::Partner::OrganizationFeatureDecorator.decorate partner
+      end)
+    end
   end
 end

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

@@ -12,6 +12,10 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   delegate :partakings, to: :object
   delegate :request_collecting_state, to: :object
 
+  ::Tramway::Partner::Partnership.partnership_type.values.each do |partnership_type|
+    decorate_association partnership_type.to_s.pluralize
+  end
+
   def background
     object.photo
   end

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

@@ -1,4 +1,4 @@
-class ::Tramway::Event::SectionFeatureDecorator < ::Tramway::Core::ApplicationDecorator
+class ::Tramway::Event::SectionFeatureDecorator < ::Tramway::Landing::BlockTypes::FeaturesDecorator
   delegate :icon, to: :object
   delegate :title, to: :object
   delegate :description, to: :object

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

@@ -5,17 +5,26 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   has_many :participant_form_fields, 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
+  has_many :organizations, as: :partners, through: :partnerships, class_name: 'Tramway::Partner::Organization'
+
+  ::Tramway::Partner::Partnership.partnership_type.values.each do |partnership_type|
+    has_many partnership_type.pluralize.to_sym, (-> do
+      joins(:partnerships).where 'tramway_partner_partnerships.partnership_type = ?', partnership_type
+    end), foreign_key: :organization_id, source: :organization, through: :partnerships, class_name: 'Tramway::Partner::Organization'
+  end
 
   enumerize :status, default: :common, in: [ :common, :main ]
 
   scope :main_event, -> { where(status: :main) }
   scope :actual, -> { where 'end_date > ?', DateTime.now }
   scope :past, -> { where 'end_date < ?', DateTime.now }
-
+  
   def request_collecting_state
     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&.past? && request_collecting_end_date&.future?
   end
+
 end

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

@@ -27,7 +27,6 @@
   = render 'tramway/landing/blocks/templates/full_page', block: event, buttons: [OpenStruct.new(title: t('.registration'), anchor: '#registration')]
 %main
   .container
-    -#= render 'tramway/landing/blocks/templates/features_list', block: OpenStruct.new(title: "Направления IT Way'18", description: "Вы можете выбрать любое из направлений", anchor: :features), collection: sections_as_features
     = render 'tramway/landing/blocks/templates/features_list', collection: sections_as_features
     %br
     .row
@@ -42,3 +41,5 @@
       - if index < sections.count - 1
         %br
     = render 'tramway/landing/blocks/templates/features_list', block: OpenStruct.new(title: "Оргкомитет", description: "", anchor: :organizers), collection: people_as_features, options: { image: { css: { class_name: 'circle' } } }
+    - ::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]

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

@@ -6,5 +6,5 @@
       %li
         = link_to event.title, event_path(event.id)
 - content_for :body_content do
-  = render 'tramway/event/events/show_page', event: @event, sections: @sections, sections_as_features: @sections_as_features, people_as_features: @people_as_features
+  = render 'tramway/event/events/show_page', event: @event, sections: @sections, sections_as_features: @sections_as_features, people_as_features: @people_as_features, partners: @partners
   = render "tramway/landing/blocks/block_types/footer", block: @footer

data/lib/tramway/event/generators/install_generator.rb

@@ -7,6 +7,7 @@ module Tramway::Event::Generators
     source_root File.expand_path('../templates', __FILE__)
 
     def run_other_generators
+      generate 'tramway:partner:install'
     end
 
     def self.next_migration_number(path)

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.8.10'
+    VERSION = '1.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.8.10
+  version: '1.9'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2018-12-24 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email: