tramway-event 1.9.27.4 → 1.9.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d76ad370a8dedbcfb63000ecd9b0fb800b72140cf80d855f17c89854aa12d9
-  data.tar.gz: 0cfa5c80e3f9e7ea7424448fab681b8d7fdd3583cff8c5aa628eb43c31caee88
+  metadata.gz: 73a405b2fac690efce6bd5c9c37db9ac2d959cc8f2da7d18bf1c1dbdb7ae8832
+  data.tar.gz: 5ead2f3910c1aad07658d7a7ee54fced56c03be44f5da02d1bfcf48b228d9efd
 SHA512:
-  metadata.gz: 86795c9de5c3369f1be2567029ce18cd24e1ac3e9d22460857a47447489fee740268a1aafa2b988dbdb2cc5d829619b77df936ec9cf69957e96b43aac1a5f54b
-  data.tar.gz: 8c8a06008f3b4c48dce24f5f6a64bf2094e89b1c4249340b891c80c4af0205286658ca262b4a603d59a517412b07d4d68c8dcec1895605e41c7ec72ebb0e37c8
+  metadata.gz: aa439dd85f1188389a9cb9416a82770d97f51cba9eca16c3fdb4142adea5c48680dd9d95034de7043a5146e900eac4441fe82c937c2719758e321ba264a0f6f7
+  data.tar.gz: c2ce2baf15af424151620426861d293be00d61cdd36912e583e7d49f2521e8437b05601faa931567523d9922cb4c557028babe2f16e140e3dddff002a4765994

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 → admin/tramway}/event/event_form.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-class Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
+class Admin::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 → admin/tramway}/event/partaking_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::PartakingForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::PartakingForm < ::Tramway::Core::ApplicationForm
   properties :part_id, :part_type, :person_id, :position
   associations :person, :part
 

data/app/forms/{tramway → admin/tramway}/event/participant_form.rb

@@ -2,7 +2,7 @@
 
 require 'securerandom'
 
-class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
   properties :participation_state_event, :comment
   association :event
 
@@ -11,6 +11,7 @@ class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
       ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(
         SecureRandom.hex,
         object.event,
+        participation_state_event: :default,
         comment: :string,
       ).new object
     else

data/app/forms/{tramway → admin/tramway}/event/participant_form_field_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplicationForm
+class Admin::Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplicationForm
   properties :title, :description, :field_type, :options, :position, :list_field
   association :event
 

data/app/forms/{tramway → admin/tramway}/event/person_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::PersonForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::PersonForm < ::Tramway::Core::ApplicationForm
   properties :first_name, :last_name, :photo, :description
 
   def initialize(object)

data/app/forms/{tramway → admin/tramway}/event/place_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::PlaceForm < Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::PlaceForm < Tramway::Core::ApplicationForm
   properties :title, :description, :coordinates, :photo, :city
 
   def initialize(object)

data/app/forms/{tramway → admin/tramway}/event/section_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
   properties :event, :title, :description, :photo, :icon, :position
   association :event
 

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.4'
+    VERSION = '1.9.28.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.27.4
+  version: 1.9.28.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -40,14 +40,14 @@ files:
 - app/decorators/tramway/event/place_decorator.rb
 - app/decorators/tramway/event/section_decorator.rb
 - app/decorators/tramway/event/section_feature_decorator.rb
-- app/forms/tramway/event/event_form.rb
-- app/forms/tramway/event/partaking_form.rb
+- app/forms/admin/tramway/event/event_form.rb
+- app/forms/admin/tramway/event/partaking_form.rb
+- app/forms/admin/tramway/event/participant_form.rb
+- app/forms/admin/tramway/event/participant_form_field_form.rb
+- app/forms/admin/tramway/event/person_form.rb
+- app/forms/admin/tramway/event/place_form.rb
+- app/forms/admin/tramway/event/section_form.rb
 - app/forms/tramway/event/participant_extended_form_creator.rb
-- app/forms/tramway/event/participant_form.rb
-- app/forms/tramway/event/participant_form_field_form.rb
-- app/forms/tramway/event/person_form.rb
-- app/forms/tramway/event/place_form.rb
-- app/forms/tramway/event/section_form.rb
 - app/helpers/tramway/event/application_helper.rb
 - app/jobs/tramway/event/application_job.rb
 - app/mailers/tramway/event/application_mailer.rb
@@ -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