tramway-event 1.9.14 → 1.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2914e53cfd520f85ea7a3e43b76bfb3d298e386f5dc8a16129e8f9288ddc2f7
-  data.tar.gz: 606304cb054cdfd32344b2a2ab94210e561e8a7489326a5e9da67256c41b57e2
+  metadata.gz: 4d5aedf82a0123d8ba2b62c170ad20733800172841d4ed33f7552d6ff3f2d482
+  data.tar.gz: c51145ef689bef660d69278c70af164a444a4c36add2754b6cedb71dade305d9
 SHA512:
-  metadata.gz: b534c5d54d203c65beaab5cc4d12fabcf460ba14a880412ce13fc3de2de29d69e49d4496d060274f522a5b7c0230281ddb05e78bb3390786ee07dc76e1ce3c4d
-  data.tar.gz: 9ccc5d0a5344dba87bb93eff5c7b0ddfe11389d4c4db762b3ad6c5cf08d359a729b04904f2baa12f3b6ad2218c701161b449477d7ab51f2c51265a281c6ae08a
+  metadata.gz: 9061344497386d9c10c81e0c03b23eb7775c81d0cb505b8ea37ec0ec058203d95d78673cbc2adb31238e6bb0124412aa0522fd40c949278a14a4fde11a56c256
+  data.tar.gz: a92c2d1e1dea7abdee9d0c1764c9c4141729ecb7252b8515bbccb395e350e05e9165c2c7b27b77c9152a908b3312cbe4d1422b2a11c063f9b03791c07ca1f3df

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

@@ -3,9 +3,31 @@ class Tramway::Event::PartakingDecorator < ::Tramway::Core::ApplicationDecorator
     def collections
       [ :all ]
     end
+
+    def show_attributes
+      [ :part_name, :event_duration, :part_description ]
+    end
   end
 
+  decorate_association :part
+
   def name
     "#{object.person.first_name} #{object.person.last_name} - #{object.position}"
   end
+  
+  def part_name
+    part.name
+  end
+
+  def event_duration
+    if part.respond_to? :duration
+      part.duration
+    else
+      part.event.duration
+    end
+  end
+
+  def part_description
+    raw part.respond_to?(:description) ? part.description : part.event.description
+  end
 end

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

@@ -6,6 +6,7 @@ class Tramway::Event::SectionDecorator < ::Tramway::Landing::BlockTypes::Feature
   end
 
   delegate :description, to: :object
+  decorate_association :event
   decorate_association :partakings, decorator: Tramway::Event::PartakingFeatureDecorator
 
   def name
@@ -25,6 +26,10 @@ class Tramway::Event::SectionDecorator < ::Tramway::Landing::BlockTypes::Feature
   end
 
   def event_title
-    object.event.title
+    event.title
+  end
+
+  def event_duration
+    event.duration
   end
 end

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

@@ -3,4 +3,6 @@ class Tramway::Event::Partaking < ::Tramway::Core::ApplicationRecord
   enumerize :part_type, in: [ 'Tramway::Event::Event', 'Tramway::Event::Section' ]
 
   belongs_to :person, class_name: 'Tramway::Event::Person'
+
+  search_by :position, person: [:first_name, :last_name, :description]
 end

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

@@ -47,5 +47,5 @@ class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
   scope :without_answer, -> { where participation_state: :without_answer }
   scope :reserved, -> { where participation_state: :reserved }
 
-  pg_search_scope :search, against: [:values]
+  search_by :values
 end

data/config/locales/models.yml

@@ -36,6 +36,10 @@ ru:
         position: Позиция на странице мероприятия
       tramway/event/participant_form_field:
         title: Название (в Tramway название Поля анкеты - это ключ для выборки пользователей. Если вы измените ключ к выборке пользователей, то все пользователи, получившие данные по предыдущему ключу по этой выборке показываться не будут)
+      tramway/event/partaking:
+        part_name: Мероприятие
+        event_duration: Дата мероприятия
+        part_description: Описание
   cases:
     tramway/event/event:
       plural: мероприятия

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.9.14'
+    VERSION = '1.9.15'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.14
+  version: 1.9.15
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails engine for events