tramway-event 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30a66f92c1d8f181b1620aa1a024178e479066e2dd015ab9994809ebeaca04f8
-  data.tar.gz: e1b97b81a35c3f3ce092f6e5a7ee2280637463947506d789a683e03e78916c6b
+  metadata.gz: 0b2fdb2461f25bcc59c92c8775b5b3968ca209196b6995136f86403c058d1e00
+  data.tar.gz: 78dabdb189958cc8e29f4b98462558a7aea93a0d4abc8cd3977d8ad1b4eb9ab0
 SHA512:
-  metadata.gz: 92b4b9d04b5bebd1f748caca9e94a7760bd41774cd79163d80ed1fe94f9f7084dfa223354b0375b66cb814b500d7ccdb961071daa186bdf41f704acb14f28d61
-  data.tar.gz: b11ca2ea6fdb17a8f5f7bd8e3c7b52bf04ee2a9cad08f6091fc62c26b5a05f399affc6a3912dd535bd3feeb01d35f3b135bf8ee0c53bec58a276e954cce3d6b3
+  metadata.gz: 59cb50910c2b61ccbd5f8cd7a1ba49097b690ec00a89f0c9812269f62fc6425aaa70569ee37c6db397fd4edc36ccb02de254e388218f35bcb47bed8ca6ec415a
+  data.tar.gz: b099a0ea2122f482e734e51b42426d7d3204029798d69246fb843b50328c82d8e3522a3d772a50ce4be03e2c359b5d1ae6fbf6c09041cb7f3c092c7766f7dc14

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

@@ -3,7 +3,8 @@ class Tramway::Event::EventsController < Tramway::Event::ApplicationController
 
   def show
     @event = ::Tramway::Event::EventDecorator.decorate ::Tramway::Event::Event.find params[:id]
-    form_class = ::Tramway::Core::ExtendableForm.new "ParticipantExtendedForm#{request.uuid.gsub('-', '')}", *@event.participant_form_fields.map(&:title).map(&:to_sym)
+    class_name = "ParticipantExtendedFormEventId#{@event.id}"
+    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
   end
 end

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

@@ -0,0 +1,13 @@
+class Tramway::Event::ParticipantsController < Tramway::Event::ApplicationController
+  def create
+    event = ::Tramway::Event::Event.find params[:tramway_event_participant][:event_id]
+    class_name = "ParticipantExtendedFormEventId#{event.id}"
+    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 event_id: event.id
+    if @participant_form.submit params[:tramway_event_participant].except :event_id
+      redirect_to event_path event, flash: :success
+    else
+      redirect_to event_path event, flash: :error
+    end
+  end
+end

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

@@ -1,12 +1,14 @@
 class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ApplicationForm
-  properties :title, :description, :field_type, :event
+  properties :title, :description, :field_type, :event, :options, :position
 
   def initialize(object)
     form_object = super object
     form_properties event: :association,
                     title: :string,
                     description: :string,
-                    field_type: :default
+                    field_type: :default,
+                    options: :text,
+                    position: :numeric
     form_object
   end
 

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

@@ -1,6 +1,16 @@
+require "tramway/collection"
+
 module Tramway
   module Event
     module ApplicationHelper
+      def collection_list_by(name:)
+        require name # needed to load class name with collection
+        unless ::Tramway::Collection.descendants.map(&:to_s).include?(name.camelize)
+          raise "There no such collection named #{name.camelize}. Please create class with self method `list` and extended of `Tramway::Collection`" 
+        end
+
+        name.camelize.constantize.list
+      end
     end
   end
 end

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

@@ -1,5 +1,7 @@
 class Tramway::Event::ParticipantFormField < ::Tramway::Event::ApplicationRecord
   belongs_to :event, class_name: 'Tramway::Event::Event'
 
-  enumerize :field_type, in: [ :text, :numeric ], default: :text
+  enumerize :field_type, in: [ :text, :string, :numeric, :date_picker, :select ], default: :text
+
+  scope :inputs_list, -> { active.order(position: :asc) }
 end

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

@@ -2,6 +2,32 @@
   = @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 '+79603727276'
+        или пишите на 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 '+79603727276'
+        или пишите на email
+        = mail_to 'kalashnikov@ulmic.ru'
   = render 'tramway/landing/blocks/templates/full_page', block: @event, buttons: []
   .container
     = render 'tramway/event/participants/form'

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

@@ -1,5 +1,19 @@
-.row
-  .col-lg-12
-    = simple_form_for @participant_form, url: { controller: 'tramway/event/participants', action: :create } do |f|
-      - @event.participant_form_fields.each do |field|
-        = f.input field.title.to_sym
+- 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|
+          - 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}]" }
+          - when 'select'
+            - parsed_json = JSON.parse(field.options) unless field.options == ''
+            - if parsed_json && parsed_json['collection']['name']
+              = f.input field.title.to_sym, as: :select, collection: collection_list_by(name: parsed_json['collection']['name']), input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+            - else
+              = f.input field.title.to_sym, as: :select, input_html: { class: class_name, id: "#{class_name}_#{field.title}", name: "#{class_name}[#{field.title}]" }
+        = f.button :submit, t('.submit_form')

data/config/locales/ru.yml

@@ -0,0 +1,7 @@
+ru:
+  tramway:
+    event:
+      participants:
+        form:
+          registration: Регистрация на мероприятие
+          submit_form: Отправить заявку

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

@@ -19,6 +19,8 @@ module Tramway::Event::Generators
       migration_template 'add_photo_to_tramway_event_events.rb', 'db/migrate/add_photo_to_tramway_event_events.rb'
       migration_template 'create_tramway_event_participant_form_fields.rb', 'db/migrate/create_tramway_event_participant_form_fields.rb'
       migration_template 'create_tramway_event_participants.rb', 'db/migrate/create_tramway_event_participants.rb'
+      migration_template 'add_options_to_tramway_event_participant_form_fields.rb', 'db/migrate/add_options_to_tramway_event_participant_form_fields.rb'
+      migration_template 'add_position_to_tramway_event_participant_form_fields.rb', 'db/migrate/add_position_to_tramway_event_participant_form_fields.rb'
     end
   end
 end

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

@@ -0,0 +1,5 @@
+class AddOptionsToTramwayEventParticipantFormFields < ActiveRecord::Migration[5.1]
+  def change
+    add_column :tramway_event_participant_form_fields, :options, :jsonb
+  end
+end

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

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

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '0.5'
+    VERSION = '0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies: []
 description: Rails engine for events
 email:
@@ -26,6 +26,7 @@ files:
 - app/assets/stylesheets/tramway/event/events/show.css.sass
 - app/controllers/tramway/event/application_controller.rb
 - app/controllers/tramway/event/events_controller.rb
+- 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/participant_decorator.rb
@@ -45,12 +46,15 @@ files:
 - config/initializers/assets.rb
 - config/initializers/tramway.rb
 - config/locales/models.yml
+- config/locales/ru.yml
 - config/routes.rb
 - lib/tasks/tramway/event_tasks.rake
 - lib/tramway/event.rb
 - lib/tramway/event/engine.rb
 - lib/tramway/event/generators/install_generator.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_participant_form_fields.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