tramway-event 1.9.28.1 → 1.9.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55da21331575531d635e55fb6a79076a6522c88cca286b08db2996ab8bcc1cfc
-  data.tar.gz: 90b93d96928a56c3d7fe0a82475b7168c2d995bd9d2358df102553e2794b7bf1
+  metadata.gz: ccbba9d4e213e01b03e1d8b447d3ecc7c999dc13e32b5902c76bc1a6422bba39
+  data.tar.gz: 1ac5580d257ffa32f36ca9bab2e28ac85fa9ae5a0c29bfaef4d8bc163b6a1ca2
 SHA512:
-  metadata.gz: 2cb7761e9c4aabfafd54b191916cce6f0f90ca75577c38f922a41e382bef6143a26e33e28976cbd933a9b7820961138dacb43f090dbbde3a93440f783618024a
-  data.tar.gz: 8ede73215d0a59bad13f5f25a9807c0a45f300638965c1d49ca77bfd1e24ef0e1ab37b91454beef8ef0efb78f38f66e8d590929f8521cfb0e8c14f64523ed620
+  metadata.gz: 73bd1a360e798f16ed21c4708fcb411b3a207a2e67fb220a0ec234ce7f317b8966f40ec2a12bbb5a3858f975f443217d2e80d867e2d2b6c835a54548c2d0f20a
+  data.tar.gz: 1d7e7c7a06dbd0fd4a0531d7eb959619591a6bd5213fa22a171eb922393cfa2e8aa34528b8a4882957ca89146edf66aa0ea70126b2646ba1a5032ea09a245a80

data/README.md

@@ -12,6 +12,7 @@ How to use my plugin.
 gem 'tramway-event'
 gem 'carrierwave'
 gem 'more_html_tags'
+gem 'configus'
 ```
 
 #### 2. And then execute:
@@ -48,6 +49,21 @@ Tramway::Admin.set_available_models ::Tramway::Event::Event, ::Tramway::Event::P
 mount Tramway::Event::Engine, at: '/'
 ```
 
+#### 7. Add hosts in your environments via gem `configus`. [What is configus?](https://github.com/kaize/configus)
+
+*config/configus.rb*
+```ruby
+Configus.build Rails.env do
+  env :production do
+    host 'https://your-site-domain.com'
+  end
+  env :development do
+    host 'http://localhost:3000'
+  end
+  env :test, parent: :development
+end
+```
+
 ## How-to
 
 ### Create event

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

@@ -75,7 +75,7 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
 
   def events_link
     event_link = Tramway::Event::Engine.routes.url_helpers.event_path object
-    event_url = ['http://molodoy.online', event_link].join
+    event_url = [configus.host, event_link].join
     content_tag(:pre) do
       id = "event#{object.id}"
       concat link_to event_url, event_url, id: id

data/app/decorators/tramway/event/{participant_xlsx_decorator.rb → participant_xls_decorator.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::ParticipantXlsxDecorator < Tramway::Export::Xlsx::ApplicationDecorator
+class Tramway::Event::ParticipantXlsDecorator < Tramway::Export::Xls::ApplicationDecorator
   class << self
     def columns
       %i[full_name email phone organization event].map do |attribute|
@@ -9,7 +9,7 @@ class Tramway::Event::ParticipantXlsxDecorator < Tramway::Export::Xlsx::Applicat
     end
 
     def filename
-      'participants.xlsx'
+      'participants.xls'
     end
   end
 

data/app/forms/{tramway → admin/tramway}/event/event_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::EventForm < ::Tramway::Core::ApplicationForm
   properties :title, :description, :begin_date, :end_date, :photo, :status,
     :request_collecting_begin_date, :request_collecting_end_date, :short_description
 

data/app/forms/{tramway → admin/tramway}/event/partaking_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::PartakingForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::PartakingForm < ::Tramway::Core::ApplicationForm
   properties :part_id, :part_type, :person_id, :position
   associations :person, :part
 

data/app/forms/{tramway → admin/tramway}/event/participant_form.rb

@@ -2,7 +2,7 @@
 
 require 'securerandom'
 
-class Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::ParticipantForm < ::Tramway::Core::ApplicationForm
   properties :participation_state_event, :comment
   association :event
 

data/app/forms/{tramway → admin/tramway}/event/participant_form_field_form.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplicationForm
-  properties :title, :description, :field_type, :options, :position, :list_field
+class Admin::Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplicationForm
+  properties :title, :description, :field_type, :options, :position, :list_field, :presence_field
   association :event
 
   def initialize(object)
@@ -12,6 +12,7 @@ class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplic
                       field_type: :default,
                       options: :text,
                       list_field: :boolean,
+                      presence_field: :boolean,
                       position: :numeric
     end
   end
@@ -20,6 +21,7 @@ class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplic
     super(params).tap do
       model.options = {} if model.options == ''
       model.options&.merge! list_field: (params[:list_field] == '1').to_s
+      model.options&.deep_merge! validations: { presence: (params[:presence_field] == '1').to_s }
       model.save
     end
   end
@@ -28,6 +30,10 @@ class Tramway::Event::ParticipantFormFieldForm < ::Tramway::Core::ExtendedApplic
     model.options&.dig('list_field') == 'true'
   end
 
+  def presence_field
+    model.options&.dig('validations', 'presence') == 'true'
+  end
+
   def options
     model.options&.to_json
   end

data/app/forms/{tramway → admin/tramway}/event/person_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::PersonForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::PersonForm < ::Tramway::Core::ApplicationForm
   properties :first_name, :last_name, :photo, :description
 
   def initialize(object)

data/app/forms/{tramway → admin/tramway}/event/place_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::PlaceForm < Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::PlaceForm < Tramway::Core::ApplicationForm
   properties :title, :description, :coordinates, :photo, :city
 
   def initialize(object)

data/app/forms/{tramway → admin/tramway}/event/section_form.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
+class Admin::Tramway::Event::SectionForm < ::Tramway::Core::ApplicationForm
   properties :event, :title, :description, :photo, :icon, :position
   association :event
 

data/config/locales/models.yml

@@ -69,10 +69,17 @@ ru:
         options: Параметры (не редактировать без надобности)
         title: Название (в Tramway название Поля анкеты - это ключ для выборки пользователей. Если вы измените ключ к выборке пользователей, то все пользователи, получившие данные по предыдущему ключу по этой выборке показываться не будут)
         list_field: Показывать это поле в общем списке участников?
+        presence_field: Обязательное поле
       tramway/event/partaking:
         part_name: Мероприятие
         event_duration: Дата мероприятия
         part_description: Описание
+    errors:
+      models:
+        tramway/event/participant:
+          attributes:
+            default:
+              presence: не может быть пустым
   cases:
     tramway/event/event:
       plural: мероприятия

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.28.1'
+    VERSION = '1.9.30'
   end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.28.1
+  version: 1.9.30
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-07 00:00:00.000000000 Z
-dependencies: []
+date: 2020-02-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: configus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails engine for events
 email:
 - kalashnikovisme@gmail.com
@@ -35,19 +49,19 @@ files:
 - app/decorators/tramway/event/partaking_feature_decorator.rb
 - app/decorators/tramway/event/participant_decorator.rb
 - app/decorators/tramway/event/participant_form_field_decorator.rb
-- app/decorators/tramway/event/participant_xlsx_decorator.rb
+- app/decorators/tramway/event/participant_xls_decorator.rb
 - app/decorators/tramway/event/person_decorator.rb
 - app/decorators/tramway/event/place_decorator.rb
 - 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/partaking_form.rb
+- app/forms/admin/tramway/event/event_form.rb
+- app/forms/admin/tramway/event/partaking_form.rb
+- app/forms/admin/tramway/event/participant_form.rb
+- app/forms/admin/tramway/event/participant_form_field_form.rb
+- app/forms/admin/tramway/event/person_form.rb
+- app/forms/admin/tramway/event/place_form.rb
+- app/forms/admin/tramway/event/section_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/person_form.rb
-- app/forms/tramway/event/place_form.rb
-- app/forms/tramway/event/section_form.rb
 - app/helpers/tramway/event/application_helper.rb
 - app/jobs/tramway/event/application_job.rb
 - app/mailers/tramway/event/application_mailer.rb