tramway-event 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12871505e7bc517e14e48ef7699850fb07c79fa3286302bbb4c31e2fa822e3f8
-  data.tar.gz: 740e8dc55922dd36a39622fea9c4bd0586b93e7e1f2ca34e08ce085082caaac5
+  metadata.gz: 40a19f3282b75310d92a2fc3bd21bdcb00c555c77fb8287795f3f67b80bd9b04
+  data.tar.gz: c70a3ada7e467bb2f4cd8e939208a56424ae4529534f924ce4700a5a09582697
 SHA512:
-  metadata.gz: c4d9cb29b912cd9c6f15873658abcf7cd3b321b7570f4d59178aeb9e186d53c2753461833ad4a164fd27f5ef6d89cd9e4308ba17f811fe3dc30f7d3b62a15a70
-  data.tar.gz: bb23299cbd182e11e597258e72e7c3e72c004a24fae2ba0b9d2ea63475c215defcc25823f14924e0a7a4d11e49afa5238b02c63225c8068b70a291b1cdeea8ce
+  metadata.gz: ca38e0fa4e489fe6a7c3d2d36cd25b3e44292ae2cced5ef320d39f83ab38adf006f87614949f0ee4d0e4f57aaa3f3d9b7a9a98a12b1520b1dea45b51705a587b
+  data.tar.gz: d2f940e9b5d3993c877583e04da177452b20cb736a3969714487ae87bd7251b2e9b36606ee8a366c13ffc9d8e11b3f7f357e9116186a72497dbb578ad54c9cab

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

@@ -3,9 +3,7 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
 
   def show
     @event = ::Tramway::Event::EventDecorator.decorate ::Tramway::Event::Event.find params[:id]
-    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
+    @participant_form = ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(request.uuid, @event).new ::Tramway::Event::Participant.new
     @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

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

@@ -6,6 +6,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   delegate :title, to: :object
+  delegate :description, to: :object
   delegate :participant_form_fields, to: :object
   delegate :sections, to: :object
 

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

@@ -1,5 +1,5 @@
 class Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
-  properties :title, :description, :begin_date, :end_date, :photo
+  properties :title, :description, :begin_date, :end_date, :photo, :status
 
   def initialize(object)
     form_object = super object
@@ -7,7 +7,8 @@ class Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
                     description: :ckeditor,
                     begin_date: :default,
                     end_date: :default,
-                    photo: :file
+                    photo: :file,
+                    status: :default
     form_object
   end
 end

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

@@ -0,0 +1,6 @@
+class Tramway::Event::ParticipantExtendedFormCreator
+  def self.create_form_class(uuid, event)
+    class_name = "ParticipantExtendedForm#{uuid.gsub('-', '')}"
+    ::Tramway::Core::ExtendableForm.new(class_name, *event.participant_form_fields.inputs_list.map(&:title).map(&:to_sym))
+  end
+end

data/app/helpers/tramway/event/application_helper.rb

@@ -4,7 +4,7 @@ module Tramway
   module Event
     module ApplicationHelper
       include ::FontAwesome::Rails::IconHelper
-
+      #extend ::Tramway::Collection::Helper
       def collection_list_by(name:)
         require name # needed to load class name with collection
         unless ::Tramway::Collection.descendants.map(&:to_s).include?(name.camelize)

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

@@ -4,4 +4,8 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   has_many :participants, class_name: 'Tramway::Event::Participant'
   has_many :participant_form_fields, class_name: 'Tramway::Event::ParticipantFormField'
   has_many :sections, class_name: 'Tramway::Event::Section'
+
+  enumerize :status, default: :common, in: [ :common, :main ]
+
+  scope :main_event, -> { where(status: :main).last }
 end

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

@@ -0,0 +1,40 @@
+= stylesheet_link_tag 'tramway/event/events/show'
+- if params[:flash] == 'success'
+  .alert.alert-success{role: "alert"}
+    %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
+      %span{"aria-hidden" => "true"} ×
+    %h4.alert-heading Заявка успешно отправлена!
+    %p Орг.комитет мероприятия свяжется с вами по одному из указанных вами каналов связи: телефон, email, страница ВКонтакте
+    %hr/
+    %p.mb-0
+      По всем вопросам обращайтесь по телефону
+      = tel_tag '+79278023244'
+      или пишите на email
+      = mail_to 'kalashnikov@ulmic.ru'
+- if params[:flash] == 'error'
+  .alert.alert-danger{role: "alert"}
+    %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
+      %span{"aria-hidden" => "true"} ×
+    %h4.alert-heading Ошибка при отправлении заявки!
+    %p Подробности ошибки описаны ниже в форме приёма заявок
+    %hr/
+    %p.mb-0
+      Если ошибка повторяется или не отображается, обращайтесь по телефону
+      = tel_tag '+79278023244'
+      или пишите на email
+      = mail_to 'kalashnikov@ulmic.ru'
+- if request.path == ::Tramway::Event::Engine.routes.url_helpers.event_path(event.id)
+  = render 'tramway/landing/blocks/templates/full_page', block: event, buttons: []
+%main
+  .container
+    = render 'tramway/landing/blocks/templates/features_list', block: OpenStruct.new(title: "Направления IT Way'18", description: "Вы можете выбрать любое из направлений", anchor: :features), collection: sections_as_features
+    %br
+    .row
+      != event.description
+    %hr
+    = 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
+      - if index < sections.count - 1
+        %br

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

@@ -1,39 +1,4 @@
 - content_for :title do
   = @event.title
 - content_for :body_content do
-  = stylesheet_link_tag 'tramway/event/events/show'
-  - if params[:flash] == 'success'
-    .alert.alert-success{role: "alert"}
-      %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
-        %span{"aria-hidden" => "true"} ×
-      %h4.alert-heading Заявка успешно отправлена!
-      %p Орг.комитет мероприятия свяжется с вами по одному из указанных вами каналов связи: телефон, email, страница ВКонтакте
-      %hr/
-      %p.mb-0
-        По всем вопросам обращайтесь по телефону
-        = tel_tag '+79278023244'
-        или пишите на email
-        = mail_to 'kalashnikov@ulmic.ru'
-  - if params[:flash] == 'error'
-    .alert.alert-danger{role: "alert"}
-      %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
-        %span{"aria-hidden" => "true"} ×
-      %h4.alert-heading Ошибка при отправлении заявки!
-      %p Подробности ошибки описаны ниже в форме приёма заявок
-      %hr/
-      %p.mb-0
-        Если ошибка повторяется или не отображается, обращайтесь по телефону
-        = tel_tag '+79278023244'
-        или пишите на email
-        = mail_to 'kalashnikov@ulmic.ru'
-  = render 'tramway/landing/blocks/templates/full_page', block: @event, buttons: []
-  %main
-    .container
-      = 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'
-      %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
-          %br
+  = render 'tramway/event/events/show_page', event: @event, sections: @sections, sections_as_features: @sections_as_features

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

@@ -1,12 +1,12 @@
-- if @event.participant_form_fields.any?
+- if event.participant_form_fields.any?
   .row
     .col-lg-12
       %h1
         = t('.registration')
       - class_name = 'tramway_event_participant'
       = simple_form_for @participant_form, url: { controller: 'tramway/event/participants', action: :create }, 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]" }
-        - @event.participant_form_fields.inputs_list.each do |field|
+        = f.input :event_id, as: :hidden, input_html: { value: event.id, class: class_name, id: "#{class_name}_event_id", name: "#{class_name}[event_id]" }
+        - event.participant_form_fields.inputs_list.each do |field|
           - case field.field_type
           - when 'text', 'string', 'numeric', 'date_picker'
             = f.input field.title.to_sym, as: field.field_type, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }

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

@@ -24,6 +24,7 @@ module Tramway::Event::Generators
       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'
+      migration_template 'add_status_to_tramway_event_events.rb', 'db/migrate/add_status_to_tramway_event_events.rb'
     end
   end
 end

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

@@ -0,0 +1,5 @@
+class AddStatusToTramwayEventEvents < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_event_events, :status, :text
+  end
+end

data/lib/tramway/event/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-23 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -34,6 +34,7 @@ files:
 - 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/participant_extended_form_creator.rb
 - app/forms/tramway/event/participant_form.rb
 - app/forms/tramway/event/participant_form_field_form.rb
 - app/forms/tramway/event/section_form.rb
@@ -45,6 +46,7 @@ files:
 - app/models/tramway/event/participant.rb
 - app/models/tramway/event/participant_form_field.rb
 - app/models/tramway/event/section.rb
+- 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
 - config/initializers/assets.rb
@@ -61,6 +63,7 @@ files:
 - 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/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
 - lib/tramway/event/generators/templates/create_tramway_event_participants.rb