tramway-event 1.2.6 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeaf1831c90a314a57b6714c03e4b885886d52a7a8eaffb1d8eda77754c75c9f
-  data.tar.gz: 908ce7b8500ca72a441891db385b24009c2a70dd863b800fda793f5030b8fd2d
+  metadata.gz: 561ce6e60c09b2065aa0054c1203e7f8faafb38308dbb1ec01e55bfebf606a18
+  data.tar.gz: b2d52e2dac5e50dde7ed0099ad907c369d2ecc50ff6c087f1147cc6b587df220
 SHA512:
-  metadata.gz: 72007c767c2ae711318b0db93799f4165af55ad409d5827c592c72e69edd4884c18f2091242e98238f4c6d356771aa277aaf4673ca2be32bd636d5334da6144d
-  data.tar.gz: 046746fe950723ae07fac8f7d6571b7888ef2413e2bf024bf1105473d62a4de6f5691785d02a2ae2e11580719366a123fb069fc39952bce1b893b7c399e8993d
+  metadata.gz: 7237e9582084934e3f564719199efa0f9587a0f999623e2bcdb1158f23e5f3e614094025f007d5c41bd7f5b7551c40eb790c0ba33598cacf72a6ea07b8c63e45
+  data.tar.gz: '09b550168725e0d6ee8e67a8e49fac7a5abedc621a605bc8a47a5b746c300cc53428d91491d1718f84666e163569d271731a23b00a86c234d4e6438ee841e1b6'

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

@@ -1,9 +1,7 @@
 class Tramway::Event::ParticipantsController < Tramway::Event::ApplicationController
   def create
     event = ::Tramway::Event::Event.find params[:tramway_event_participant][:event_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 event_id: event.id
+    @participant_form = ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(request.uuid, event).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

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

@@ -6,15 +6,17 @@ class Tramway::Event::ParticipantDecorator < ::Tramway::Core::ApplicationDecorat
   end
 
   def title
-    first_name = object.values['Фамилия']
-    last_name = object.values['Имя']
-    patronymic = object.values['Отчество']
-    "#{first_name} #{last_name} #{patronymic}"
+    if object.values.present?
+      first_name = object.values['Фамилия']
+      last_name = object.values['Имя']
+      patronymic = object.values['Отчество']
+      "#{first_name} #{last_name} #{patronymic}"
+    end
   end
 
   def values
     content_tag :table, class: :table do
-      object.values.each do |key, value|
+      object.values&.each do |key, value|
         concat(content_tag(:tr) do
           concat(content_tag(:td) do
             key

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

@@ -1,6 +1,9 @@
-class Tramway::Event::ParticipantExtendedFormCreator
+class Tramway::Event::ParticipantExtendedFormCreator < Tramway::Core::FormCreator
   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))
+    properties = event.participant_form_fields.inputs_list.reduce({}) do |hash, field|
+      hash.merge! field.title.to_sym => field
+    end
+    ::Tramway::Core::ExtendableForm.new(class_name, **properties)
   end
 end

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

@@ -1,9 +1,15 @@
+require 'securerandom'
+
 class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
-  properties :event_id, :values
+  association :event
 
-  def initialize(object, event)
-    form_object = super object
-    form_properties event_id: :default
-    form_object
+  def self.new(object)
+    if object.event_id.present?
+      ::Tramway::Event::ParticipantExtendedFormCreator.create_form_class(SecureRandom.hex, object.event).new object
+    else
+      super(object).tap do |obj|
+        obj.form_properties event: :association
+      end
+    end
   end
 end

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

@@ -7,13 +7,5 @@
       = simple_form_for @participant_form, url: ::Tramway::Event::Engine.routes.url_helpers.participants_path, method: :post, 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}]" }
+          = render 'tramway/core/shared/input_extended', field: field, class_name: class_name, f: f
         = f.button :submit, t('.submit_form')

data/lib/tramway/event/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Event
-    VERSION = '1.2.6'
+    VERSION = '1.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: '1.3'
 platform: ruby
 authors:
 - Pavel Kalashnikov