tramway-event 1.7.2 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ad317f2b35cfd286c0e43bc653a6ed6e4f07140c39d8871eba4ab1662c4447c
-  data.tar.gz: 37afa824797847b110538d8b12c80750387dc1b5231592bc9d493229463ea6f0
+  metadata.gz: cf6bfbcbdb2405968e268be453c7e52e5eb71df572e667e8ee609c0c4a4ff6df
+  data.tar.gz: 11af62fd8af2727634243771f564397285d71c1109f75a1ae7d9461cfb683d72
 SHA512:
-  metadata.gz: bcd4d79d9b157d8652b8d812ead6d83c183fc50fcdf5b8b8983b7cd1e93312ae7d16129e8d3b50e532af6433b5257aca2cef28d4c0ccd66f74c636ccbbfdaed4
-  data.tar.gz: 38e30922400fab75fe018ce7335505fbcb7c7c9055d46496acec6c13342d7afc585c93d018f166620abbf9fd5f509f47e3e9bc69b1d855dd629a24761086e726
+  metadata.gz: 931b4a3191c6dfa2eab6f2187f1eec5254416297128fa96de3ddafb49a3876c261f8e640dca0650bb54972f2e8060eff9c971ded1760540b5648bd2a680c55ad
+  data.tar.gz: cebc98e8d40d04d2b03c13b36f2d89ae2f8452f7df6654d40c03ced91d235d4b0a078f134d22a346b3ec0afd5a7c7750291e35c905acea48b9aab5143340c906

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

@@ -10,6 +10,7 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   delegate :participant_form_fields, to: :object
   delegate :sections, to: :object
   delegate :partakings, to: :object
+  delegate :request_collecting_state, to: :object
 
   def background
     object.photo

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

@@ -1,5 +1,6 @@
 class Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
-  properties :title, :description, :begin_date, :end_date, :photo, :status
+  properties :title, :description, :begin_date, :end_date, :photo, :status,
+    :request_collecting_begin_date, :request_collecting_end_date
 
   def initialize(object)
     form_object = super object
@@ -7,6 +8,8 @@ class Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
                     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
     form_object

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

@@ -9,4 +9,11 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   enumerize :status, default: :common, in: [ :common, :main ]
 
   scope :main_event, -> { where(status: :main) }
+
+  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
+    return :is_over if request_collecting_end_date < DateTime.now
+    return :are_being_right_now if request_collecting_begin_date&.<(DateTime.now) && request_collecting_end_date&.>(DateTime.now)
+  end
 end

data/app/views/tramway/event/participants/_form.html.haml

@@ -1,8 +1,8 @@
-- if event.participant_form_fields.any?
-  .row
-    .col-lg-12
-      %h1
-        = t('.registration')
+.row
+  .col-lg-12
+    %h1.text-center
+      = t(".request_collecting_state.#{event.request_collecting_state}")
+    - if event.request_collecting_state == :are_being_right_now && event.participant_form_fields.any?
       - class_name = 'tramway_event_participant'
       = simple_form_for @participant_form, url: ::Tramway::Event::Engine.routes.url_helpers.participants_path, method: :post, html: { class: class_name, id: class_name } do |f|
         = f.input :event_id, as: :hidden, input_html: { value: event.id, class: class_name, id: "#{class_name}_event_id", name: "#{class_name}[event_id]" }

data/config/locales/models.yml

@@ -13,6 +13,8 @@ ru:
         description: Описание
         begin_date: Дата начала
         end_date: Дата конца
+        request_collecting_begin_date: Дата начала приёма заявок на мероприятие
+        request_collecting_end_date: Дата окончания приёма заявок на мероприятие
       tramway/event/participant:
         comment: Примечание
         event: Мероприятие

data/config/locales/ru.yml

@@ -5,3 +5,8 @@ ru:
         form:
           registration: Регистрация на мероприятие
           submit_form: Отправить заявку
+          request_collecting_state:
+            not_initialized: Сбор заявок не объявлен
+            will_begin_soon: Сбор заявок скоро начнётся
+            are_being_right_now: Сбор заявок на мероприятие
+            is_over: Сбор заявок завершён

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

@@ -37,7 +37,9 @@ module Tramway::Event::Generators
         :add_more_fields_to_tramway_event_participants,
         
         # NOTE must be removed until tramway-event 2.0
-        :rebuild_association_between_participant_and_partakings_to_polymorphic
+        :rebuild_association_between_participant_and_partakings_to_polymorphic,
+
+        :add_request_period_to_tramway_event_events
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

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

@@ -0,0 +1,6 @@
+class AddRequestPeriodToTramwayEventEvents < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_event_events, :request_collecting_begin_date, :datetime
+    add_column :tramway_event_events, :request_collecting_end_date, :datetime
+  end
+end

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.7.2'
+    VERSION = '1.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: '1.8'
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -75,6 +75,7 @@ files:
 - lib/tramway/event/generators/templates/add_position_to_tramway_event_partakings.rb
 - 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_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