tramway-event 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e55d7d6f84e56f8801bbb4e6855a92cc8d1c61dd1f9c596f2fbffd7e71487086
-  data.tar.gz: c215a0fd30114aa14ec84135e49465105f349fa43eed94b5b778901c0662e3b7
+  metadata.gz: 03520a269ce5fdccb8d569dfa63c42f1148b0b5ad344d80bfbeb97db34db5c70
+  data.tar.gz: 76a7932edf7df8cf9c12177d0317f0ba4a0136b03c4d1b6cde3c9df31c1e8917
 SHA512:
-  metadata.gz: 7955aacd424d797bd0074dd25cd032cbf20a9c0080f55ca06c7c154badd2f214a0f7d70892e624ca9115a879a76e1bc06bf4738f05c935b535fdd201465f347d
-  data.tar.gz: fb8405966ae60ffc9ecde5db93d9321960c1e9fd77ae61cf184f087dc56d6f97695446bca232b11caf09eb38269488d3032f59705e2a0683d620b0cdbd629c43
+  metadata.gz: 1e9a9d5ef007d8a92f3a5fe23caeda6071b59fd3a04989b379521ecaa1b50442df629d877608edb888908ef2a3cfbe1d1b8779d24c32750e5a4cf63e3ad63e41
+  data.tar.gz: 77f83732c60a6e538ece1e58f736c3e5e34e55f23f2029893bdb94bfe710513a4b4af222b1cca1d5868e0ca4daded247a0d797ade5bc0b432682136275eb652a

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

@@ -0,0 +1,11 @@
+class Tramway::Event::PartakingDecorator < ::Tramway::Core::ApplicationDecorator
+  class << self
+    def collections
+      [ :all ]
+    end
+  end
+
+  def name
+    "#{object.person.first_name} #{object.person.last_name} - #{object.position}"
+  end
+end

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

@@ -0,0 +1,13 @@
+class ::Tramway::Event::PartakingFeatureDecorator < ::Tramway::Landing::BlockTypes::FeaturesDecorator
+  def text
+    object.position&.html_safe
+  end
+
+  def title
+    "#{object.person.first_name} #{object.person.last_name}"
+  end
+
+  def image
+    object.person.photo.small.url
+  end
+end

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

@@ -1,16 +1,17 @@
-class Tramway::Event::SectionDecorator < ::Tramway::Core::ApplicationDecorator
+class Tramway::Event::SectionDecorator < ::Tramway::Landing::BlockTypes::FeaturesDecorator
   class << self
     def collections
       [ :all ]
     end
   end
 
+  delegate :description, to: :object
+  decorate_association :partakings, decorator: Tramway::Event::PartakingFeatureDecorator
+
   def title
     "#{fa_icon(object.icon)} #{object.title}".html_safe
   end
 
-  delegate :description, to: :object
-
   def background
     object.photo
   end

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

@@ -0,0 +1,12 @@
+class Tramway::Event::PartakingForm < ::Tramway::Core::ApplicationForm
+  properties :section_id, :person_id, :position
+  associations :section, :person
+
+  def initialize(object)
+    super(object).tap do
+      form_properties section: :association,
+        person: :association,
+        position: :string
+    end
+  end
+end

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

@@ -1,16 +1,11 @@
 class Tramway::Event::PersonForm < ::Tramway::Core::ApplicationForm
-  properties :first_name, :last_name, :photo, :sections
+  properties :first_name, :last_name, :photo
 
   def initialize(object)
     super(object).tap do
       form_properties first_name: :string,
         last_name: :string,
-        photo: :file,
-        sections: :selectize
+        photo: :file
     end
   end
-
-  def sections=(value)
-    model.sections = ::Tramway::Event::Section.where id: value.split(',')
-  end
 end

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

@@ -0,0 +1,4 @@
+class Tramway::Event::Partaking < ::Tramway::Core::ApplicationRecord
+  belongs_to :section, class_name: 'Tramway::Event::Section'
+  belongs_to :person, class_name: 'Tramway::Event::Person'
+end

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

@@ -2,4 +2,5 @@ class Tramway::Event::Section < ::Tramway::Event::ApplicationRecord
   mount_uploader :photo, PhotoUploader
 
   belongs_to :event, class_name: 'Tramway::Event::Event'
+  has_many :partakings, class_name: 'Tramway::Event::Partaking'
 end

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

@@ -36,6 +36,6 @@
     = render 'tramway/event/participants/form', event: event
     %br
     - sections.each_with_index do |section, index|
-      = render 'tramway/landing/blocks/templates/section_with_image_and_text', block: section
+      = render 'tramway/event/sections/show_page', section: section
       - if index < sections.count - 1
         %br

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

@@ -0,0 +1,2 @@
+= render 'tramway/landing/blocks/templates/section_with_image_and_text', block: section
+= render 'tramway/landing/blocks/templates/features_list', collection: section.partakings, options: { image: { css: { class_name: 'circle' } } }

data/config/initializers/tramway.rb

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

data/config/locales/models.yml

@@ -6,6 +6,7 @@ ru:
       tramway/event/participant_form_field: Поле анкеты
       tramway/event/section: Секция
       tramway/event/person: Член команды
+      tramway/event/partaking: Должность
     attributes:
       tramway/event/event:
         title: Название
@@ -27,4 +28,7 @@ ru:
       genitive: поле анкеты
     tramway/event/person:
       genitive: профиль члена команды
-      plural: Команда
+      plural: члены команды
+    tramway/event/partaking:
+      genitive: должность
+      plural: должности

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

@@ -27,7 +27,13 @@ module Tramway::Event::Generators
         :add_position_to_tramway_event_sections,
         :add_status_to_tramway_event_events,
         :create_tramway_event_people,
-        :create_tramway_event_people_sections
+        :create_tramway_event_people_sections,
+
+        # NOTE must be removed until tramway-event 2.0
+        :rename_tramway_event_people_sections_to_tramway_event_partakings,
+
+        :add_position_to_tramway_event_partakings,
+        :add_state_to_tramway_event_partakings
       ]
       migrations.each do |migration|
         migration_template "#{migration}.rb", "db/migrate/#{migration}.rb"

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

@@ -0,0 +1,5 @@
+class AddPositionToTramwayEventPartakings < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_event_partakings, :position, :text
+  end
+end

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

@@ -0,0 +1,5 @@
+class AddStateToTramwayEventPartakings < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_event_partakings, :state, :text
+  end
+end

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

@@ -0,0 +1,7 @@
+# NOTE must be removed until tramway-event 2.0
+
+class RenameTramwayEventPeopleSectionsToTramwayEventPartakings < ActiveRecord::Migration[5.1]
+  def change
+    rename_table :tramway_event_people_sections, :tramway_event_partakings
+  end
+end

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.5.1'
+    VERSION = '1.5.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-07 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -29,12 +29,15 @@ files:
 - app/controllers/tramway/event/participants_controller.rb
 - app/decorators/tramway/event/event_decorator.rb
 - app/decorators/tramway/event/event_link_decorator.rb
+- app/decorators/tramway/event/partaking_decorator.rb
+- app/decorators/tramway/event/partaking_feature_decorator.rb
 - app/decorators/tramway/event/participant_decorator.rb
 - app/decorators/tramway/event/participant_form_field_decorator.rb
 - app/decorators/tramway/event/person_decorator.rb
 - app/decorators/tramway/event/section_decorator.rb
 - app/decorators/tramway/event/section_feature_decorator.rb
 - app/forms/tramway/event/event_form.rb
+- app/forms/tramway/event/partaking_form.rb
 - app/forms/tramway/event/participant_extended_form_creator.rb
 - app/forms/tramway/event/participant_form.rb
 - app/forms/tramway/event/participant_form_field_form.rb
@@ -45,6 +48,7 @@ files:
 - app/mailers/tramway/event/application_mailer.rb
 - app/models/tramway/event/application_record.rb
 - app/models/tramway/event/event.rb
+- app/models/tramway/event/partaking.rb
 - app/models/tramway/event/participant.rb
 - app/models/tramway/event/participant_form_field.rb
 - app/models/tramway/event/person.rb
@@ -52,6 +56,7 @@ files:
 - app/views/tramway/event/events/_show_page.html.haml
 - app/views/tramway/event/events/show.html.haml
 - app/views/tramway/event/participants/_form.html.haml
+- app/views/tramway/event/sections/_show_page.html.haml
 - config/initializers/assets.rb
 - config/initializers/tramway.rb
 - config/locales/models.yml
@@ -64,8 +69,10 @@ files:
 - lib/tramway/event/generators/templates/add_icon_to_tramway_event_sections.rb
 - lib/tramway/event/generators/templates/add_options_to_tramway_event_participant_form_fields.rb
 - lib/tramway/event/generators/templates/add_photo_to_tramway_event_events.rb
+- 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_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_participant_form_fields.rb
@@ -73,6 +80,7 @@ files:
 - 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_sections.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
 licenses: