tramway-event 1.9.27.2 → 1.9.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb1e1ca115b97a701d2b64d567917c9d0cc389dcb6d37138576e9629412948e9
-  data.tar.gz: 70e4fa964d1690414ecd04e3546ef434a02bd56f9f2af8a284e90196d548a1d3
+  metadata.gz: 6722dde4b829b38429a1403e26b967326d932d3ae37a1f4c2e8858f6fe0784cc
+  data.tar.gz: 0e6c0d0cf2989d4ac14daa4c5236160f72af1d10de0f78048021a8f157ddc16d
 SHA512:
-  metadata.gz: 60e63ab6c330eb7cc533485efaed2783cb3870097c60a53eb8f118565bcab172353c9ab7993e5d8bc6f7dd698e71d82956f959ca90b0f0ba2333a9a38e9e6268
-  data.tar.gz: 70c3cb5db52cbd8e71830447e3cbd518433c1b61f0165e05362679d4599193f76f64975f943f9f22d7131b26cee78bd1604eb9e019d8a704149a5c59b9048277
+  metadata.gz: a4366960890115f07f118f7da6ea51ddc9bb4acb58c8ee5df5ded6f6d4e000437771d4a8d317a5b935a376ef1384734cbf370310ae73f1618a4045624f7fc79b
+  data.tar.gz: 8593dd349e943ccfd494e1195e8cf43391149cadaa71e11730b8b35bce56f7fa8df0d8973f597d68d5068b8d0fd12af11c827633ab4ceada98bd6fd108b280fe

data/README.md

@@ -48,6 +48,13 @@ Tramway::Admin.set_available_models ::Tramway::Event::Event, ::Tramway::Event::P
 mount Tramway::Event::Engine, at: '/'
 ```
 
+## How-to
+
+### Create event
+
+English docs coming soon...
+[На русском](https://github.com/ulmic/tramway-dev/tree/develop/tramway-event/docs/russian)
+
 ## Contributing
 Contribution directions go here.
 

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
@@ -44,7 +44,7 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
           object.event.title
         end)
       end)
-      object.event.participant_form_fields.map do |field|
+      object.event.participant_form_fields.active.map do |field|
         hash = if field.options.is_a?(Hash)
                  field.options
                else

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.2'
+    VERSION = '1.9.28'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.27.2
+  version: 1.9.28
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-06 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