tramway-event 1.11.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea77a5e9957af8c76d807a94d3f1203b1085922f2c8a0c55fb44d5de40527977
-  data.tar.gz: e489de38c330b4863c18c01eaf8fda08fa717d60163a340a76e5c9f3362af4e1
+  metadata.gz: ee9b98770fa7546d0b7c49c02f766217b562830ec0e1d53f6d21b13277ca3ed0
+  data.tar.gz: 542630d73692b2d556707204eb618b439af46b49c385161bbb84170d8b6ffc7d
 SHA512:
-  metadata.gz: df6b5e3111bf46c7e8312a716255ace9e2320f365e6ebb9a027b08896d3d228d6f7d95a2ae2a37d3f65f6e90d5bd41556c9dbfe68f9fe59156eaa8059ac9248a
-  data.tar.gz: f2475bafa4f3004d842a80c81ae465ceeae776eafb6a447c37b43d6a5408a61c949680abfc38c4828661473ec462e32179b6e08a8ec8795f1216948f5101b199
+  metadata.gz: f4d0e94e345e70cb67c92d63f2ee48822afecf082b536c95bca865c620ed5bd9aabb7dbf699c251613869e1350dda4e0da9d45b98bdac73dd3d3309d91019bbb
+  data.tar.gz: daae540aefa2f8dfa0a4b387137c6746f63d47949286577b908d3f05aff8569b46e1e3fc40131f96ef1f77935f095b70478a7aea63a27e759109bcb6f467ed14

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

@@ -6,7 +6,7 @@ class Tramway::Event::ParticipantExtendedFormCreator < Tramway::Core::FormCreato
     properties = event.participant_form_fields.inputs_list.reduce({}) do |hash, field|
       hash.merge! field.title.to_sym => {
         object: field,
-        validates: (field.options == '' ? {} : field.options)&.dig('validations')
+        validates: build_validations(field)
       }
     end
     if simple_properties.keys.any?
@@ -15,4 +15,13 @@ class Tramway::Event::ParticipantExtendedFormCreator < Tramway::Core::FormCreato
       ::Tramway::Core::ExtendableForm.new(class_name, **properties)
     end
   end
+
+  def self.build_validations(field)
+    case field.field_type
+    when 'checkbox'
+      field.validations.except('presence').deep_merge! inclusion: { in: [ 'true' ] }
+    else
+      field.validations
+    end
+  end
 end

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

@@ -3,11 +3,15 @@
 class Tramway::Event::ParticipantFormField < ::Tramway::Event::ApplicationRecord
   belongs_to :event, class_name: 'Tramway::Event::Event'
 
-  enumerize :field_type, in: %i[text string numeric date_picker select], default: :text
+  enumerize :field_type, in: %i[text string numeric date_picker select checkbox], default: :text
 
   scope :inputs_list, -> { active.order(position: :asc) }
 
   def required
     options.present? && options.dig('validations', 'presence') == 'true'
   end
+
+  def validations
+    (options == '' ? {} : options)&.dig('validations')
+  end
 end

data/config/locales/models.yml

@@ -90,6 +90,7 @@ ru:
           attributes:
             default:
               presence: не может быть пустым
+              inclusion: этот пункт должен быть отмечен
   cases:
     tramway/event/event:
       plural: мероприятия
@@ -136,3 +137,4 @@ ru:
         numeric: Число
         date_picker: Дата
         select: Выпадающий список (да/нет)
+        checkbox: Галочка

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.11.1'
+    VERSION = '1.11.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus