tramway-event 1.9.19.1 → 1.9.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41f0767e6a896e151cc837b8728ee5175e2441fc2ecfbb3e2afcff941e199b5f
-  data.tar.gz: 6d37f908a7618031f73771de99e46ebacddf80503c30c5e8c8caf108d3497a47
+  metadata.gz: 30ef78204cd4ee382b3d6fe1f2ea0aee9a6a73dfa20763b7d7315b035dd66840
+  data.tar.gz: 0f809850f6a465cc37bd40aea40ead15e884c5c6cbb1d0bc0c0010859bcce088
 SHA512:
-  metadata.gz: cfdebc74750ff1e24f39294707007227512045e16a1c47ac67a1d25914735f62f4ad805eb91ee26adc63e5e9d0a00cd670ba96162c69832a51de519b93e7877e
-  data.tar.gz: 4ad68d335c853d2338188c48c1fd236308588de1b0670828c3361b0da14fe62e88341c59cdd1a9df3c5ca7b34f2df3476bfcd683b6fbd3ebbb75916ba0d2c268
+  metadata.gz: e79568865d3c6cf054cde85248c3807da326d38fb64b1ca8428276bec75dc3f68821fac6dc8e9a07529caa36f5aa35f2662ec57ac591c33bbffd3278bf46d645
+  data.tar.gz: 3f19ed519d3052c77806f16412ca89400b12db5285d496bb23d0b9ae7cd642ac2fc492b0b07139fd91f1b17804b5342e0110ae093ad438a9d5130609538387cd

data/README.md

@@ -9,16 +9,30 @@ Add this line to your application's Gemfile:
 
 ```ruby
 gem 'tramway-event'
+gem 'carrierwave'
+gem 'more_html_tags'
 ```
 
 And then execute:
 ```bash
 $ bundle
 ```
+*Gemfile*
+```ruby
+gem 'tramway-event'
+```
 
-Or install it yourself as:
-```bash
-$ gem install tramway-event
+Then run:
+```shell
+rails g tramway:event:install
+rails db:migrate
+```
+
+Then make `tramway-landing` installation. [How-to](https://github.com/ulmic/tramway-dev/blob/develop/tramway-landing/README.md#installation)
+
+*config/initializers/tramway.rb*
+```ruby
+Tramway::Admin.set_available_models ::Tramway::Event::Event, ::Tramway::Event::ParticipantFormField, ::Tramway::Event::Participant, project: #{project_which_you_used_in_the_application}
 ```
 
 ## Contributing

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -14,14 +16,11 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
-
 load 'rails/tasks/statistics.rake'
 
-
-
 require 'bundler/gem_tasks'
 
 require 'rake/testtask'
@@ -32,5 +31,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task default: :test

data/app/assets/stylesheets/tramway/event/events/show.css.sass

@@ -1,7 +1,7 @@
 @import 'bootstrap'
 @import 'tramway/core/application'
 @import 'tramway/landing/application'
-@import 'tramway/conference/application'
+// @import 'tramway/conference/application'
 
 body
   margin: 0

data/app/controllers/tramway/event/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Event
     class ApplicationController < ::Tramway::Core::ApplicationController

data/app/controllers/tramway/event/events_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::EventsController < Tramway::Event::ApplicationController
   layout 'tramway/landing/application'
 

data/app/controllers/tramway/event/participants_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::ParticipantsController < Tramway::Event::ApplicationController
   def create
     event = ::Tramway::Event::Event.find params[:tramway_event_participant][:event_id]

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

@@ -1,25 +1,27 @@
+# frozen_string_literal: true
+
 class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   class << self
     def collections
-      [ :all ]
+      [:all]
     end
 
     def show_attributes
-      [ 
-        :title,
-        :duration,
-        :state,
-        :created_at,
-        :photo,
-        :status,
-        :request_collecting_duration,
-        :description,
-        :participants_list
+      %i[
+        title
+        duration
+        state
+        created_at
+        photo
+        status
+        request_collecting_duration
+        description
+        participants_list
       ]
     end
 
     def list_attributes
-      [ :requested_participants, :approved_participants ]
+      %i[requested_participants approved_participants]
     end
   end
 
@@ -56,7 +58,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
 
   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')}"
+      I18n.l(begin_date, format: '%d %B %Y').to_s
     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
@@ -65,6 +67,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def request_collecting_duration
+    return if object.request_collecting_begin_date.nil? || object.request_collecting_end_date.nil?
     duration begin_date: object.request_collecting_begin_date, end_date: object.request_collecting_end_date
   end
 
@@ -73,10 +76,14 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def approved_participants
-    if DateTime.now < object.end_date
-      I18n.t('activerecord.attributes.tramway/event/event.not_yet_held')
+    if object.end_date.present?
+      if DateTime.now < object.end_date
+        I18n.t('activerecord.attributes.tramway/event/event.not_yet_held')
+      else
+        object.participants.approved.count
+      end
     else
-      object.participants.approved.count
+      I18n.t('activerecord.attributes.tramway/event/event.does_not_have_end_date')
     end
   end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::EventLinkDecorator < ::Tramway::Landing::LinkDecorator
   delegate :title, to: :object
 

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::ApplicationDecorator
   class << self
     def collections
-      [ :all ]
+      [:all]
     end
   end
 
@@ -12,8 +14,10 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   delegate :partakings, to: :object
   delegate :request_collecting_state, to: :object
 
-  ::Tramway::Partner::Partnership.partnership_type.values.each do |partnership_type|
-    decorate_association partnership_type.to_s.pluralize
+  if defined?(::Tramway::Partner)
+    ::Tramway::Partner::Partnership.partnership_type.values.each do |partnership_type|
+      decorate_association partnership_type.to_s.pluralize
+    end
   end
 
   def background
@@ -22,7 +26,7 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
 
   def duration
     if object.begin_date.to_date == object.end_date.to_date
-      "#{I18n.l(object.begin_date, format: '%d %B %Y')}"
+      I18n.l(object.begin_date, format: '%d %B %Y').to_s
     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')}"
     else
@@ -31,10 +35,12 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   end
 
   def partners
-    @partners ||= ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
-      hash.merge! partnership_type => (object.send(partnership_type.to_s.pluralize).active.map do |partner|
-        Tramway::Partner::OrganizationFeatureDecorator.decorate partner
-      end)
+    if defined?(::Tramway::Partner)
+      @partners ||= ::Tramway::Partner::Partnership.partnership_type.values.reduce({}) do |hash, partnership_type|
+        hash.merge! partnership_type => (object.send(partnership_type.to_s.pluralize).active.map do |partner|
+          Tramway::Partner::OrganizationFeatureDecorator.decorate partner
+        end)
+      end
     end
   end
 

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

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 class Tramway::Event::PartakingDecorator < ::Tramway::Core::ApplicationDecorator
   class << self
     def collections
-      [ :all ]
+      [:all]
     end
 
     def show_attributes
-      [ :part_name, :event_duration, :part_description ]
+      %i[part_name event_duration part_description]
     end
   end
 
@@ -14,7 +16,7 @@ class Tramway::Event::PartakingDecorator < ::Tramway::Core::ApplicationDecorator
   def name
     "#{object.person.first_name} #{object.person.last_name} - #{object.position}"
   end
-  
+
   def part_name
     part.name
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ::Tramway::Event::PartakingFeatureDecorator < ::Tramway::Landing::BlockTypes::FeaturesDecorator
   def text
     object.position&.html_safe

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorator
   include HTMLTagsHelpers
   class << self
     def collections
-      [ :requested, :waiting, :prev_approved, :without_answer, :approved, :rejected, :reserved, :all ]
+      %i[requested waiting prev_approved without_answer approved rejected reserved all]
     end
 
     def list_attributes
@@ -34,11 +36,11 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
       end)
       object.event.participant_form_fields.map do |field|
         hash = if field.options.is_a?(Hash)
-                 field.options 
+                 field.options
                else
                  begin
                    JSON.parse(field.options.present? ? field.options : '{}')
-                 rescue => e
+                 rescue StandardError => e
                    I18n.t('.invalid_field_with_error', e)
                  end
                end
@@ -49,7 +51,7 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
                 field.title
               end)
               concat(content_tag(:td) do
-                value = object.values&.dig( field.title )
+                value = object.values&.dig(field.title)
                 if russian_phone_number?(value)
                   tel_tag value
                 else
@@ -74,7 +76,7 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
           end)
           concat(content_tag(:td) do
             concat(if russian_phone_number?(value)
-                    tel_tag value
+                     tel_tag value
                    else
                      value
                    end)

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Tramway::Event::ParticipantFormFieldDecorator < ::Tramway::Core::ApplicationDecorator
   class << self
     def collections
-      [ :all ]
+      [:all]
     end
 
     def list_attributes

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Tramway::Event::ParticipantXlsxDecorator < Tramway::Export::Xlsx::ApplicationDecorator
   class << self
     def columns
-      [ :full_name, :email, :phone, :organization, :event ].map do |attribute|
+      %i[full_name email phone organization event].map do |attribute|
         { Tramway::Event::Participant.human_attribute_name(attribute).to_sym => attribute }
       end
     end

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Tramway::Event::PersonDecorator < ::Tramway::Core::ApplicationDecorator
   class << self
     def collections
-      [ :all ]
+      [:all]
     end
   end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::PlaceDecorator < Tramway::Core::ApplicationDecorator
   delegate :title, to: :object
 end

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Tramway::Event::SectionDecorator < ::Tramway::Landing::BlockTypes::FeaturesDecorator
   class << self
     def collections
-      [ :all ]
+      [:all]
     end
   end
 

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class ::Tramway::Event::SectionFeatureDecorator < ::Tramway::Landing::BlockTypes::FeaturesDecorator
   delegate :icon, to: :object
   delegate :title, to: :object
   delegate :description, to: :object
 
   def text
-    object.description.scan(/<strong>.*?<\/strong>/).join(' ')
+    object.description.scan(%r{<strong>.*?</strong>}).join(' ')
   end
 
   def image

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
   properties :title, :description, :begin_date, :end_date, :photo, :status,
     :request_collecting_begin_date, :request_collecting_end_date
@@ -5,13 +7,13 @@ class Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
   def initialize(object)
     super(object).tap do
       form_properties title: :string,
-        description: :ckeditor,
-        begin_date: :date_picker,
-        end_date: :date_picker,
-        request_collecting_begin_date: :date_picker,
-        request_collecting_end_date: :date_picker,
-        photo: :file,
-        status: :default
+                      description: :ckeditor,
+                      begin_date: :date_picker,
+                      end_date: :date_picker,
+                      request_collecting_begin_date: :date_picker,
+                      request_collecting_end_date: :date_picker,
+                      photo: :file,
+                      status: :default
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::PartakingForm < ::Tramway::Core::ApplicationForm
   properties :part_id, :part_type, :person_id, :position
   associations :person, :part
@@ -5,8 +7,8 @@ class Tramway::Event::PartakingForm < ::Tramway::Core::ApplicationForm
   def initialize(object)
     super(object).tap do
       form_properties part: :polymorphic_association,
-        person: :association,
-        position: :string
+                      person: :association,
+                      position: :string
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::ParticipantExtendedFormCreator < Tramway::Core::FormCreator
   def self.create_form_class(uuid, event, **simple_properties)
     class_name = "ParticipantExtendedForm#{uuid.gsub('-', '')}"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'securerandom'
 
 class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ApplicationForm
   properties :title, :description, :field_type, :options, :position
   association :event

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

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 class Tramway::Event::PersonForm < ::Tramway::Core::ApplicationForm
   properties :first_name, :last_name, :photo, :description
 
   def initialize(object)
     super(object).tap do
       form_properties first_name: :string,
-        last_name: :string,
-        photo: :file,
-        description: :ckeditor
+                      last_name: :string,
+                      photo: :file,
+                      description: :ckeditor
     end
   end
 end

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

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 class Tramway::Event::PlaceForm < Tramway::Core::ApplicationForm
   properties :title, :description, :coordinates, :photo, :city
 
   def initialize(object)
     super(object).tap do
       form_properties title: :string,
-        description: :ckeditor,
-        coordinates: :string,
-        photo: :file,
-        city: :string
+                      description: :ckeditor,
+                      coordinates: :string,
+                      photo: :file,
+                      city: :string
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
   properties :event, :title, :description, :photo, :icon, :position
   association :event
@@ -10,6 +12,6 @@ class Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
                       photo: :file,
                       icon: :string,
                       position: :numeric
-    end       
+    end
   end
 end

data/app/helpers/tramway/event/application_helper.rb

@@ -1,4 +1,6 @@
-require "tramway/collections/helper"
+# frozen_string_literal: true
+
+require 'tramway/collections/helper'
 
 module Tramway
   module Event

data/app/jobs/tramway/event/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Event
     class ApplicationJob < ActiveJob::Base

data/app/mailers/tramway/event/application_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Event
     class ApplicationMailer < ActionMailer::Base

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Event
     class ApplicationRecord < ::Tramway::Core::ApplicationRecord

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   mount_uploader :photo, PhotoUploader
 
@@ -9,12 +11,12 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   has_many :organizations, as: :partners, through: :partnerships, class_name: 'Tramway::Partner::Organization'
   has_and_belongs_to_many :places
 
-  enumerize :status, default: :common, in: [ :common, :main ]
+  enumerize :status, default: :common, in: %i[common main]
 
   scope :main_event, -> { where(status: :main) }
   scope :actual, -> { where 'end_date > ?', DateTime.now }
   scope :past, -> { where 'end_date < ?', DateTime.now }
-  
+
   def request_collecting_state
     return :not_initialized unless request_collecting_begin_date.present? || request_collecting_end_date.present?
     return :will_begin_soon if request_collecting_begin_date > DateTime.now
@@ -22,5 +24,7 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
     return :are_being_right_now if request_collecting_begin_date&.past? && request_collecting_end_date&.future?
   end
 
-  include ::Tramway::Partner::Scopes
+  if defined? ::Tramway::Partner
+    include ::Tramway::Partner::Scopes
+  end
 end

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

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class Tramway::Event::Partaking < ::Tramway::Core::ApplicationRecord
   belongs_to :part, polymorphic: true
-  enumerize :part_type, in: [ 'Tramway::Event::Event', 'Tramway::Event::Section' ]
+  enumerize :part_type, in: ['Tramway::Event::Event', 'Tramway::Event::Section']
 
   belongs_to :person, class_name: 'Tramway::Event::Person'
 
-  search_by :position, person: [:first_name, :last_name, :description]
+  search_by :position, person: %i[first_name last_name description]
 end

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
   belongs_to :event, class_name: 'Tramway::Event::Event'
-  
+
   state_machine :participation_state, initial: :requested do
     state :requested
     state :prev_approved
@@ -11,23 +13,23 @@ class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
     state :reserved
 
     event :previous_approve do
-      transition [ :requested, :without_answer, :waiting ] => :prev_approved
+      transition %i[requested without_answer waiting] => :prev_approved
     end
 
     event :wait_for_decision do
-      transition [ :requested, :without_answer ] => :waiting
+      transition %i[requested without_answer] => :waiting
     end
 
     event :reserve do
-      transition [ :requested, :without_answer, :waiting ] => :reserved
+      transition %i[requested without_answer waiting] => :reserved
     end
 
     event :reject do
-      transition [ :requested, :without_answer, :waiting, :prev_approved, :reserved ] => :rejected
+      transition %i[requested without_answer waiting prev_approved reserved] => :rejected
     end
 
     event :approve do
-      transition [ :prev_approved, :reserved, :requested ] => :approved
+      transition %i[prev_approved reserved requested] => :approved
     end
 
     event :not_got_answer do
@@ -35,7 +37,7 @@ class Tramway::Event::Participant < ::Tramway::Event::ApplicationRecord
     end
 
     event :return_to_requested do
-      transition [ :prev_approved, :rejected ] => :requested
+      transition %i[prev_approved rejected] => :requested
     end
   end
 

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 class Tramway::Event::ParticipantFormField < ::Tramway::Event::ApplicationRecord
   belongs_to :event, class_name: 'Tramway::Event::Event'
 
-  enumerize :field_type, in: [ :text, :string, :numeric, :date_picker, :select ], default: :text
+  enumerize :field_type, in: %i[text string numeric date_picker select], default: :text
 
   scope :inputs_list, -> { active.order(position: :asc) }
 end

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

@@ -1,5 +1,5 @@
-class Tramway::Event::Person < ::Tramway::Event::ApplicationRecord
-  has_and_belongs_to_many :sections, class_name: 'Tramway::Event::Section'
+# frozen_string_literal: true
 
+class Tramway::Event::Person < ::Tramway::Event::ApplicationRecord
   mount_uploader :photo, PhotoUploader
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::Place < Tramway::Core::ApplicationRecord
   has_and_belongs_to_many :events
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Event::Section < ::Tramway::Event::ApplicationRecord
   mount_uploader :photo, PhotoUploader
 

data/config/initializers/assets.rb

@@ -1 +1,3 @@
-Rails.application.config.assets.precompile += %w( tramway/event/events/show.css )
+# frozen_string_literal: true
+
+Rails.application.config.assets.precompile += %w[tramway/event/events/show.css]

data/config/initializers/tramway.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 ::Tramway::Admin.set_available_models(::Tramway::Event::Event,
-                                      ::Tramway::Event::ParticipantFormField,
-                                      ::Tramway::Event::Participant,
-                                      ::Tramway::Event::Section,
-                                      ::Tramway::Event::Person,
-                                      ::Tramway::Event::Partaking,
-                                      ::Tramway::Event::Place,
-                                      project: :event)
+  ::Tramway::Event::ParticipantFormField,
+  ::Tramway::Event::Participant,
+  ::Tramway::Event::Section,
+  ::Tramway::Event::Person,
+  ::Tramway::Event::Partaking,
+  ::Tramway::Event::Place,
+  project: :event)

data/config/locales/models.yml

@@ -25,6 +25,7 @@ ru:
         approved_participants: Количество пришедших
         not_yet_held: мероприятие ещё не проведено
         participants_list: Список участников
+        does_not_have_end_date: мероприятие не имеет даты окончания
       tramway/event/participant:
         comment: Примечание
         event: Мероприятие

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Tramway::Event::Engine.routes.draw do
   resources :events, only: :show
   resources :participants, only: :create

data/lib/tasks/tramway/event_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :tramway_event do
 #   # Task goes here

data/lib/tramway/event.rb

@@ -1,4 +1,6 @@
-require "tramway/event/engine"
+# frozen_string_literal: true
+
+require 'tramway/event/engine'
 require 'tramway/event/generators/install_generator'
 
 module Tramway

data/lib/tramway/event/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Event
     class Engine < ::Rails::Engine

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'tramway/core/generators/install_generator'
 
 module Tramway::Event::Generators
   class InstallGenerator < ::Tramway::Core::Generators::InstallGenerator
     include Rails::Generators::Migration
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     def run_other_generators
       generate 'tramway:partner:install'
@@ -36,7 +38,7 @@ module Tramway::Event::Generators
         :add_position_to_tramway_event_partakings,
         :add_state_to_tramway_event_partakings,
         :add_more_fields_to_tramway_event_participants,
-        
+
         # NOTE must be removed until tramway-event 2.0
         :rebuild_association_between_participant_and_partakings_to_polymorphic,
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddDescriptionToTramwayEventPeople < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_people, :description, :text

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddIconToTramwayEventSections < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_sections, :icon, :text

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddMoreFieldsToTramwayEventParticipants < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_participants, :participation_state, :text, default: :requested

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddOptionsToTramwayEventParticipantFormFields < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_participant_form_fields, :options, :jsonb

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddPhotoToTramwayEventEvents < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_events, :photo, :text

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddPositionToTramwayEventPartakings < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_partakings, :position, :text

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddPositionToTramwayEventParticipantFormFields < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_participant_form_fields, :position, :integer

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddPositionToTramwayEventSections < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_sections, :position, :integer

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddRequestPeriodToTramwayEventEvents < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_events, :request_collecting_begin_date, :datetime

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddStateToTramwayEventPartakings < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_partakings, :state, :text

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddStatusToTramwayEventEvents < ActiveRecord::Migration[5.1]
   def change
     add_column :tramway_event_events, :status, :text

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTramwayEventEvents < ActiveRecord::Migration[5.1]
   def change
     create_table :tramway_event_events do |t|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTramwayEventEventsPlaces < ActiveRecord::Migration[5.1]
   def change
     create_table :tramway_event_events_places do |t|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTramwayEventParticipantFormFields < ActiveRecord::Migration[5.1]
   def change
     create_table :tramway_event_participant_form_fields do |t|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTramwayEventParticipants < ActiveRecord::Migration[5.1]
   def change
     create_table :tramway_event_participants do |t|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTramwayEventPeople < ActiveRecord::Migration[5.1]
   def change
     create_table :tramway_event_people do |t|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTramwayEventPeopleSections < ActiveRecord::Migration[5.1]
   def change
     create_table :tramway_event_people_sections do |t|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTramwayEventPlaces < ActiveRecord::Migration[5.1]
   def change
     create_table :tramway_event_places do |t|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateTramwayEventSections < ActiveRecord::Migration[5.1]
   def change
     create_table :tramway_event_sections do |t|

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # NOTE must be removed until tramway-event 2.0
 
 class RebuildAssociationBetweenParticipantAndPartakingsToPolymorphic < ActiveRecord::Migration[5.1]

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # NOTE must be removed until tramway-event 2.0
 
 class RenameTramwayEventPeopleSectionsToTramwayEventPartakings < ActiveRecord::Migration[5.1]

data/lib/tramway/event/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Tramway
   module Event
-    VERSION = '1.9.19.1'
+    VERSION = '1.9.19.6'
   end
 end

metadata

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