tramway-event 1.9.22 → 1.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21bfca3b1b8713bd4755da8068ae7459d8983465bf84f687807810ae35047080
-  data.tar.gz: efcfba6f216a1b44467dcaf961ffada72ab375bff88a1d34579f0ec7724c32ca
+  metadata.gz: 259b5618ba826807b3824dcd0abd0055e48d03a94c44bb24183705abc7584303
+  data.tar.gz: 7706babd97fc694ed8221a4e4017685c8dcc930fba1a513642ae6c259532b2d3
 SHA512:
-  metadata.gz: 45bdb4150364af1107161812557eecb3f77bee2bd7a99202c744641973118eec76fe918b98cccc217071cf1eafc686bb1e7b63a8f1551d877c8569edde35abf8
-  data.tar.gz: 377445c6ed0a8dd9fcd7607ad0c81c19ceaee23afd5b8e18de37c2bdff8263ab1fdc56ddb52d497ba751dd2a0202b5df3e518f94fcb9780e6a59f442a4c47494
+  metadata.gz: 1c0a9523dfa7b37590dec9be5d3c09ee9ad24ca5c9d920866e47c8ec35209760c3da5d119bce254f557c9d6bd2bee2f847ae5c4a1e960765850baf3db64c687d
+  data.tar.gz: 167fdbb658824a4891d7abdd64a25ff3f9aa2b42d5a4ad4b54edd6276a6c704eadbcb57012efad5e83cb4f5b93bdd1bfd9b040f5b14331882e2365a88d8acde5

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

@@ -68,6 +68,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
 
   def request_collecting_duration
     return if object.request_collecting_begin_date.nil? || object.request_collecting_end_date.nil?
+
     duration begin_date: object.request_collecting_begin_date, end_date: object.request_collecting_end_date
   end
 

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

@@ -11,6 +11,10 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
       [:list_fields]
     end
     delegate :human_participation_state_event_name, to: :model_class
+
+    def show_attributes
+      %i[id event values state created_at updated_at participation_state comment]
+    end
   end
 
   decorate_association :event
@@ -24,6 +28,10 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
     end
   end
 
+  def event
+    object.event.title
+  end
+
   def list_fields
     content_tag :table, class: :table do
       concat(content_tag(:tr) do
@@ -86,6 +94,24 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
     end
   end
 
+  def state
+    state_machine_view object, :state
+  end
+
+  def created_at
+    date_view object.created_at
+  end
+
+  def updated_at
+    date_view object.updated_at
+  end
+
+  def participation_state
+    state_machine_view object, :participation_state
+  end
+
+  delegate :comment, to: :object
+
   def participation_state_button_color(event)
     case event
     when :previous_approve, :approve

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

@@ -9,8 +9,16 @@ class Tramway::Event::ParticipantFormFieldDecorator < ::Tramway::Core::Applicati
     def list_attributes
       [:event_title]
     end
+
+    def show_attributes
+      %i[id title description field_type event_title state created_at updated_at options position]
+    end
   end
 
+  delegate :description, to: :object
+  delegate :options, to: :object
+  delegate :position, to: :object
+
   def title
     "#{object.title} #{object.event.title}"
   end
@@ -18,4 +26,20 @@ class Tramway::Event::ParticipantFormFieldDecorator < ::Tramway::Core::Applicati
   def event_title
     object.event.title
   end
+
+  def field_type
+    enumerize_view object.field_type
+  end
+
+  def state
+    state_machine_view object, :state
+  end
+
+  def created_at
+    date_view object.created_at
+  end
+
+  def updated_at
+    date_view object.updated_at
+  end
 end

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

@@ -24,7 +24,5 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
     return :are_being_right_now if request_collecting_begin_date&.past? && request_collecting_end_date&.future?
   end
 
-  if defined? ::Tramway::Partner
-    include ::Tramway::Partner::Scopes
-  end
+  include ::Tramway::Partner::Scopes if defined? ::Tramway::Partner
 end

data/app/views/tramway/event/participants/_form.html.haml

@@ -8,4 +8,4 @@
         = f.input :event_id, as: :hidden, input_html: { value: event.id, class: class_name, id: "#{class_name}_event_id", name: "#{class_name}[event_id]" }
         - event.participant_form_fields.inputs_list.each do |field|
           = render 'tramway/core/shared/input_extended', field: field, class_name: class_name, f: f
-        = f.button :submit, t('.submit_form')
+        = f.button :submit, t('.submit_form')

data/config/locales/models.yml

@@ -1,4 +1,14 @@
 ru:
+  simple_form:
+    tramway/event/participant_form_field:
+      input:
+        field_type:
+          Yes: Да
+          no: Нет
+
+  default:
+    collections:
+      all: Все
   activerecord:
     models:
       tramway/event/event: Мероприятие
@@ -27,12 +37,17 @@ ru:
         participants_list: Список участников
         does_not_have_end_date: мероприятие не имеет даты окончания
       tramway/event/participant:
+        name: Имя
+        list_fields: Данные
         comment: Примечание
         event: Мероприятие
         full_name: Полное имя
         email: Email
         phone: Телефон
         organization: Организация
+        participation_state: Статус участника
+        event: Мероприятие
+        values: Данные
       tramway/event/section:
         title: Название
         description: Описание
@@ -41,6 +56,13 @@ ru:
         icon: Иконка
         position: Позиция на странице мероприятия
       tramway/event/participant_form_field:
+        event_title: Мероприятие
+        name: Название
+        event: Мероприятие
+        description: Описание
+        field_type: Тип поля
+        position: Позиция в анкете
+        options: Параметры
         title: Название (в Tramway название Поля анкеты - это ключ для выборки пользователей. Если вы измените ключ к выборке пользователей, то все пользователи, получившие данные по предыдущему ключу по этой выборке показываться не будут)
       tramway/event/partaking:
         part_name: Мероприятие
@@ -82,3 +104,10 @@ ru:
       status:
         main: На главной странице
         common: Не на главной странице
+    tramway/event/participant_form_field:
+      field_type:
+        text: Многострочный текст
+        string: Текст
+        numeric: Число
+        date_picker: Дата
+        select: Выпадающий список (да/нет)

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.22'
+    VERSION = '1.9.23'
   end
 end

metadata

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