tramway-event 1.9.27.3 → 1.9.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76552ff5dda59b163764bf4698e0c4c75b2693e3e60f2dbd7e533868e79585a3
-  data.tar.gz: fd33dcefca151bea4c14bab7b4e20190f9040dee74cefcb5a3da228cc3ebedab
+  metadata.gz: 55da21331575531d635e55fb6a79076a6522c88cca286b08db2996ab8bcc1cfc
+  data.tar.gz: 90b93d96928a56c3d7fe0a82475b7168c2d995bd9d2358df102553e2794b7bf1
 SHA512:
-  metadata.gz: a9cf10218564e0aa1c49fece8f4af25b7c08aa519fe8038bb724ace879ff133387a0376c039ece9500e395ddd0a0673786848615ca6fec6ffd38eafbd4ac023a
-  data.tar.gz: 6c29d51644ff6664e0eb276324e84b4ca890e7fcacf05917ecb16c2fd60ab81e0f37cd7b04896b682a83a8da54f42ee28c181770bc1bc5fff1e58464e25e2ee9
+  metadata.gz: 2cb7761e9c4aabfafd54b191916cce6f0f90ca75577c38f922a41e382bef6143a26e33e28976cbd933a9b7820961138dacb43f090dbbde3a93440f783618024a
+  data.tar.gz: 8ede73215d0a59bad13f5f25a9807c0a45f300638965c1d49ca77bfd1e24ef0e1ab37b91454beef8ef0efb78f38f66e8d590929f8521cfb0e8c14f64523ed620

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

@@ -17,6 +17,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
         status
         request_collecting_duration
         description
+        participants_list
       ]
     end
 

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

@@ -4,7 +4,7 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
   include HTMLTagsHelpers
   class << self
     def collections
-      %i[requested waiting prev_approved without_answer approved rejected reserved all]
+      %i[all requested waiting prev_approved without_answer approved rejected reserved]
     end
 
     def list_attributes

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

@@ -14,18 +14,26 @@ class Tramway::Event::ParticipantXlsxDecorator < Tramway::Export::Xlsx::Applicat
   end
 
   def full_name
+    return unless object.values
+
     "#{object.values['Фамилия'] || object.values['Фамилия ']} #{object.values['Имя'] || object.values['Имя ']}"
   end
 
   def email
+    return unless object.values
+
     object.values['Email']
   end
 
   def phone
+    return unless object.values
+
     object.values['Телефон']
   end
 
   def organization
+    return unless object.values
+
     object.values['Место работы/ Учебное заведение']
   end
 

data/app/forms/tramway/event/event_form.rb

@@ -2,11 +2,12 @@
 
 class Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
   properties :title, :description, :begin_date, :end_date, :photo, :status,
-    :request_collecting_begin_date, :request_collecting_end_date
+    :request_collecting_begin_date, :request_collecting_end_date, :short_description
 
   def initialize(object)
     super(object).tap do
       form_properties title: :string,
+                      short_description: :text,
                       description: :ckeditor,
                       begin_date: :date_picker,
                       end_date: :date_picker,

data/app/forms/tramway/event/participant_form.rb

@@ -11,8 +11,8 @@ class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
       ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(
         SecureRandom.hex,
         object.event,
+        participation_state_event: :default,
         comment: :string,
-        participation_state_event: :string
       ).new object
     else
       super(object).tap do |obj|

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

@@ -13,8 +13,8 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
 
   enumerize :status, default: :common, in: %i[common main]
 
-  scope :main_event, -> { where(status: :main) }
-  scope :actual, -> { where 'end_date > ?', DateTime.now }
+  scope :main_event, -> { active.where(status: :main) }
+  scope :actual, -> { order(:begin_date).where('end_date > ?', DateTime.now) }
   scope :past, -> { where 'end_date < ?', DateTime.now }
 
   def request_collecting_state

data/config/locales/models.yml

@@ -38,6 +38,7 @@ ru:
         participants_list: Список участников
         does_not_have_end_date: мероприятие не имеет даты окончания
         participant_form_fields: Поле анкеты
+        short_description: Краткое описание
       tramway/event/participant:
         name: Имя
         list_fields: Данные

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

@@ -46,7 +46,8 @@ module Tramway::Event::Generators
         :add_description_to_tramway_event_people,
 
         :create_tramway_event_places,
-        :create_tramway_event_events_places
+        :create_tramway_event_events_places,
+        :add_short_description_to_tramway_event_events
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

data/lib/tramway/event/generators/templates/add_short_description_to_tramway_event_events.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddShortDescriptionToTramwayEventEvents < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_event_events, :short_description, :text
+  end
+end

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.27.3'
+    VERSION = '1.9.28.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.27.3
+  version: 1.9.28.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-07 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -82,6 +82,7 @@ files:
 - lib/tramway/event/generators/templates/add_position_to_tramway_event_participant_form_fields.rb
 - lib/tramway/event/generators/templates/add_position_to_tramway_event_sections.rb
 - lib/tramway/event/generators/templates/add_request_period_to_tramway_event_events.rb
+- lib/tramway/event/generators/templates/add_short_description_to_tramway_event_events.rb
 - lib/tramway/event/generators/templates/add_state_to_tramway_event_partakings.rb
 - lib/tramway/event/generators/templates/add_status_to_tramway_event_events.rb
 - lib/tramway/event/generators/templates/create_tramway_event_events.rb