tramway-event 1.9.18.1 → 1.9.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 850dd7d58337575856fb1a9e750626f024279e22ab3c9c0427affb62c3484205
-  data.tar.gz: ac1ee79fa0ae402f0f764cf5fc637da008c09c2f22334110a680a5e9788b3f6d
+  metadata.gz: 4249e234b8a049f3d20b2452f499b0378ad3d0ec7eb4833de2f08942974b1399
+  data.tar.gz: 914ee5b092aecdd14d2a588e366c3a6823ff6914ff3292099d4737c61661bdef
 SHA512:
-  metadata.gz: 341ebf2578059a699c9a072ecf8e0d1c870b93b85a595a4ddda00a49ae942d7977d7dc9d315af5b188ccb7045bbc6548a932787fc166bf6b853a3cd1bac7a2a0
-  data.tar.gz: 82f7b7b970da72a4bc0dcb7cebfbe50d4574023356611346046d8d4d53cc610a6e950179ec2c2d9d5e6c909d3ce62105ca53b92a88ca7dff3af552d48ad6bbc8
+  metadata.gz: 1cb25e32dcb9690ef9e095521c4a603a00be265fda3a96b5ea40e910e4e74575550f72708c6edc17ad19f4f39f64b1cb8101b86ff21dc0dd3e1a4a81d9bf97c7
+  data.tar.gz: 756cf9a251ce8d609bf5e85a2bd23c81bd746bcf11755808cdd2b01a87f408053a7a571f0274ba8b29fb74ce1bec3ef2ee6726dbac11a0d965ff78b2aa6acb2d

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

@@ -0,0 +1,3 @@
+class Tramway::Event::PlaceDecorator < Tramway::Core::ApplicationDecorator
+  delegate :title, to: :object
+end

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

@@ -0,0 +1,13 @@
+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
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   has_many :partakings, as: :part, class_name: 'Tramway::Event::Partaking'
   has_many :partnerships, class_name: 'Tramway::Partner::Partnership', as: :partner
   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 ]
 

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

@@ -0,0 +1,3 @@
+class Tramway::Event::Place < Tramway::Core::ApplicationRecord
+  has_and_belongs_to_many :events
+end

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

@@ -4,9 +4,6 @@
     %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
       %span{"aria-hidden" => "true"} ×
     %h4.alert-heading Заявка успешно отправлена!
-    %p
-      Для подтверждения участия оплатите орг.взнос по 
-      = link_to 'ссылке', 'https://ulmicru.timepad.ru/event/1059138/', target: '_blank'
     %hr/
     %p.mb-0
       По всем вопросам обращайтесь по телефону

data/config/initializers/tramway.rb

@@ -4,4 +4,5 @@
                                       ::Tramway::Event::Section,
                                       ::Tramway::Event::Person,
                                       ::Tramway::Event::Partaking,
+                                      ::Tramway::Event::Place,
                                       project: :event)

data/config/locales/models.yml

@@ -7,6 +7,7 @@ ru:
       tramway/event/section: Секция
       tramway/event/person: Член команды
       tramway/event/partaking: Должность
+      tramway/event/place: Место
     attributes:
       tramway/event/event:
         title: Название
@@ -63,6 +64,9 @@ ru:
     tramway/event/partaking:
       genitive: должность
       plural: должности
+    tramway/event/place:
+      genitive: место
+      plural: места
   collections:
     tramway/event/participant:
       requested: Необработанные

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

@@ -41,7 +41,10 @@ module Tramway::Event::Generators
         :rebuild_association_between_participant_and_partakings_to_polymorphic,
 
         :add_request_period_to_tramway_event_events,
-        :add_description_to_tramway_event_people
+        :add_description_to_tramway_event_people,
+
+        :create_tramway_event_places,
+        :create_tramway_event_events_places
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

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

@@ -0,0 +1,10 @@
+class CreateTramwayEventEventsPlaces < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tramway_event_events_places do |t|
+      t.integer :event_id
+      t.integer :place_id
+
+      t.timestamps
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+class CreateTramwayEventPlaces < ActiveRecord::Migration[5.1]
+  def change
+    create_table :tramway_event_places do |t|
+      t.text :title
+      t.text :description
+      t.point :coordinates
+      t.text :photo
+      t.text :city
+      t.text :state, default: :active
+
+      t.timestamps
+    end
+  end
+end

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.9.18.1'
+    VERSION = '1.9.18.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.18.1
+  version: 1.9.18.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -36,6 +36,7 @@ files:
 - app/decorators/tramway/event/participant_form_field_decorator.rb
 - app/decorators/tramway/event/participant_xlsx_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
@@ -44,6 +45,7 @@ files:
 - 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
@@ -54,6 +56,7 @@ files:
 - app/models/tramway/event/participant.rb
 - app/models/tramway/event/participant_form_field.rb
 - app/models/tramway/event/person.rb
+- app/models/tramway/event/place.rb
 - app/models/tramway/event/section.rb
 - app/views/tramway/event/events/_show_page.html.haml
 - app/views/tramway/event/events/show.html.haml
@@ -81,10 +84,12 @@ files:
 - 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
+- lib/tramway/event/generators/templates/create_tramway_event_events_places.rb
 - lib/tramway/event/generators/templates/create_tramway_event_participant_form_fields.rb
 - lib/tramway/event/generators/templates/create_tramway_event_participants.rb
 - lib/tramway/event/generators/templates/create_tramway_event_people.rb
 - lib/tramway/event/generators/templates/create_tramway_event_people_sections.rb
+- 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/rename_tramway_event_people_sections_to_tramway_event_partakings.rb