tramway-event 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c6e619273da34ae3abd7762ca36c613a4cf69587731b3ca95067ac670e217a7
-  data.tar.gz: e75b7c4c21f0ebb3d62ea3798a6239fa7b9b3a7b0492494862c9091d35ec9ac4
+  metadata.gz: 12871505e7bc517e14e48ef7699850fb07c79fa3286302bbb4c31e2fa822e3f8
+  data.tar.gz: 740e8dc55922dd36a39622fea9c4bd0586b93e7e1f2ca34e08ce085082caaac5
 SHA512:
-  metadata.gz: 24dd4fafa80ff677f7fd7b152a4191864c699656502901f05f62c8e37d2d044f857090408c353b74f5ca5cf6feb122c182c14000295c7e3e909ab050796913b0
-  data.tar.gz: 861c3aac242cfeb580deaac54f40c33f99de4ff8d490962d5abe876c453f2bb106129ef146ea3dfc15cbfb6a15ac51900077b7cd58442dd551cd1ab45fc619e6
+  metadata.gz: c4d9cb29b912cd9c6f15873658abcf7cd3b321b7570f4d59178aeb9e186d53c2753461833ad4a164fd27f5ef6d89cd9e4308ba17f811fe3dc30f7d3b62a15a70
+  data.tar.gz: bb23299cbd182e11e597258e72e7c3e72c004a24fae2ba0b9d2ea63475c215defcc25823f14924e0a7a4d11e49afa5238b02c63225c8068b70a291b1cdeea8ce

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

@@ -6,7 +6,7 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
     class_name = "ParticipantExtendedForm#{request.uuid.gsub('-', '')}"
     form_class = ::Tramway::Core::ExtendableForm.new(class_name, *@event.participant_form_fields.inputs_list.map(&:title).map(&:to_sym))
     @participant_form = form_class.new ::Tramway::Event::Participant.new
-    @sections_as_features = @event.sections.map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }
-    @sections = @event.sections.map { |s| ::Tramway::Event::SectionDecorator.decorate s }
+    @sections_as_features = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionFeatureDecorator.decorate s }
+    @sections = @event.sections.order(position: :asc).map { |s| ::Tramway::Event::SectionDecorator.decorate s }
   end
 end

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

@@ -1,5 +1,5 @@
 class Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
-  properties :event, :title, :description, :photo, :icon
+  properties :event, :title, :description, :photo, :icon, :position
   association :event
 
   def initialize(object)
@@ -8,7 +8,8 @@ class Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
                       description: :ckeditor,
                       event: :association,
                       photo: :file,
-                      icon: :string
+                      icon: :string,
+                      position: :numeric
     end       
   end
 end

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

@@ -32,7 +32,7 @@
       = render 'tramway/landing/blocks/templates/features_list', block: OpenStruct.new(title: "Направления IT Way'18", description: "Вы можете выбрать любое из направлений", anchor: :features), collection: @sections_as_features
       %hr
       = render 'tramway/event/participants/form'
-      %hr
+      %br
       - @sections.each_with_index do |section, index|
         = render 'tramway/landing/blocks/templates/section_with_image_and_text', block: section
         - if index < @sections.count - 1

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

@@ -23,6 +23,7 @@ module Tramway::Event::Generators
       migration_template 'add_position_to_tramway_event_participant_form_fields.rb', 'db/migrate/add_position_to_tramway_event_participant_form_fields.rb'
       migration_template 'create_tramway_event_sections.rb', 'db/migrate/create_tramway_event_sections.rb'
       migration_template 'add_icon_to_tramway_event_sections.rb', 'db/migrate/add_icon_to_tramway_event_sections.rb'
+      migration_template 'add_position_to_tramway_event_sections.rb', 'db/migrate/add_position_to_tramway_event_sections.rb'
     end
   end
 end

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

@@ -0,0 +1,5 @@
+class AddPositionToTramwayEventSections < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_event_sections, :position, :integer
+  end
+end

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -60,6 +60,7 @@ files:
 - 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_participant_form_fields.rb
+- lib/tramway/event/generators/templates/add_position_to_tramway_event_sections.rb
 - lib/tramway/event/generators/templates/create_tramway_event_events.rb
 - lib/tramway/event/generators/templates/create_tramway_event_participant_form_fields.rb
 - lib/tramway/event/generators/templates/create_tramway_event_participants.rb