tramway-event 1.10.2 → 1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff89bd686ac28eff732d72cd490ea1d8f252f4ac29662522bc7ef429dbacfcf2
-  data.tar.gz: f9b9f050ce693d5b1661a1aa3c58ef9274c3ab953c4cb051f4334201e0d6d7ac
+  metadata.gz: 2cfd11edc1d4bd496966576c24f63950098cab332bd971443fa7aa79b3b55eff
+  data.tar.gz: 81a313339af8f0bb7906f0c3d18e321b0a5adeaf5344cb91c380f845e8e94f82
 SHA512:
-  metadata.gz: 5df609954218de5943a2cbe58a0e16545148750ea7a26378cf3ba2a817d45a3cba03a6395d967eeefc9fd6661091b421053a3d27a7fb40be1fe2fdf4d6081831
-  data.tar.gz: 774f46bce3e89662224fc88dba5f112aee031680fda27d670bb6e5140f74b76918938eef3f0b2a438a9782198ba38a969e928e593c239ac4f1217ba2acdf52a0
+  metadata.gz: fcf396aa92c807b80bb3ea19f2f596d2017de47e60ca455c19e2b46a2d93ef43c3db019bfdcc14556aff7ed70b380a070d5dee36fd592d908cd882f984835e0c
+  data.tar.gz: 1d92fbc5baf1e6c3531ef19aa944583eb515eca606e86a1c96cc7e9eebde87601368dd7d0453184542d5190421d755d43e5f1014ff59aee27e9252c517e829a0

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

@@ -14,7 +14,6 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
         state
         created_at
         photo
-        status
         request_collecting_duration
         description
         participants_list
@@ -31,7 +30,6 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   delegate :title, to: :object
-  delegate :status, to: :object
   decorate_association :participants
   decorate_association :participant_form_fields, as: :event
   decorate_association :sections
@@ -110,9 +108,5 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
     state_machine_view object, :state
   end
 
-  def status
-    enumerize_view object.status
-  end
-
   alias tagline duration
 end

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

@@ -1,20 +1,14 @@
 # frozen_string_literal: true
 
 class Admin::Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
-  properties :title, :description, :begin_date, :end_date, :photo, :status,
+  properties :title, :description, :begin_date, :end_date, :photo, :reach,
     :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,
-                      request_collecting_begin_date: :date_picker,
-                      request_collecting_end_date: :date_picker,
-                      photo: :file,
-                      status: :default
+      form_properties title: :string, short_description: :text, description: :ckeditor, begin_date: :date_picker,
+                      end_date: :date_picker, request_collecting_begin_date: :date_picker,
+                      request_collecting_end_date: :date_picker, photo: :file, reach: :default
     end
   end
 end

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

@@ -12,11 +12,12 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   has_many :actions, -> { order(id: :asc) }, class_name: 'Tramway::Event::Action'
   has_and_belongs_to_many :places
 
-  enumerize :status, default: :common, in: %i[common main]
+  enumerize :reach, default: :open, in: %i[open closed]
 
-  scope :main_event, -> { active.where(status: :main) }
   scope :actual, -> { order(:begin_date).where('end_date > ?', DateTime.now) }
   scope :past, -> { where 'end_date < ?', DateTime.now }
+  scope :open, -> { where reach: :open }
+  scope :closed, -> { where reach: :closed }
 
   def request_collecting_state
     return :not_initialized unless request_collecting_begin_date.present? || request_collecting_end_date.present?

data/app/views/tramway/event/events/_show_page.html.haml

@@ -22,10 +22,9 @@
       = tel_tag @event.responsible_person[:phone] || @application.phone
       или пишите на email
       = mail_to @event.responsible_person[:email] || @application.email
-- if request.path == ::Tramway::Event::Engine.routes.url_helpers.event_path(event.id)
-  = render 'tramway/landing/blocks/templates/full_page', block: event, buttons: [OpenStruct.new(title: t('.registration'), anchor: '#registration')]
-  - content_for :main_image do
-    = request.protocol + request.host_with_port + event.background.url
+= render 'tramway/landing/blocks/templates/full_page', block: event, buttons: [OpenStruct.new(title: t('.registration'), anchor: '#registration')]
+- content_for :main_image do
+  = request.protocol + request.host_with_port + event.background.url
 %main.event.show
   .container
     - if defined? sections_as_features

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

@@ -48,7 +48,11 @@ module Tramway::Event::Generators
         :create_tramway_event_places,
         :create_tramway_event_events_places,
         :add_short_description_to_tramway_event_events,
-        :create_tramway_event_actions
+        :create_tramway_event_actions,
+        :add_reach_to_tramway_event_events,
+
+        # NOTE must be removed until tramway-event 2.0
+        :remove_status_from_tramway_event_events
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReachToTramwayEventEvents < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_event_events, :reach, :text
+  end
+end

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

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class RemoveStatusFromTramwayEventEvents < ActiveRecord::Migration[5.1]
+  def change
+    remove_column :tramway_event_events, :status
+  end
+end

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.10.2'
+    VERSION = '1.11'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: '1.11'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus
@@ -98,6 +98,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_reach_to_tramway_event_events.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
@@ -112,6 +113,7 @@ files:
 - lib/tramway/event/generators/templates/create_tramway_event_places.rb
 - lib/tramway/event/generators/templates/create_tramway_event_sections.rb
 - lib/tramway/event/generators/templates/rebuild_association_between_participant_and_partakings_to_polymorphic.rb
+- lib/tramway/event/generators/templates/remove_status_from_tramway_event_events.rb
 - lib/tramway/event/generators/templates/rename_tramway_event_people_sections_to_tramway_event_partakings.rb
 - lib/tramway/event/version.rb
 homepage: https://github.com/ulmic/tramway-event