tramway-event 1.9.27.6 → 1.9.28.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 241c264a182d5ca87776f79cc40d2377b152cd8c518d881ecfa1bac2b9f85a50
-  data.tar.gz: 7e6c0ffa780c771a29310bc6a9e0a9266d7c324098c40a571c7f76874a438227
+  metadata.gz: 0c67bc155b83f7cbba7a4de8635d9ac44dc90e493bc14bcb9e5bc9579a3d5044
+  data.tar.gz: aa06f7d84bc5d0f81693278ec4ffc015eb6c9b0cba8aefab5de06d0f227feb7b
 SHA512:
-  metadata.gz: 8769df93fe84e0cbfc9214bc5a8b137027ad998918dafa0bb74f4834b0e365730e37f3973a9525934e309382854e3a0de7e4ffd0952985309d26cf2ae4d5d5be
-  data.tar.gz: eece803bfc35d6ab469df22309503ad4838247ec0669bc52e247eee9a5503bdd6ff06dc92731a93545db6c7560b70e9939848813af7c63ab3fc67794379a6da8
+  metadata.gz: 52a81fe64f947ae5cd71c661b9a82fbf7bd625c40d7d9dc246951db5350c1dcd47d3cd9cd79edd2e4b012886c29626ecc35bd2aaa1e7a779865a4836272c881c
+  data.tar.gz: de60ed038290c8b289504bf049ed551dec05f4ec346d519c143b81e96899e42f579507e5aa584013fff3b34f8f654368c884341673288bcf2eb93bcdd33bd57a

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 → participant_xls_decorator.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::ParticipantXlsxDecorator < Tramway::Export::Xlsx::ApplicationDecorator
+class Tramway::Event::ParticipantXlsDecorator < Tramway::Export::Xls::ApplicationDecorator
   class << self
     def columns
       %i[full_name email phone organization event].map do |attribute|
@@ -9,23 +9,31 @@ class Tramway::Event::ParticipantXlsxDecorator < Tramway::Export::Xlsx::Applicat
     end
 
     def filename
-      'participants.xlsx'
+      'participants.xls'
     end
   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
 

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

@@ -14,7 +14,7 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   enumerize :status, default: :common, in: %i[common main]
 
   scope :main_event, -> { active.where(status: :main) }
-  scope :actual, -> { where 'end_date > ?', DateTime.now }
+  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.6'
+    VERSION = '1.9.28.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.27.6
+  version: 1.9.28.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-02 00:00:00.000000000 Z
+date: 2020-02-16 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -35,19 +35,19 @@ files:
 - app/decorators/tramway/event/partaking_feature_decorator.rb
 - app/decorators/tramway/event/participant_decorator.rb
 - app/decorators/tramway/event/participant_form_field_decorator.rb
-- app/decorators/tramway/event/participant_xlsx_decorator.rb
+- app/decorators/tramway/event/participant_xls_decorator.rb
 - app/decorators/tramway/event/person_decorator.rb
 - 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