tramway-event 1.9.13 → 1.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1baf70363b9ed24c6ec45db6414846e0442e5808a258459d0cd9f6de4e3dae82
-  data.tar.gz: a0f6e58d815da3ff3b1c4927e07203bf66404e61d319e619d25100ccfb9032db
+  metadata.gz: d2914e53cfd520f85ea7a3e43b76bfb3d298e386f5dc8a16129e8f9288ddc2f7
+  data.tar.gz: 606304cb054cdfd32344b2a2ab94210e561e8a7489326a5e9da67256c41b57e2
 SHA512:
-  metadata.gz: 7cc9921576066fa1f4c495adb8b76d15abc2fd82f39c26814032a6f5ed55e9faa5c80e79985d731b90b25e6356ee0b09351122d79cd7dcf7121f7b85c1961076
-  data.tar.gz: f4a921dedecaa6bc9220aac38d993e31df39d24dc1c0261874339cd6ec13f24561c8f25aff90b7d2885e36d37054b78b9071e988fa48eece1537ca5e2653dd28
+  metadata.gz: b534c5d54d203c65beaab5cc4d12fabcf460ba14a880412ce13fc3de2de29d69e49d4496d060274f522a5b7c0230281ddb05e78bb3390786ee07dc76e1ce3c4d
+  data.tar.gz: 9ccc5d0a5344dba87bb93eff5c7b0ddfe11389d4c4db762b3ad6c5cf08d359a729b04904f2baa12f3b6ad2218c701161b449477d7ab51f2c51265a281c6ae08a

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

@@ -3,10 +3,28 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
     def collections
       [ :all ]
     end
+
+    def show_attributes
+      [ 
+        :title,
+        :duration,
+        :state,
+        :created_at,
+        :photo,
+        :status,
+        :request_collecting_duration,
+        :description,
+        :participants_list
+      ]
+    end
+
+    def list_attributes
+      [ :requested_participants, :approved_participants ]
+    end
   end
 
   delegate :title, to: :object
-  delegate :description, to: :object
+  delegate :status, to: :object
   decorate_association :participants
   decorate_association :participant_form_fields
   decorate_association :sections
@@ -18,15 +36,57 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
     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')}"
+  def description
+    raw object.description
+  end
+
+  def photo
+    image_view object.photo
+  end
+
+  def created_at
+    date_view object.created_at
+  end
+
+  def participants_list
+    content_tag :a, href: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: ::Tramway::Event::Participant, filter: { event_id_eq: object.id }) do
+      I18n.t('helpers.links.open')
+    end
+  end
+
+  def duration(begin_date: object.begin_date, end_date: object.end_date)
+    if begin_date.to_date == end_date.to_date
+      "#{I18n.l(begin_date, format: '%d %B %Y')}"
+    elsif begin_date.month == end_date.month
+      "#{I18n.t('date.from')} #{I18n.l(begin_date, format: '%d')} #{I18n.t('date.to')} #{I18n.l(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')}"
+      "#{I18n.t('date.from')} #{I18n.l(begin_date, format: '%d %B %Y')} #{I18n.t('date.to')} #{I18n.l(end_date, format: '%d %B %Y')}"
     end
   end
 
+  def request_collecting_duration
+    duration begin_date: object.request_collecting_begin_date, end_date: object.request_collecting_end_date
+  end
+
+  def requested_participants
+    object.participants.count
+  end
+
+  def approved_participants
+    if DateTime.now < object.end_date
+      I18n.t('activerecord.attributes.tramway/event/event.not_yet_held')
+    else
+      object.participants.approved.count
+    end
+  end
+
+  def state
+    state_machine_view object, :state
+  end
+
+  def status
+    enumerize_view object.status
+  end
+
   alias tagline duration
 end

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

@@ -33,21 +33,33 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
         end)
       end)
       object.event.participant_form_fields.map do |field|
-        hash = field.options.is_a?(Hash) ? field.options : JSON.parse(field.options.present? ? field.options : '{}')
-        if hash.dig('list_field') == 'true'
-          concat(content_tag(:tr) do
-            concat(content_tag(:td) do
-              field.title
+        hash = if field.options.is_a?(Hash)
+                 field.options 
+               else
+                 begin
+                   JSON.parse(field.options.present? ? field.options : '{}')
+                 rescue => e
+                   I18n.t('.invalid_field_with_error', e)
+                 end
+               end
+        if hash.is_a? Hash
+          if hash.dig('list_field') == 'true'
+            concat(content_tag(:tr) do
+              concat(content_tag(:td) do
+                field.title
+              end)
+              concat(content_tag(:td) do
+                value = object.values&.dig( field.title )
+                if russian_phone_number?(value)
+                  tel_tag value
+                else
+                  value
+                end
+              end)
             end)
-            concat(content_tag(:td) do
-              value = object.values&.dig( field.title )
-              if russian_phone_number?(value)
-                tel_tag value
-              else
-                value
-              end
-            end)
-          end)
+          end
+        else
+          hash
         end
       end.compact
     end

data/config/locales/models.yml

@@ -10,11 +10,20 @@ ru:
     attributes:
       tramway/event/event:
         title: Название
+        name: Название
         description: Описание
         begin_date: Дата начала
         end_date: Дата конца
         request_collecting_begin_date: Дата начала приёма заявок на мероприятие
         request_collecting_end_date: Дата окончания приёма заявок на мероприятие
+        request_collecting_duration: Продолжительность сбора заявок
+        status: Статус на сайте
+        photo: Фоновое изображение
+        duration: Продолжительность
+        requested_participants: Количество заявившихся
+        approved_participants: Количество пришедших
+        not_yet_held: мероприятие ещё не проведено
+        participants_list: Список участников
       tramway/event/participant:
         comment: Примечание
         event: Мероприятие
@@ -55,4 +64,8 @@ ru:
       approved: Окончательно подтверждены
       without_answer: Не ответили
       reserved: В резерве
-
+  enumerize:
+    tramway/event/event:
+      status:
+        main: На главной странице
+        common: Не на главной странице

data/lib/tramway/event/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.13
+  version: 1.9.14
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-16 00:00:00.000000000 Z
+date: 2019-06-23 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email: